Changeset 1169:11724ff78638 in freeDiameter

Timestamp:

Jun 1, 2013, 3:23:55 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Some cleanups in dbg_interactive extension

Files:

• doc/dbg_interactive.py.sample (modified) (4 diffs)
• extensions/dbg_interactive/dbg_interactive.c (modified) (1 diff)
• extensions/dbg_interactive/dbg_interactive.i (modified) (1 diff)
• include/freeDiameter/libfdcore.h (modified) (1 diff)
• include/freeDiameter/libfdproto.h (modified) (1 diff)

doc/dbg_interactive.py.sample

@@ -30 +30 @@
 
 # The remaining of this file gives some examples of how to use the python interpreter.
-# Note that the support is not yet totally usable. You'll probably have to extend some classes
-# or write some typemaps in the source code of the extension to do what you want.
+# Note that at the moment not 100% of the framework is usable. 
+# You may have to extend some classes or write some typemaps in the source code 
+# of the extension to do what you want.
 
 
@@ -43 +44 @@
 
 # Change the global debug level of the framework (cvar contains all global variables)
-cvar.fd_g_debug_lvl = FULL
+cvar.fd_g_debug_lvl = 1
 
 
@@ -53 +54 @@
 # Note: the python version does not support printf-like argument list. The formating should be done in python.
 #       See SWIG documentation about varargs functions for more information.
-fd_log_debug_fstr(None, "3 + 4 = %d" % (7))
+fd_log(FD_LOG_NOTICE, "3 + 4 = %d" % (7))
 
 
 # Display some framework state information
-r = fd_event_send(cvar.fd_g_config.cnf_main_ev, FDEV_DUMP_PEERS, 0, None)
-r = fd_event_send(cvar.fd_g_config.cnf_main_ev, FDEV_DUMP_SERV, 0, None)
-r = fd_event_send(cvar.fd_g_config.cnf_main_ev, FDEV_DUMP_EXT, 0, None)
+conf = fd_conf_dump();
+print conf;
+
+fd_peer_dump_list(0)
+fd_servers_dump(0)
+fd_ext_dump(0)
 
 
@@ -659 +663 @@
 
 
+############# HOOKS ############
+
+# TODO
 
 ############# PEERS ############

extensions/dbg_interactive/dbg_interactive.c

@@ -80 +80 @@
         /* Upon exit, issue the order of terminating to fD, if the interpreter was started without a file */
         if (!arg) {
-                CHECK_FCT_DO(fd_event_send(fd_g_config->cnf_main_ev, FDEV_TERMINATE, 0, NULL), );
+                (void)fd_core_shutdown();
         }
 

extensions/dbg_interactive/dbg_interactive.i

@@ -122 +122 @@
 }
 
+/* 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) {
+        $1 = &temp; $2 = &tempn; $3 = NULL;
+}
+%typemap(freearg,match="in") (char ** buf, size_t *len, size_t *offset) "";
+%typemap(argout,noblock=1,fragment="SWIG_FromCharPtr")(char ** buf, size_t *len, size_t *offset) { 
+  if (*$1) {
+    %append_output(SWIG_FromCharPtr(*$1));
+    free(*$1);                                               
+  }                                                  
+}                                                            
+
 /* Typemap to return a boolean value as output parameter */
 %typemap(in, numinputs=0,noblock=1) int * BOOL_OUT (int temp) {

include/freeDiameter/libfdcore.h

@@ -808 +808 @@
 /* The "old" FD_EV_DUMP_* events are replaced with direct calls to the following dump functions */
 DECLARE_FD_DUMP_PROTOTYPE(fd_conf_dump);
+#else /* SWIG */
+DECLARE_FD_DUMP_PROTOTYPE_simple(fd_event_trig_dump);
+DECLARE_FD_DUMP_PROTOTYPE_simple(fd_conf_dump);
+#endif /* SWIG */
 DECLARE_FD_DUMP_PROTOTYPE(fd_ext_dump, int indent_next);
 DECLARE_FD_DUMP_PROTOTYPE(fd_servers_dump, int details);
-#endif /* SWIG */
 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump_list, int details);
 DECLARE_FD_DUMP_PROTOTYPE(fd_peer_dump, struct peer_hdr * p, int details);

include/freeDiameter/libfdproto.h

@@ -239 +239 @@
 #define DECLARE_FD_DUMP_PROTOTYPE( function_name, args... )     \
         char * function_name(char ** buf, size_t *len, size_t *offset, ##args)
+
+#ifdef SWIG
+#define DECLARE_FD_DUMP_PROTOTYPE_simple( function_name )       \
+        char * function_name(char ** buf, size_t *len, size_t *offset)
+#endif /* SWIG */