Changeset 624:a5682d003ed9 in freeDiameter for extensions/dbg_interactive/dbg_interactive.c

Timestamp:

Dec 9, 2010, 5:14:24 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Finally got the proxy aka shadow class to work

File:

• extensions/dbg_interactive/dbg_interactive.c (modified) (2 diffs)

extensions/dbg_interactive/dbg_interactive.c

@@ -38 +38 @@
 
 /* wrapper generated by SWIG */
-extern void init_diwrap(void);
+#if PY_VERSION_HEX >= 0x03000000
+        extern void PyInit__fDpy(void);
+        #define WRAPPER_INIT    PyInit__fDpy()
+#else /* PY_VERSION_HEX */
+        extern void init_fDpy(void);
+        #define WRAPPER_INIT    init_fDpy()
+#endif /* PY_VERSION_HEX */
+        
+/* The string created in the shadow proxy C string file */
+extern unsigned char fDpy_py[];
+extern unsigned int fDpy_py_len;
 
 /* Run an interactive interpreter in a separate thread */
@@ -63 +73 @@
 static int di_main(char * conffile)
 {
+        char * shadow_hlp = NULL;
+        int mustfree = 0;
         TRACE_ENTRY("%p", conffile);
         
         Py_Initialize();
         
-#if PY_VERSION_HEX >= 0x03000000
-        PyInit__diwrap();
-#else /* PY_VERSION_HEX */
-        init_diwrap();
-#endif /* PY_VERSION_HEX */
+        WRAPPER_INIT;
         
-        /* 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");
+        /* Small hack to avoid duplicating the string, we replace the last char by a \0.
+          It works if the python file is terminated with several \n */
+        if (   (fDpy_py[fDpy_py_len - 2] == '\n')
+            && (fDpy_py[fDpy_py_len - 1] == '\n')) {
+                fDpy_py[fDpy_py_len - 1] = '\0';
+                shadow_hlp = (char *)&fDpy_py[0];
+        } else {
+                CHECK_MALLOC(shadow_hlp = malloc(fDpy_py_len + 1));
+                memcpy(shadow_hlp, fDpy_py, fDpy_py_len);
+                shadow_hlp[fDpy_py_len] = '\0';
+                mustfree=1;
+        }
+        
+        PyRun_SimpleString("__file__ = \"\"\n");
+        PyRun_SimpleString(shadow_hlp);
+        
+        if (mustfree)
+                free(shadow_hlp);
+                
+        
         if (TRACE_BOOL(INFO)) {
                 PyRun_SimpleString("print \"[dbg_interactive] \",FD_PROJECT_NAME,FD_PROJECT_VERSION_MAJOR,FD_PROJECT_VERSION_MINOR,FD_PROJECT_VERSION_REV\n");