Changeset 1088:1d1a20a0779d in freeDiameter for extensions/dbg_interactive/sessions.i

Timestamp:

May 5, 2013, 4:25:27 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Second part of changeset 1083, now the code compiles again. Still missing some functions implementation, though

File:

• extensions/dbg_interactive/sessions.i (modified) (5 diffs)

extensions/dbg_interactive/sessions.i

@@ -39 +39 @@
 
 %{
+struct sess_state {
+        PyObject * pystate;
+};
+
 /* call it (might be called from a different thread than the interpreter, when session times out) */
-static void call_the_python_cleanup_callback(session_state * state, os0_t sid, void * cb) {
+static void call_the_python_cleanup_callback(struct sess_state * state, os0_t sid, void * cb) {
         PyObject *result;
         if (!cb) {
@@ -67 +71 @@
                 Py_XINCREF(PyCb);
                 
-                ret = fd_sess_handler_create_internal ( &hdl, call_the_python_cleanup_callback, PyCb );
+                ret = fd_sess_handler_create ( &hdl, call_the_python_cleanup_callback, NULL, PyCb );
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -87 +91 @@
         }
         void dump() {
-                fd_sess_dump_hdl(0, $self);
+                char * buf = NULL;
+                size_t len;
+                printf("%s", fd_sess_dump_hdl(&buf, &len, NULL, $self));
+                free(buf);
         }
 }
@@ -166 +173 @@
         }
         void dump() {
-                fd_sess_dump(0, $self);
+                char * buf = NULL;
+                size_t len = 0;
+                printf("%s", fd_sess_dump(&buf, &len, NULL, $self, 1) );
+                free(buf);
         }
         void store(struct session_handler * handler, PyObject * DISOWN) {
                 int ret;
-                void * store = DISOWN;
+                struct sess_state * st = NULL;
+                st = malloc(sizeof(struct sess_state));
+                st->pystate = DISOWN;
                 Py_XINCREF(DISOWN);
-                ret = fd_sess_state_store_internal(handler, $self, (void *) &store);
+                ret = fd_sess_state_store(handler, $self, (void *) &st);
                 if (ret != 0) {
                         DI_ERROR(ret, NULL, NULL);
@@ -180 +192 @@
         PyObject * retrieve(struct session_handler * handler) {
                 int ret;
+                struct sess_state * st = NULL;
                 PyObject * state = NULL;
-                ret = fd_sess_state_retrieve_internal(handler, $self, (void *) &state);
-                if (ret != 0) {
-                        DI_ERROR(ret, NULL, NULL);
-                        return NULL;
-                }
-                if (state == NULL) {
+                ret = fd_sess_state_retrieve_internal(handler, $self, (void *) &st);
+                if (ret != 0) {
+                        DI_ERROR(ret, NULL, NULL);
+                        return NULL;
+                }
+                if (st == NULL) {
                         Py_INCREF(Py_None);
                         return Py_None;
                 }
+                state = st->pystate;
+                free(st);
                 return state;
         }