Changeset 1183:42d3fd71e7ea in freeDiameter for extensions

Timestamp:

Jun 6, 2013, 4:49:38 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

dbg_interactive is segfaulting when exited with Ctrl-C, not sure how to fix it...

Location:

extensions/dbg_interactive

Files:

• dbg_interactive.c (modified) (4 diffs)
• dbg_interactive.i (modified) (1 diff)

extensions/dbg_interactive/dbg_interactive.c

@@ -56 +56 @@
 {
         char * dum[3] = { "<dbg_interactive>", arg, NULL };
+
         TRACE_ENTRY("%p", arg);
         
@@ -71 +72 @@
                 }
                 printf("Starting interactive python interpreter [experimental].\n");
+                printf("Please use Ctrl-D to exit.\n");
                 printf("Example syntax:\n");
                 printf("   >>> print cvar.fd_g_config.cnf_diamid\n");
                 printf("   '%s'\n", fd_g_config->cnf_diamid);
                 Py_Main(1, dum);
+                printf("Python interpreter has exited...\n");
         }
         
@@ -93 +96 @@
         TRACE_ENTRY("%p", conffile);
         
-        Py_Initialize();
+        Py_InitializeEx(0);
         
         WRAPPER_INIT;
@@ -125 +128 @@
 {
         TRACE_ENTRY();
-        
-        CHECK_FCT_DO(fd_thr_term(&pyinterp), );
+        void * ret;
         
         /* Cleanup the python interpreter */
         Py_Finalize();
+        pthread_join(pyinterp, &ret);
         
         return ;

extensions/dbg_interactive/dbg_interactive.i

@@ -123 +123 @@
 
 /* Case of the fd_*_dump functions */
-%typemap(in,noblock=1,numinputs=0) (char ** buf, size_t *len, size_t *offset) ($*1_ltype temp = NULL, $*2_ltype tempn) {
+%typemap(in,noblock=1,numinputs=0) (char ** buf, size_t *len, size_t *offset) ($*1_ltype temp = NULL, $*2_ltype tempn = 0) {
         $1 = &temp; $2 = &tempn; $3 = NULL;
 }