diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-12-06 14:12:41 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2016-12-06 14:12:41 +1100 |
| commit | 00c60c5e79ecce107f6852a9f82e8329fc492c0a (patch) | |
| tree | 33f57c890cbb4f75e2f9537fb41ce624651ba585 /lang | |
| parent | f1152ba768da7e03fbca5131b289f0407565050a (diff) | |
| download | mongo-00c60c5e79ecce107f6852a9f82e8329fc492c0a.tar.gz | |
WT-3053 Make Python use internal memory allocation again. (#3179)
Since we aren't going to make allocation functions hidden, revert
changes to the Python API in WT-3014 so it uses internal memory
allocation functions, matching the Java API.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/wiredtiger.i | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index a28d3ac4c19..7bc84066d64 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -86,8 +86,8 @@ from packing import pack, unpack if (*$1 != NULL) { PY_CALLBACK *pcb; - if ((pcb = calloc(1, sizeof(PY_CALLBACK))) == NULL) - SWIG_exception_fail(SWIG_MemoryError, "calloc failed"); + if (__wt_calloc_def((WT_SESSION_IMPL *)(*$1), 1, &pcb) != 0) + SWIG_exception_fail(SWIG_MemoryError, "WT calloc failed"); else { Py_XINCREF($result); pcb->pyobj = $result; @@ -109,8 +109,8 @@ from packing import pack, unpack PyObject_SetAttrString($result, "value_format", PyString_InternFromString((*$1)->value_format)); - if ((pcb = calloc(1, sizeof(PY_CALLBACK))) == NULL) - SWIG_exception_fail(SWIG_MemoryError, "calloc failed"); + if (__wt_calloc_def((WT_ASYNC_OP_IMPL *)(*$1), 1, &pcb) != 0) + SWIG_exception_fail(SWIG_MemoryError, "WT calloc failed"); else { pcb->pyobj = $result; Py_XINCREF(pcb->pyobj); @@ -141,8 +141,8 @@ from packing import pack, unpack PyObject_SetAttrString($result, "value_format", PyString_InternFromString((*$1)->value_format)); - if ((pcb = calloc(1, sizeof(PY_CALLBACK))) == NULL) - SWIG_exception_fail(SWIG_MemoryError, "calloc failed"); + if (__wt_calloc_def((WT_SESSION_IMPL *)(*$1)->session, 1, &pcb) != 0) + SWIG_exception_fail(SWIG_MemoryError, "WT calloc failed"); else { Py_XINCREF($result); pcb->pyobj = $result; @@ -1070,7 +1070,7 @@ sessionCloseHandler(WT_SESSION *session_arg) session->lang_private = NULL; if (pcb != NULL) ret = pythonClose(pcb); - free(pcb); + __wt_free(session, pcb); return (ret); } @@ -1087,7 +1087,7 @@ cursorCloseHandler(WT_CURSOR *cursor) cursor->lang_private = NULL; if (pcb != NULL) ret = pythonClose(pcb); - free(pcb); + __wt_free((WT_SESSION_IMPL *)cursor->session, pcb); return (ret); } @@ -1102,7 +1102,7 @@ sessionFreeHandler(WT_SESSION *session_arg) session = (WT_SESSION_IMPL *)session_arg; pcb = (PY_CALLBACK *)session->lang_private; session->lang_private = NULL; - free(pcb); + __wt_free(session, pcb); return (0); } @@ -1114,7 +1114,7 @@ cursorFreeHandler(WT_CURSOR *cursor) pcb = (PY_CALLBACK *)cursor->lang_private; cursor->lang_private = NULL; - free(pcb); + __wt_free((WT_SESSION_IMPL *)cursor->session, pcb); return (0); } @@ -1191,7 +1191,7 @@ err: __wt_err(session, ret, "python async callback error"); if ((t_ret = pythonClose(pcb) != 0) && ret == 0) ret = t_ret; } - free(pcb); + __wt_free(session, pcb); if (ret == 0 && (opret == 0 || opret == WT_NOTFOUND)) return (0); |