summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2013-12-02 20:00:01 -0500
committerKeith Bostic <keith@wiredtiger.com>2013-12-02 20:00:01 -0500
commit67c20bfda537e3f1cff541d95bf6db991ba32426 (patch)
treeae921e136f68cfa70be1bad95e2241f53740fcdf
parent595024639ef01faa946ddaf0292e0feb0d894045 (diff)
downloadmongo-67c20bfda537e3f1cff541d95bf6db991ba32426.tar.gz
Update the canned configurations inside of the wtperf source code.
Update the runners again: now that threads takes groups of options, you can't do: threads=(count=1,read=1) you have to do: threads=((count=1,read=1)) instead, doubling the parentheses.
-rw-r--r--bench/wtperf/runners/evict-btree.wtperf2
-rw-r--r--bench/wtperf/runners/evict-lsm.wtperf2
-rw-r--r--bench/wtperf/runners/insert-rmw.wtperf2
-rw-r--r--bench/wtperf/runners/medium-btree.wtperf2
-rw-r--r--bench/wtperf/runners/medium-lsm.wtperf2
-rw-r--r--bench/wtperf/runners/small-btree.wtperf2
-rw-r--r--bench/wtperf/runners/small-lsm.wtperf2
-rw-r--r--bench/wtperf/runners/update-btree.wtperf2
-rw-r--r--bench/wtperf/runners/update-checkpoint-btree.wtperf2
-rw-r--r--bench/wtperf/runners/update-checkpoint-lsm.wtperf2
-rw-r--r--bench/wtperf/runners/update-large-lsm.wtperf2
-rw-r--r--bench/wtperf/runners/update-lsm.wtperf2
-rw-r--r--bench/wtperf/wtperf.c6
13 files changed, 15 insertions, 15 deletions
diff --git a/bench/wtperf/runners/evict-btree.wtperf b/bench/wtperf/runners/evict-btree.wtperf
index 0cd9d92356b..f8c270f3d1f 100644
--- a/bench/wtperf/runners/evict-btree.wtperf
+++ b/bench/wtperf/runners/evict-btree.wtperf
@@ -5,4 +5,4 @@ icount=10000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=16,reads=1)
+threads=((count=16,reads=1))
diff --git a/bench/wtperf/runners/evict-lsm.wtperf b/bench/wtperf/runners/evict-lsm.wtperf
index 75e591ec501..f1bccf6014f 100644
--- a/bench/wtperf/runners/evict-lsm.wtperf
+++ b/bench/wtperf/runners/evict-lsm.wtperf
@@ -5,4 +5,4 @@ icount=10000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=16,reads=1)
+threads=((count=16,reads=1))
diff --git a/bench/wtperf/runners/insert-rmw.wtperf b/bench/wtperf/runners/insert-rmw.wtperf
index dc104035408..9dcb4c7dde3 100644
--- a/bench/wtperf/runners/insert-rmw.wtperf
+++ b/bench/wtperf/runners/insert-rmw.wtperf
@@ -6,4 +6,4 @@ insert_rmw=true
report_interval=5
run_time=120
populate_threads=1
-threads=(count=6,reads=1,inserts=2)
+threads=((count=6,reads=1,inserts=2))
diff --git a/bench/wtperf/runners/medium-btree.wtperf b/bench/wtperf/runners/medium-btree.wtperf
index 63bca33521d..92c63e73480 100644
--- a/bench/wtperf/runners/medium-btree.wtperf
+++ b/bench/wtperf/runners/medium-btree.wtperf
@@ -5,4 +5,4 @@ icount=50000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=16,reads=1)
+threads=((count=16,reads=1))
diff --git a/bench/wtperf/runners/medium-lsm.wtperf b/bench/wtperf/runners/medium-lsm.wtperf
index a020f873e92..18d84b36612 100644
--- a/bench/wtperf/runners/medium-lsm.wtperf
+++ b/bench/wtperf/runners/medium-lsm.wtperf
@@ -5,4 +5,4 @@ icount=50000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=16,reads=1)
+threads=((count=16,reads=1))
diff --git a/bench/wtperf/runners/small-btree.wtperf b/bench/wtperf/runners/small-btree.wtperf
index 71025ffac17..a6b046f47e0 100644
--- a/bench/wtperf/runners/small-btree.wtperf
+++ b/bench/wtperf/runners/small-btree.wtperf
@@ -5,4 +5,4 @@ icount=500000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=8,reads=1)
+threads=((count=8,reads=1))
diff --git a/bench/wtperf/runners/small-lsm.wtperf b/bench/wtperf/runners/small-lsm.wtperf
index 9ebc00d291e..a4bd4aecd48 100644
--- a/bench/wtperf/runners/small-lsm.wtperf
+++ b/bench/wtperf/runners/small-lsm.wtperf
@@ -5,4 +5,4 @@ icount=500000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=8,reads=1)
+threads=((count=8,reads=1))
diff --git a/bench/wtperf/runners/update-btree.wtperf b/bench/wtperf/runners/update-btree.wtperf
index c04aa619641..7df423bbc4c 100644
--- a/bench/wtperf/runners/update-btree.wtperf
+++ b/bench/wtperf/runners/update-btree.wtperf
@@ -5,4 +5,4 @@ icount=5000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=6,inserts=1,reads=1,updates=1)
+threads=((count=6,inserts=1,reads=1,updates=1))
diff --git a/bench/wtperf/runners/update-checkpoint-btree.wtperf b/bench/wtperf/runners/update-checkpoint-btree.wtperf
index bd665686645..65355eaff24 100644
--- a/bench/wtperf/runners/update-checkpoint-btree.wtperf
+++ b/bench/wtperf/runners/update-checkpoint-btree.wtperf
@@ -7,4 +7,4 @@ checkpoint_threads=1
checkpoint_interval=10
run_time=120
populate_threads=1
-threads=(count=6,inserts=1,reads=1,updates=1)
+threads=((count=6,inserts=1,reads=1,updates=1))
diff --git a/bench/wtperf/runners/update-checkpoint-lsm.wtperf b/bench/wtperf/runners/update-checkpoint-lsm.wtperf
index 8d82659cfad..282b9cac515 100644
--- a/bench/wtperf/runners/update-checkpoint-lsm.wtperf
+++ b/bench/wtperf/runners/update-checkpoint-lsm.wtperf
@@ -7,4 +7,4 @@ checkpoint_threads=1
checkpoint_interval=10
run_time=120
populate_threads=1
-threads=(count=6,inserts=1,reads=1,updates=1)
+threads=((count=6,inserts=1,reads=1,updates=1))
diff --git a/bench/wtperf/runners/update-large-lsm.wtperf b/bench/wtperf/runners/update-large-lsm.wtperf
index 3cb857eeca2..17fb3e12897 100644
--- a/bench/wtperf/runners/update-large-lsm.wtperf
+++ b/bench/wtperf/runners/update-large-lsm.wtperf
@@ -6,4 +6,4 @@ report_interval=5
merge_sleep=600
run_time=1200
populate_threads=10
-threads=(count=14,inserts=1,reads=5,updates=1)
+threads=((count=14,inserts=1,reads=5,updates=1))
diff --git a/bench/wtperf/runners/update-lsm.wtperf b/bench/wtperf/runners/update-lsm.wtperf
index d01c5e2b294..5e06983f3fb 100644
--- a/bench/wtperf/runners/update-lsm.wtperf
+++ b/bench/wtperf/runners/update-lsm.wtperf
@@ -5,4 +5,4 @@ icount=5000000
report_interval=5
run_time=120
populate_threads=1
-threads=(count=6,inserts=1,reads=1,updates=1)
+threads=((count=6,inserts=1,reads=1,updates=1))
diff --git a/bench/wtperf/wtperf.c b/bench/wtperf/wtperf.c
index fe4b24f4c6e..9bb599f2809 100644
--- a/bench/wtperf/wtperf.c
+++ b/bench/wtperf/wtperf.c
@@ -54,7 +54,7 @@ static const char * const small_config_str =
"report_interval=5,"
"run_time=20,"
"populate_threads=1,"
- "read_threads=8,";
+ "threads=((count=8,read=1)),";
static const char * const med_config_str =
"conn_config=\"cache_size=1GB\","
@@ -65,7 +65,7 @@ static const char * const med_config_str =
"report_interval=5,"
"run_time=100,"
"populate_threads=1,"
- "read_threads=16,";
+ "threads=((count=16,read=1)),";
static const char * const large_config_str =
"conn_config=\"cache_size=2GB\","
@@ -76,7 +76,7 @@ static const char * const large_config_str =
"report_interval=5,"
"run_time=600,"
"populate_threads=1,"
- "read_threads=16,";
+ "threads=((count=16,read=1)),";
static const char * const debug_cconfig = "verbose=[lsm]";
static const char * const debug_tconfig = "";