Changeset 639:95a784729cac in freeDiameter for extensions/dbg_interactive/dispatch.i

Timestamp:

Dec 20, 2010, 1:07:06 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number.

File:

• extensions/dbg_interactive/dispatch.i (modified) (4 diffs)

extensions/dbg_interactive/dispatch.i

@@ -40 +40 @@
 
 %{
-/* store the python callback function here */
-static PyObject * py_dispatch_cb = NULL;
-static int        py_dispatch_cb_n = 0;
 /* call it (will be called from a different thread than the interpreter, when message arrives) */
-static int call_the_python_dispatch_callback(struct msg **msg, struct avp *avp, struct session *session, enum disp_action *action) {
+static int call_the_python_dispatch_callback(struct msg **msg, struct avp *avp, struct session *session, void * pycb, enum disp_action *action) {
         PyObject *PyMsg, *PyAvp, *PySess;
-        PyObject *result = NULL;
+        PyObject *cb, *result = NULL;
         int ret = 0;
         
-        if (!py_dispatch_cb)
+        if (!pycb) {
+                fd_log_debug("Internal error: missing the callback!\n");
                 return ENOTSUP;
+        }
+        cb = pycb;
         
         SWIG_PYTHON_THREAD_BEGIN_BLOCK;
@@ -59 +59 @@
         
         /* Call the function */
-        result = PyEval_CallFunction(py_dispatch_cb, "(OOO)", PyMsg, PyAvp, PySess);
+        result = PyEval_CallFunction(cb, "(OOO)", PyMsg, PyAvp, PySess);
         
         /* The result is supposedly composed of: [ ret, *msg, *action ] */
@@ -108 +108 @@
                 struct disp_hdl * hdl = NULL;
                 int ret;
-                if (py_dispatch_cb && (py_dispatch_cb != PyCb)) {
-                        DI_ERROR(EINVAL, PyExc_SyntaxError, "Only one dispatch callback is supported at the moment in this extension\n.");
-                        return NULL;
-                }
-                py_dispatch_cb = PyCb;
-                py_dispatch_cb_n += 1;
-                Py_XINCREF(py_dispatch_cb);
                 
-                ret = fd_disp_register ( call_the_python_dispatch_callback, how, when, &hdl );
+                Py_XINCREF(PyCb);
+                
+                ret = fd_disp_register ( call_the_python_dispatch_callback, how, when, PyCb, &hdl );
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -125 +120 @@
         ~disp_hdl() {
                 struct disp_hdl * hdl = self;
-                int ret = fd_disp_unregister(&hdl);
+                PyObject * cb = NULL;
+                int ret = fd_disp_unregister(&hdl, (void *)&cb);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
                 }
-                /* Now free the callback */
-                Py_XDECREF(py_dispatch_cb);
-                py_dispatch_cb_n -= 1;
-                if (!py_dispatch_cb_n)
-                        py_dispatch_cb = NULL;
+                Py_XDECREF(cb);
                 return;
         }