technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Python: optimized response object close() calling.

Browse Source 
PyObject_HasAttrString() is just a wrapper over PyObject_GetAttrString(),
while PyObject_CallMethod() calls it as the first step.  As a result,
PyObject_GetAttrString() was called twice if close() was present.

To get rid of PyObject_HasAttrString() while keeping the same behaviour,
the PyObject_CallMethod() call has been decomposed into separate calls of
PyObject_GetAttrString() and PyObject_CallFunction().
This commit is contained in:
Valentin Bartenev
2019-11-14 17:48:48 +03:00
parent 75c2c23bb6
commit b3db7a30c0
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nxt_python_wsgi.c
View File

@@ -370,7 +370,8 @@ static void
nxt_python_request_handler(nxt_unit_request_info_t *req) nxt_python_request_handler(nxt_unit_request_info_t *req)
{ {
int rc; int rc;
PyObject *environ, *args, *response, *iterator, *item, *result; PyObject *environ, *args, *response, *iterator, *item;
PyObject *close, *result;
nxt_python_run_ctx_t run_ctx = {-1, 0, NULL, req}; nxt_python_run_ctx_t run_ctx = {-1, 0, NULL, req};
PyEval_RestoreThread(nxt_python_thread_state); PyEval_RestoreThread(nxt_python_thread_state);
@@ -461,17 +462,23 @@ nxt_python_request_handler(nxt_unit_request_info_t *req)
rc = NXT_UNIT_ERROR; rc = NXT_UNIT_ERROR;
} }
if (PyObject_HasAttrString(response, "close")) { close = PyObject_GetAttrString(response, "close");
result = PyObject_CallMethod(response, (char *) "close", NULL);
if (nxt_fast_path(result != NULL)) { if (close != NULL) {
Py_DECREF(result); result = PyObject_CallFunction(close, NULL);
if (nxt_slow_path(result == NULL)) {
} else {
nxt_unit_req_error(req, "Python failed to call the close() " nxt_unit_req_error(req, "Python failed to call the close() "
"method of the application response"); "method of the application response");
PyErr_Print(); PyErr_Print();
} else {
Py_DECREF(result);
} }
Py_DECREF(close);
} else {
PyErr_Clear();
} }
} }