diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 16:14:13 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 17:26:15 +0200 |
commit | c5f333adb6cf83e9c06b66f990ab69e0f5076b41 (patch) | |
tree | e36ddcd86eb5c41260242091d9f88f032060006d /storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc | |
parent | 1e88e855038559639ef23eb66483a243e2e25983 (diff) | |
parent | f6716cef7eb267db958ce72c597d765bb8b7923e (diff) | |
download | mariadb-git-c5f333adb6cf83e9c06b66f990ab69e0f5076b41.tar.gz |
Merge branch 'merge-tokudb-5.6' into 10.0
Diffstat (limited to 'storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc')
-rw-r--r-- | storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc b/storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc index d9d865254f1..3b53911e614 100644 --- a/storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc +++ b/storage/tokudb/PerconaFT/src/tests/blocking-first-empty.cc @@ -99,12 +99,14 @@ static void *blocking_first_thread(void *arg) { static void run_test(DB_ENV *db_env, DB *db, int nthreads, uint64_t nrows, long sleeptime) { int r; toku_pthread_t tids[nthreads]; - struct blocking_first_args a = { db_env, db, nrows, sleeptime }; - for (int i = 0; i < nthreads-1; i++) { - r = toku_pthread_create(&tids[i], NULL, blocking_first_thread, &a); assert(r == 0); + struct blocking_first_args a = {db_env, db, nrows, sleeptime}; + for (int i = 0; i < nthreads - 1; i++) { + r = toku_pthread_create( + toku_uninstrumented, &tids[i], nullptr, blocking_first_thread, &a); + assert(r == 0); } blocking_first(db_env, db, nrows, sleeptime); - for (int i = 0; i < nthreads-1; i++) { + for (int i = 0; i < nthreads - 1; i++) { void *ret; r = toku_pthread_join(tids[i], &ret); assert(r == 0); } |