Changeset 621:04dbea46c7a2 in freeDiameter for extensions/dbg_interactive

Timestamp:

Dec 7, 2010, 11:13:58 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup many SWIG definitions from main .h files

Location:

extensions/dbg_interactive

Files:

• dbg_interactive.c (modified) (1 diff)
• diwrap.i (modified) (2 diffs)

extensions/dbg_interactive/dbg_interactive.c

@@ -66 +66 @@
         
         Py_Initialize();
+        
+#if PY_VERSION_HEX >= 0x03000000
+        PyInit__diwrap();
+#else /* PY_VERSION_HEX */
         init_diwrap();
+#endif /* PY_VERSION_HEX */
         
+        /* In future version, it might be better to use the diwrap.py file generated by SWIG here to get the proxy classes definitions */
         PyRun_SimpleString("from _diwrap import *\n");
         if (TRACE_BOOL(INFO)) {
-                PyRun_SimpleString("print \"[dbg_interactive] fD \",FD_PROJECT_VERSION_MAJOR,\".\",FD_PROJECT_VERSION_MINOR,\".\",FD_PROJECT_VERSION_REV\n");
+                PyRun_SimpleString("print \"[dbg_interactive] \",FD_PROJECT_NAME,FD_PROJECT_VERSION_MAJOR,FD_PROJECT_VERSION_MINOR,FD_PROJECT_VERSION_REV\n");
         }
         
-        /*
-        PyRun_SimpleString("config = cvar.fd_g_config\n");
-        PyRun_SimpleString("dict = fd_config_cnf_dict_get(config)\n");
-        PyRun_SimpleString("fd_dict_dump(dict)\n");
-        */
         CHECK_POSIX( pthread_create(&pyinterp, NULL, myinterp, conffile) );
  

extensions/dbg_interactive/diwrap.i

@@ -37 +37 @@
 %module diwrap
 
-/* Include standard types used in freeDiameter headers */
+/* Include standard types & functions used in freeDiameter headers */
 %include <stdint.i>
-  
-/* Allow modification of the wrapper for OUTPUT vars */
-%include "typemaps.i"
 
 %{
 /* Define types etc. */
+#define SWIG
 #include <freeDiameter/extension.h>
 %}
+
+/* Some functions are not available through the wrapper */
+%ignore fd_lib_init;
+%ignore fd_lib_fini;
+%ignore fd_sess_start;
+
+/* Inline functions seems to give problems to SWIG -- just remove the inline definition */
+%define __inline__ 
+%enddef
+
+/* Make some global-variables read-only */
+%immutable fd_g_config;
+%immutable peer_state_str;
+
+/* Overwrite a few functions prototypes for usability */
+extern void fd_list_init ( struct fd_list * list, void * obj = NULL );
+
 
 /* Retrieve the compile-time definitions of freeDiameter */
@@ -53 +68 @@
 %include "freeDiameter/freeDiameter.h"
 
+