diff options
| -rw-r--r-- | bench/wtperf/idle_table_cycle.c | 4 | ||||
| -rw-r--r-- | lang/java/wiredtiger.i | 20 | ||||
| -rw-r--r-- | lang/python/wiredtiger.i | 15 | ||||
| -rw-r--r-- | src/include/extern.h | 6 | ||||
| -rw-r--r-- | src/include/extern_posix.h | 2 | ||||
| -rw-r--r-- | src/os_common/os_alloc.c | 2 | ||||
| -rw-r--r-- | src/os_posix/os_sleep.c | 1 | ||||
| -rw-r--r-- | src/support/err.c | 1 |
8 files changed, 19 insertions, 32 deletions
diff --git a/bench/wtperf/idle_table_cycle.c b/bench/wtperf/idle_table_cycle.c index 2074d057ff0..13fa55e86f5 100644 --- a/bench/wtperf/idle_table_cycle.c +++ b/bench/wtperf/idle_table_cycle.c @@ -83,7 +83,7 @@ cycle_idle_tables(void *arg) snprintf(uri, sizeof(uri), "%s_cycle%07d", wtperf->uris[0], cycle_count); /* Don't busy cycle in this loop. */ - (void)sleep(1); + __wt_sleep(1, 0); /* Setup a start timer. */ __wt_epoch(NULL, &start); @@ -126,7 +126,7 @@ cycle_idle_tables(void *arg) */ while ((ret = session->drop( session, uri, "force,checkpoint_wait=false")) == EBUSY) - (void)sleep(1); + __wt_sleep(1, 0); if (ret != 0 && ret != EBUSY) { lprintf(wtperf, ret, 0, diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i index e5611ac192f..b7515440040 100644 --- a/lang/java/wiredtiger.i +++ b/lang/java/wiredtiger.i @@ -362,7 +362,7 @@ javaClose(JNIEnv *env, WT_SESSION *session, JAVA_CALLBACK *jcb, jfieldID *pfid) (*env)->SetLongField(env, jcb->jobj, fid, 0L); (*env)->DeleteGlobalRef(env, jcb->jobj); - free(jcb); + __wt_free(jcb->session, jcb); return (0); } @@ -427,8 +427,6 @@ javaAsyncHandler(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, jobject jcallback; JNIEnv *jenv; WT_ASYNC_OP_IMPL *op; - WT_EXTENSION_API *wt_api; - WT_SESSION *wt_session; WT_SESSION_IMPL *session; WT_UNUSED(cb); @@ -513,12 +511,7 @@ javaAsyncHandler(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, (*jenv)->ExceptionClear(jenv); } if (0) { -err: wt_session = (WT_SESSION *)session; - wt_api = wt_session-> - connection->get_extension_api(wt_session->connection); - (void)wt_api->err_printf(wt_api, wt_session, - "Java async callback error: %s", - wt_api->strerror(wt_api, wt_session, ret)); +err: __wt_err(session, ret, "Java async callback error"); } /* Invalidate the AsyncOp, further use throws NullPointerException. */ @@ -1952,7 +1945,7 @@ WT_CONNECTION *wiredtiger_open_wrap(JNIEnv *jenv, const char *home, const char * goto err; connimpl = (WT_CONNECTION_IMPL *)conn; - if ((jcb = calloc(1, sizeof(JAVA_CALLBACK))) == NULL) + if ((ret = __wt_calloc_def(connimpl->default_session, 1, &jcb)) != 0) goto err; jcb->jnienv = jenv; @@ -1977,7 +1970,7 @@ err: if (ret != 0) goto err; connimpl = (WT_CONNECTION_IMPL *)$self; - if ((jcb = calloc(1, sizeof(JAVA_CALLBACK))) == NULL) + if ((ret = __wt_calloc_def(connimpl->default_session, 1, &jcb)) != 0) goto err; jcb->jnienv = jenv; @@ -2006,7 +1999,7 @@ err: if (ret != 0) goto err; sessionimpl = (WT_SESSION_IMPL *)session; - if ((jcb = calloc(1, sizeof(JAVA_CALLBACK))) == NULL) + if ((ret = __wt_calloc_def(sessionimpl, 1, &jcb)) != 0) goto err; jcb->jnienv = jenv; @@ -2027,7 +2020,8 @@ err: if (ret != 0) if ((ret = $self->open_cursor($self, uri, to_dup, config, &cursor)) != 0) goto err; - if ((jcb = calloc(1, sizeof(JAVA_CALLBACK))) == NULL) + if ((ret = __wt_calloc_def((WT_SESSION_IMPL *)cursor->session, + 1, &jcb)) != 0) goto err; if ((cursor->flags & WT_CURSTD_RAW) != 0) diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index 66627e5aa95..a28d3ac4c19 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -366,11 +366,7 @@ retry: SWIG_ERROR_IF_NOT_SET(result); else if (result == EBUSY) { SWIG_PYTHON_THREAD_BEGIN_ALLOW; -%#if defined(_MSC_VER) - (void)Sleep(10); /* ms */ -%#else - (void)usleep(10000); /* us */ -%#endif + __wt_sleep(0, 10000); SWIG_PYTHON_THREAD_END_ALLOW; goto retry; } @@ -1153,8 +1149,6 @@ pythonAsyncCallback(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, PY_CALLBACK *pcb; PyObject *arglist, *notify_method, *pyresult; WT_ASYNC_OP_IMPL *op; - WT_EXTENSION_API *wt_api; - WT_SESSION *wt_session; WT_SESSION_IMPL *session; /* @@ -1185,12 +1179,7 @@ pythonAsyncCallback(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, if (0) { if (ret == 0) ret = EINVAL; -err: wt_session = (WT_SESSION *)session; - wt_api = wt_session-> - connection->get_extension_api(wt_session->connection); - (void)wt_api->err_printf(wt_api, wt_session, - "python async callback error: %s", - wt_api->strerror(wt_api, wt_session, ret)); +err: __wt_err(session, ret, "python async callback error"); } Py_XDECREF(pyresult); Py_XDECREF(notify_method); diff --git a/src/include/extern.h b/src/include/extern.h index d40c6e73303..4725c296e91 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -493,13 +493,13 @@ extern int __wt_nfilename( WT_SESSION_IMPL *session, const char *name, size_t na extern int __wt_remove_if_exists(WT_SESSION_IMPL *session, const char *name, bool durable) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_copy_and_sync(WT_SESSION *wt_session, const char *from, const char *to) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern void __wt_abort(WT_SESSION_IMPL *session) WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); -extern int __wt_calloc(WT_SESSION_IMPL *session, size_t number, size_t size, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); +extern int __wt_calloc(WT_SESSION_IMPL *session, size_t number, size_t size, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)); extern int __wt_malloc(WT_SESSION_IMPL *session, size_t bytes_to_allocate, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_realloc(WT_SESSION_IMPL *session, size_t *bytes_allocated_ret, size_t bytes_to_allocate, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_realloc_noclear(WT_SESSION_IMPL *session, size_t *bytes_allocated_ret, size_t bytes_to_allocate, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_realloc_aligned(WT_SESSION_IMPL *session, size_t *bytes_allocated_ret, size_t bytes_to_allocate, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_strndup(WT_SESSION_IMPL *session, const void *str, size_t len, void *retp) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); -extern void __wt_free_int(WT_SESSION_IMPL *session, const void *p_arg) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); +extern void __wt_free_int(WT_SESSION_IMPL *session, const void *p_arg) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); extern int __wt_errno(void) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern const char *__wt_strerror(WT_SESSION_IMPL *session, int error, char *errbuf, size_t errlen) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_ext_map_windows_error( WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, uint32_t windows_error) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); @@ -620,7 +620,7 @@ extern int __wt_encrypt(WT_SESSION_IMPL *session, WT_KEYED_ENCRYPTOR *kencryptor extern void __wt_encrypt_size(WT_SESSION_IMPL *session, WT_KEYED_ENCRYPTOR *kencryptor, size_t incoming_size, size_t *sizep) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern void __wt_event_handler_set(WT_SESSION_IMPL *session, WT_EVENT_HANDLER *handler) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_eventv(WT_SESSION_IMPL *session, bool msg_event, int error, const char *file_name, int line_number, const char *fmt, va_list ap) WT_GCC_FUNC_DECL_ATTRIBUTE((cold)) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); -extern void __wt_err(WT_SESSION_IMPL *session, int error, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((cold)) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); +extern void __wt_err(WT_SESSION_IMPL *session, int error, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((cold)) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); extern void __wt_errx(WT_SESSION_IMPL *session, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((cold)) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 2, 3))) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_ext_err_printf( WT_EXTENSION_API *wt_api, WT_SESSION *wt_session, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 3, 4))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_msg(WT_SESSION_IMPL *session, const char *fmt, ...) WT_GCC_FUNC_DECL_ATTRIBUTE((cold)) WT_GCC_FUNC_DECL_ATTRIBUTE((format (printf, 2, 3))) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); diff --git a/src/include/extern_posix.h b/src/include/extern_posix.h index edc5226e516..5acb7b0ed27 100644 --- a/src/include/extern_posix.h +++ b/src/include/extern_posix.h @@ -23,7 +23,7 @@ extern const char *__wt_path_separator(void) WT_GCC_FUNC_DECL_ATTRIBUTE((visibil extern bool __wt_has_priv(void) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern void __wt_stream_set_line_buffer(FILE *fp) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); extern void __wt_stream_set_no_buffer(FILE *fp) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); -extern void __wt_sleep(uint64_t seconds, uint64_t micro_seconds) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); +extern void __wt_sleep(uint64_t seconds, uint64_t micro_seconds) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); extern int __wt_thread_create(WT_SESSION_IMPL *session, wt_thread_t *tidret, WT_THREAD_CALLBACK(*func)(void *), void *arg) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern int __wt_thread_join(WT_SESSION_IMPL *session, wt_thread_t tid) WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result)) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("hidden"))); extern void __wt_thread_id(char *buf, size_t buflen) WT_GCC_FUNC_DECL_ATTRIBUTE((visibility("default"))); diff --git a/src/os_common/os_alloc.c b/src/os_common/os_alloc.c index bfe5efafc8b..ef96ed09ea7 100644 --- a/src/os_common/os_alloc.c +++ b/src/os_common/os_alloc.c @@ -30,6 +30,7 @@ */ int __wt_calloc(WT_SESSION_IMPL *session, size_t number, size_t size, void *retp) + WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) { void *p; @@ -282,6 +283,7 @@ __wt_strndup(WT_SESSION_IMPL *session, const void *str, size_t len, void *retp) */ void __wt_free_int(WT_SESSION_IMPL *session, const void *p_arg) + WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) { void *p; diff --git a/src/os_posix/os_sleep.c b/src/os_posix/os_sleep.c index 8633b8d1ec0..2c60987ced7 100644 --- a/src/os_posix/os_sleep.c +++ b/src/os_posix/os_sleep.c @@ -14,6 +14,7 @@ */ void __wt_sleep(uint64_t seconds, uint64_t micro_seconds) + WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) { struct timeval t; diff --git a/src/support/err.c b/src/support/err.c index 4242ac63696..369997d38c0 100644 --- a/src/support/err.c +++ b/src/support/err.c @@ -304,6 +304,7 @@ void __wt_err(WT_SESSION_IMPL *session, int error, const char *fmt, ...) WT_GCC_FUNC_ATTRIBUTE((cold)) WT_GCC_FUNC_ATTRIBUTE((format (printf, 3, 4))) + WT_GCC_FUNC_ATTRIBUTE((visibility("default"))) { va_list ap; |