Skip to content

M
MariaDB
Commit b6bfb7f3 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel
Browse files
Options

[t:4871] cast pthread_t through void * to avoid -Wbad-function-cast on osx,... 

[t:4871] cast pthread_t through void * to avoid -Wbad-function-cast on osx, fix toku_time.h on osx too (include errno.h)

git-svn-id: file:///svn/toku/tokudb@43884 c7de825b-a66e-492c-adef-691d508d4ae1
parent b21fd0c6
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
portability/toku_time.h
View file @ b6bfb7f3
...@@ -18,6 +18,7 @@ static inline float toku_tdiff (struct timeval *a, struct timeval *b) { ...@@ -18,6 +18,7 @@ static inline float toku_tdiff (struct timeval *a, struct timeval *b) {
} }
#if !defined(HAVE_CLOCK_REALTIME) // OS X does not have clock_gettime, use clock_get_time #if !defined(HAVE_CLOCK_REALTIME) // OS X does not have clock_gettime, use clock_get_time
# include <errno.h>
# include <mach/clock.h> # include <mach/clock.h>
# include <mach/mach.h> # include <mach/mach.h>
typedef int clockid_t; typedef int clockid_t;
......
src/tests/blocking-first-empty.c
View file @ b6bfb7f3
...@@ -53,7 +53,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim ...@@ -53,7 +53,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-first.c
View file @ b6bfb7f3
...@@ -70,7 +70,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim ...@@ -70,7 +70,7 @@ static void blocking_first(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptim
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-last.c
View file @ b6bfb7f3
...@@ -70,7 +70,7 @@ static void blocking_last(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime ...@@ -70,7 +70,7 @@ static void blocking_last(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-next-prev-deadlock.c
View file @ b6bfb7f3
...@@ -77,21 +77,21 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee ...@@ -77,21 +77,21 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee
if (r != 0) if (r != 0)
break; break;
if (verbose) if (verbose)
printf("%lu next %"PRIu64"\n", (unsigned long) toku_pthread_self(), get_key(&context.key)); printf("%lu next %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), get_key(&context.key));
usleep(sleeptime); usleep(sleeptime);
} }
if (verbose) if (verbose)
printf("%lu next=%d\n", (unsigned long) toku_pthread_self(), r); printf("%lu next=%d\n", (unsigned long)(void *) toku_pthread_self(), r);
assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK); assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK);
int rr = cursor->c_close(cursor); assert(rr == 0); int rr = cursor->c_close(cursor); assert(rr == 0);
if (r == DB_NOTFOUND) { if (r == DB_NOTFOUND) {
if (verbose) printf("%lu commit\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu commit\n", (unsigned long)(void *) toku_pthread_self());
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
} else { } else {
if (verbose) printf("%lu abort\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu abort\n", (unsigned long)(void *) toku_pthread_self());
r = txn->abort(txn); r = txn->abort(txn);
} }
assert(r == 0); assert(r == 0);
...@@ -123,21 +123,21 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee ...@@ -123,21 +123,21 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee
if (r != 0) if (r != 0)
break; break;
if (verbose) if (verbose)
printf("%lu prev %"PRIu64"\n", (unsigned long) toku_pthread_self(), get_key(&context.key)); printf("%lu prev %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), get_key(&context.key));
usleep(sleeptime); usleep(sleeptime);
} }
if (verbose) if (verbose)
printf("%lu prev=%d\n", (unsigned long) toku_pthread_self(), r); printf("%lu prev=%d\n", (unsigned long)(void *) toku_pthread_self(), r);
assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK); assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK);
int rr = cursor->c_close(cursor); assert(rr == 0); int rr = cursor->c_close(cursor); assert(rr == 0);
if (r == DB_NOTFOUND) { if (r == DB_NOTFOUND) {
if (verbose) printf("%lu commit\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu commit\n", (unsigned long)(void *) toku_pthread_self());
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
} else { } else {
if (verbose) printf("%lu abort\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu abort\n", (unsigned long)(void *) toku_pthread_self());
r = txn->abort(txn); r = txn->abort(txn);
} }
assert(r == 0); assert(r == 0);
......
src/tests/blocking-next-prev.c
View file @ b6bfb7f3
...@@ -76,21 +76,21 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee ...@@ -76,21 +76,21 @@ static void blocking_next(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee
if (r != 0) if (r != 0)
break; break;
if (verbose) if (verbose)
printf("%lu next %"PRIu64"\n", (unsigned long) toku_pthread_self(), get_key(&context.key)); printf("%lu next %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), get_key(&context.key));
usleep(sleeptime); usleep(sleeptime);
} }
if (verbose) if (verbose)
printf("%lu next=%d\n", (unsigned long) toku_pthread_self(), r); printf("%lu next=%d\n", (unsigned long)(void *) toku_pthread_self(), r);
assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK); assert(r == DB_NOTFOUND || r == DB_LOCK_DEADLOCK);
int rr = cursor->c_close(cursor); assert(rr == 0); int rr = cursor->c_close(cursor); assert(rr == 0);
if (r == DB_NOTFOUND) { if (r == DB_NOTFOUND) {
if (verbose) printf("%lu commit\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu commit\n", (unsigned long)(void *) toku_pthread_self());
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
} else { } else {
if (verbose) printf("%lu abort\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu abort\n", (unsigned long)(void *) toku_pthread_self());
r = txn->abort(txn); r = txn->abort(txn);
} }
assert(r == 0); assert(r == 0);
...@@ -122,21 +122,21 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee ...@@ -122,21 +122,21 @@ static void blocking_prev(DB_ENV *db_env, DB *db, uint64_t nrows UU(), long slee
if (r != 0) if (r != 0)
break; break;
if (verbose) if (verbose)
printf("%lu prev %"PRIu64"\n", (unsigned long) toku_pthread_self(), get_key(&context.key)); printf("%lu prev %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), get_key(&context.key));
usleep(sleeptime); usleep(sleeptime);
} }
if (verbose) if (verbose)
printf("%lu prev=%d\n", (unsigned long) toku_pthread_self(), r); printf("%lu prev=%d\n", (unsigned long)(void *) toku_pthread_self(), r);
assert(r == DB_NOTFOUND); assert(r == DB_NOTFOUND);
int rr = cursor->c_close(cursor); assert(rr == 0); int rr = cursor->c_close(cursor); assert(rr == 0);
if (r == DB_NOTFOUND) { if (r == DB_NOTFOUND) {
if (verbose) printf("%lu commit\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu commit\n", (unsigned long)(void *) toku_pthread_self());
r = txn->commit(txn, 0); r = txn->commit(txn, 0);
} else { } else {
if (verbose) printf("%lu abort\n", (unsigned long) toku_pthread_self()); if (verbose) printf("%lu abort\n", (unsigned long)(void *) toku_pthread_self());
r = txn->abort(txn); r = txn->abort(txn);
} }
assert(r == 0); assert(r == 0);
......
src/tests/blocking-prelock-range.c
View file @ b6bfb7f3
...@@ -25,7 +25,7 @@ static void blocking_range_lock(DB_ENV *db_env, DB *db, uint64_t nrows, long sle ...@@ -25,7 +25,7 @@ static void blocking_range_lock(DB_ENV *db_env, DB *db, uint64_t nrows, long sle
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
} }
......
src/tests/blocking-put.c
View file @ b6bfb7f3
...@@ -24,7 +24,7 @@ static void blocking_put(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) ...@@ -24,7 +24,7 @@ static void blocking_put(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime)
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
} }
......
src/tests/blocking-set-range-0.c
View file @ b6bfb7f3
...@@ -79,7 +79,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee ...@@ -79,7 +79,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-set-range-n.c
View file @ b6bfb7f3
...@@ -74,7 +74,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee ...@@ -74,7 +74,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-set-range-reverse-0.c
View file @ b6bfb7f3
...@@ -77,7 +77,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee ...@@ -77,7 +77,7 @@ static void blocking_set_range(DB_ENV *db_env, DB *db, uint64_t nrows, long slee
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(context.key.data); toku_free(context.key.data);
......
src/tests/blocking-set.c
View file @ b6bfb7f3
...@@ -67,7 +67,7 @@ static void blocking_set(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime) ...@@ -67,7 +67,7 @@ static void blocking_set(DB_ENV *db_env, DB *db, uint64_t nrows, long sleeptime)
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
toku_free(val.data); toku_free(val.data);
......
src/tests/blocking-table-lock.c
View file @ b6bfb7f3
...@@ -18,7 +18,7 @@ static void blocking_table_lock(DB_ENV *db_env, DB *db, uint64_t nrows, long sle ...@@ -18,7 +18,7 @@ static void blocking_table_lock(DB_ENV *db_env, DB *db, uint64_t nrows, long sle
r = txn->commit(txn, 0); assert(r == 0); r = txn->commit(txn, 0); assert(r == 0);
if (verbose) if (verbose)
printf("%lu %"PRIu64"\n", (unsigned long) toku_pthread_self(), i); printf("%lu %"PRIu64"\n", (unsigned long)(void *) toku_pthread_self(), i);
} }
} }
......
src/tests/threaded_stress_test_helpers.h
View file @ b6bfb7f3
...@@ -203,7 +203,7 @@ static void *worker(void *arg_v) { ...@@ -203,7 +203,7 @@ static void *worker(void *arg_v) {
DB_ENV *env = arg->env; DB_ENV *env = arg->env;
DB_TXN *txn = NULL; DB_TXN *txn = NULL;
if (verbose) { if (verbose) {
printf("%lu starting %p\n", (unsigned long) toku_pthread_self(), arg->operation); printf("%lu starting %p\n", (unsigned long)(void *) toku_pthread_self(), arg->operation);
} }
if (arg->single_txn) { if (arg->single_txn) {
r = env->txn_begin(env, 0, &txn, arg->txn_type); CKERR(r); r = env->txn_begin(env, 0, &txn, arg->txn_type); CKERR(r);
...@@ -237,7 +237,7 @@ static void *worker(void *arg_v) { ...@@ -237,7 +237,7 @@ static void *worker(void *arg_v) {
CHK(txn->commit(txn, 0)); CHK(txn->commit(txn, 0));
} }
if (verbose) if (verbose)
printf("%lu returning\n", (unsigned long) toku_pthread_self()); printf("%lu returning\n", (unsigned long)(void *) toku_pthread_self());
toku_free(random_buf); toku_free(random_buf);
return arg; return arg;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7