Changeset 649:5e5d8152c229 in freeDiameter for extensions/dbg_interactive/messages.i

Timestamp:

Jan 5, 2011, 5:13:34 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Implemented fd_msg_send_timeout to close #10. Not tested yet.

File:

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

extensions/dbg_interactive/messages.i

@@ -55 +55 @@
         }
         
-        SWIG_PYTHON_THREAD_BEGIN_BLOCK;
-        
-        if (!msg || !*msg) {
-                PyMsg = Py_None;
-        } else {
-                PyMsg = SWIG_NewPointerObj((void *)*msg,     SWIGTYPE_p_msg,     0 );
-        }
-        
-        result = PyEval_CallFunction(l->cb, "(OO)", PyMsg, l->data);
-        Py_XDECREF(l->cb);
-        Py_XDECREF(l->data);
-        free(l);
-        
-        /* The callback is supposed to return a message or NULL */
-        if (!SWIG_IsOK(SWIG_ConvertPtr(result, (void *)msg, SWIGTYPE_p_msg, SWIG_POINTER_DISOWN))) {
-                fd_log_debug("Error: Cannot convert the return value to message.\n");
-                *msg = NULL;
-        }
-        
-        Py_XDECREF(result);
-        
-        SWIG_PYTHON_THREAD_END_BLOCK;
-        
+        if (l->cb) {
+        
+                SWIG_PYTHON_THREAD_BEGIN_BLOCK;
+
+                if (!msg || !*msg) {
+                        PyMsg = Py_None;
+                } else {
+                        PyMsg = SWIG_NewPointerObj((void *)*msg,     SWIGTYPE_p_msg,     0 );
+                }
+
+                result = PyEval_CallFunction(l->cb, "(OO)", PyMsg, l->data);
+                Py_XDECREF(l->cb);
+                Py_XDECREF(l->data);
+                free(l);
+
+                /* The callback is supposed to return a message or NULL */
+                if (!SWIG_IsOK(SWIG_ConvertPtr(result, (void *)msg, SWIGTYPE_p_msg, SWIG_POINTER_DISOWN))) {
+                        fd_log_debug("Error: Cannot convert the return value to message.\n");
+                        *msg = NULL;
+                }
+
+                Py_XDECREF(result);
+
+                SWIG_PYTHON_THREAD_END_BLOCK;
+                
+        }
+        /* else */
+                /* Only the timeout was specified, without a callback */
+                /* in this case, just delete the message */
+                /* it actually happens automatically when we do nothing. */
 }
 %}
@@ -121 +128 @@
         /* SEND THE MESSAGE */
         %delobject send; /* when this has been called, the msg must not be freed anymore */
-        void send(PyObject * PyCb = NULL, PyObject * data = NULL) {
+        void send(PyObject * PyCb = NULL, PyObject * data = NULL, unsigned int timeout = 0) {
                 int ret;
                 struct msg * m = $self;
                 struct anscb_py_layer * l = NULL;
                 
-                if (PyCb) {
+                if (PyCb || timeout) {
                         l = malloc(sizeof(struct anscb_py_layer));
                         if (!l) {
@@ -139 +146 @@
                 }
                 
-                ret = fd_msg_send(&m, PyCb ? anscb_python : NULL, l);
+                if (timeout) {
+                        struct timespec ts;
+                        (void) clock_gettime(CLOCK_REALTIME, &ts);
+                        ts.tv_sec += timeout;
+                        ret = fd_msg_send_timeout(&m, anscb_python, l, &ts);
+                } else {
+                        ret = fd_msg_send(&m, PyCb ? anscb_python : NULL, l);
+                }
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -303 +317 @@
         }
         
+        /* Is request? (shortcut) */
+        PyObject * is_request() {
+                PyObject * r;
+                int ret;
+                struct msg_hdr * h;
+                
+                ret = fd_msg_hdr($self, &h);
+                if (ret != 0) {
+                        DI_ERROR(ret, NULL, NULL);
+                }
+                if (h->msg_flags & CMD_FLAG_REQUEST) 
+                        r = Py_True;
+                else
+                        r = Py_False;
+                Py_XINCREF(r);
+                return r;
+        }
+        
         /* Get the source */
         char *source() {