Changeset 640:237cf6339546 in freeDiameter for extensions/dbg_interactive/queues.i

Timestamp:

Dec 20, 2010, 7:36:40 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

dbg_interactive almost complete

File:

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

extensions/dbg_interactive/queues.i

@@ -77 +77 @@
         
         /* Post an item */
-        void post(PyObject * item) {
-                int ret;
-                PyObject * i = item;
-                
-                Py_XINCREF(i);
-                ret = fd_fifo_post($self, &i);
+        void post(PyObject * item, char * type = NULL) {
+                int ret;
+                if (type) {
+                        void * real_obj = NULL;
+                        swig_type_info * desttype = NULL;
+                        desttype = SWIG_TypeQuery(type);
+                        if (!desttype) {
+                                DI_ERROR(EINVAL, NULL, "Unable to resolve this type. Please check the form: 'struct blahbla *'");
+                                return;
+                        }
+                        /* Now, get the "real" value under the shadow umbrella */
+                        ret = SWIG_ConvertPtr(item, &real_obj, desttype, SWIG_POINTER_DISOWN );
+                        if (!SWIG_IsOK(ret)) {
+                                DI_ERROR(EINVAL, SWIG_ErrorType(ret), "Unable to convert the item to given type");
+                                return;
+                        }
+                        ret = fd_fifo_post($self, &real_obj);
+                } else {
+                        PyObject * i = item;
+                        Py_XINCREF(i);
+                        ret = fd_fifo_post($self, &i);
+                }
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -89 +105 @@
         
         /* Get (blocking) */
-        PyObject * get() {
+        PyObject * get(char * type = NULL) {
                 int ret;
                 PyObject * i = NULL;
-                
-                ret = fd_fifo_get($self, &i);
-                if (ret != 0) {
-                        DI_ERROR(ret, NULL, NULL);
-                }
-                
-                return i;
+                void * obj = NULL;
+                swig_type_info * desttype = NULL;
+                if (type) {
+                        desttype = SWIG_TypeQuery(type);
+                        if (!desttype) {
+                                DI_ERROR(EINVAL, NULL, "Unable to resolve this type. Please check the form: 'struct blahbla *'");
+                                return NULL;
+                        }
+                }
+                
+                ret = fd_fifo_get($self, &obj);
+                if (ret != 0) {
+                        DI_ERROR(ret, NULL, NULL);
+                }
+                
+                if (type) {
+                        return SWIG_NewPointerObj(obj, desttype, 0 );
+                } else {
+                        i = obj;
+                        return i;
+                }
         }
         
         /* TryGet (non-blocking, returns None on empty queue) */
-        PyObject * tryget() {
+        PyObject * tryget(char * type = NULL) {
                 int ret;
                 PyObject * i = NULL;
-                
-                ret = fd_fifo_tryget($self, &i);
+                void * obj = NULL;
+                swig_type_info * desttype = NULL;
+                if (type) {
+                        desttype = SWIG_TypeQuery(type);
+                        if (!desttype) {
+                                DI_ERROR(EINVAL, NULL, "Unable to resolve this type. Please check the form: 'struct blahbla *'");
+                                return NULL;
+                        }
+                }
+                
+                ret = fd_fifo_tryget($self, &obj);
                 if (ret == EWOULDBLOCK) {
                         Py_XINCREF(Py_None);
@@ -115 +154 @@
                 }
                 
-                return i;
+                if (type) {
+                        return SWIG_NewPointerObj(obj, desttype, 0 );
+                } else {
+                        i = obj;
+                        return i;
+                }
         }
         
         /* TimedGet (blocking for a while) */
-        PyObject * timedget(long seconds) {
+        PyObject * timedget(long seconds, char * type = NULL) {
                 int ret;
                 PyObject * i = NULL;
                 struct timespec ts;
+                void * obj = NULL;
+                swig_type_info * desttype = NULL;
+                if (type) {
+                        desttype = SWIG_TypeQuery(type);
+                        if (!desttype) {
+                                DI_ERROR(EINVAL, NULL, "Unable to resolve this type. Please check the form: 'struct blahbla *'");
+                                return NULL;
+                        }
+                }
                 
                 clock_gettime(CLOCK_REALTIME, &ts);
                 ts.tv_sec += seconds;
                 
-                ret = fd_fifo_timedget($self, &i, &ts);
+                ret = fd_fifo_timedget($self, &obj, &ts);
                 if (ret == ETIMEDOUT) {
                         Py_XINCREF(Py_None);
@@ -136 +189 @@
                 }
                 
-                return i;
+                if (type) {
+                        return SWIG_NewPointerObj(obj, desttype, 0 );
+                } else {
+                        i = obj;
+                        return i;
+                }
         }