diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-05-28 15:14:14 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-05-28 15:14:14 +1000 |
| commit | c904ad189f81d9cb87690eb92bb085322b41795c (patch) | |
| tree | 617f0c1db22a87a16f9d509713ae5724fb5c564b /lang | |
| parent | f5b84b5c5012ef23ac0db5ab7dc839996daa421d (diff) | |
| download | mongo-c904ad189f81d9cb87690eb92bb085322b41795c.tar.gz | |
Add an app_private field to the WT_ASYNC_OP handle.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/java/wiredtiger.i | 8 | ||||
| -rw-r--r-- | lang/python/wiredtiger.i | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i index b3dc74eeaf3..9f44a0cd7d2 100644 --- a/lang/java/wiredtiger.i +++ b/lang/java/wiredtiger.i @@ -392,9 +392,9 @@ javaAsyncHandler(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, WT_UNUSED(flags); op = (WT_ASYNC_OP_IMPL *)asyncop; session = O2S(op); - jcb = (JAVA_CALLBACK *)asyncop->async_app_private; + jcb = (JAVA_CALLBACK *)asyncop->app_private; conn_jcb = (JAVA_CALLBACK *)S2C(session)->lang_private; - asyncop->async_app_private = NULL; + asyncop->app_private = NULL; /* * We rely on the fact that the async machinery uses a pool of @@ -539,7 +539,7 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler}; %javamethodmodifiers java_init "protected"; int java_init(jobject jasyncop) { JAVA_CALLBACK *jcb = - (JAVA_CALLBACK *)$self->async_app_private; + (JAVA_CALLBACK *)$self->app_private; jcb->jobj = JCALL1(NewGlobalRef, jcb->jnienv, jasyncop); JCALL1(DeleteLocalRef, jcb->jnienv, jasyncop); return (0); @@ -1766,7 +1766,7 @@ err: if (ret != 0) (*jenv)->GetJavaVM(jenv, &jcb->javavm); jcb->jcallback = JCALL1(NewGlobalRef, jcb->jnienv, callbackObject); JCALL1(DeleteLocalRef, jcb->jnienv, callbackObject); - asyncop->async_app_private = jcb; + asyncop->app_private = jcb; asyncop->c.flags |= WT_CURSTD_RAW; err: if (ret != 0) diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index a07b699156e..011e6a959d2 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -110,7 +110,7 @@ from packing import pack, unpack /* XXX Is there a way to avoid SWIG's numbering? */ pcb->pyasynccb = callback_obj5; Py_XINCREF(pcb->pyasynccb); - (*$1)->async_app_private = pcb; + (*$1)->app_private = pcb; } } } @@ -1033,8 +1033,8 @@ pythonAsyncCallback(WT_ASYNC_CALLBACK *cb, WT_ASYNC_OP *asyncop, int opret, op = (WT_ASYNC_OP_IMPL *)asyncop; session = O2S(op); - pcb = (PY_CALLBACK *)asyncop->async_app_private; - asyncop->async_app_private = NULL; + pcb = (PY_CALLBACK *)asyncop->app_private; + asyncop->app_private = NULL; ret = 0; if (pcb->pyasynccb == NULL) |