Changeset 618:1dbc4c5397d6 in freeDiameter for extensions/dbg_interactive

Timestamp:

Dec 3, 2010, 6:29:51 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Attempting to improve python wrapper usability (work in progress)

Location:

extensions/dbg_interactive

Files:

• CMakeLists.txt (modified) (1 diff)
• dbg_interactive.c (modified) (1 diff)
• diwrap.i (modified) (1 diff)

extensions/dbg_interactive/CMakeLists.txt

@@ -13 +13 @@
 SET(CMAKE_SWIG_FLAGS "")
 
-# We create the module even if we don't use it, so that intermediate values are defined
+# Add the dependencies for re-swig-ing the file
+SET(SWIG_MODULE_diwrap_EXTRA_DEPS 
+        ${CMAKE_BINARY_DIR}/include/freeDiameter/freeDiameter-host.h 
+        ${CMAKE_SOURCE_DIR}/include/freeDiameter/libfreeDiameter.h 
+        ${CMAKE_SOURCE_DIR}/include/freeDiameter/freeDiameter.h)
+
+# We create the module even if we don't use it, so that intermediate values are defined (OK, this is stupid...)
 SWIG_ADD_MODULE(diwrap python diwrap.i)
 

extensions/dbg_interactive/dbg_interactive.c

@@ -44 +44 @@
 static void * myinterp (void * arg)
 {
-        char * dum[2] = { arg, NULL };
+        char * dum[3] = { "<dbg_interactive>", arg, NULL };
         TRACE_ENTRY("%p", arg);
+        
+        fd_log_threadname ( "[dbg_interactive python interpreter]" );
         
         sleep(1);
         fd_log_debug("\nStarting python interpreter [experimental].\n");
         fd_log_debug("Example syntax:\n>>> print fd_config_cnf_diamid_get(cvar.fd_g_config)\n\n");
-        Py_Main(arg ? 1 : 0, dum);
+        Py_Main(arg ? 2 : 1, dum);
         
         /* Upon exit, issue the order of terminating to fD */

extensions/dbg_interactive/diwrap.i

@@ -34 +34 @@
 *********************************************************************************************************/
 
+/* This interface file is processed by SWIG to create a python wrapper interface to freeDiameter framework. */
 %module diwrap
+
+/* Include standard types used in freeDiameter headers */
+%include <stdint.i>
+  
+/* Allow modification of the wrapper for OUTPUT vars */
+%include "typemaps.i"
+
 %{
-/* include the header in the wrapper code */
+/* Define types etc. */
 #include <freeDiameter/extension.h>
 %}
 
-/* Parse the header to generate the wrappers */
+/* Retrieve the compile-time definitions of freeDiameter */
 %include "freeDiameter/freeDiameter-host.h"
 %include "freeDiameter/libfreeDiameter.h"