Make modules more flexible (builtin or loaded are identical). Add a test module

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / module.c

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
index 871668dc97337eb773ebc412fce3a796068519df..69694d6f7b28e73863fe77bd8063abc607375b42 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/module.c
@@ -37,13 +37,10 @@
  * Author : Mathieu Desnoyers, June 2003
  */
 
-#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
-
 #include <glib.h>
-#include <gmodule.h>
+#include <lttv/lttv.h>
 #include <lttv/module.h>
-#include <lttv/gtkTraceSet.h>
+#include <lttv/gtktraceset.h>
 
 #include "cfv.h"
 #include "eventhooks.h"
@@ -68,16 +65,8 @@ GSList *g_control_flow_data_list = NULL ;
  * This function initializes the Control Flow Viewer functionnality through the
  * gtkTraceSet API.
  */
-G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
+static void init() {
 
-  Main_Win_Module = lttv_module_require(self, "mainwin", argc, argv);
-  
-  if(Main_Win_Module == NULL)
-  {
-    g_critical("Can't load Control Flow Viewer : missing mainwin\n");
-    return;
-  }
-  
   g_info("GUI ControlFlow Viewer init()");
 
   /* Register the toolbar insert button */
@@ -103,7 +92,7 @@ void destroy_walk(gpointer data, gpointer user_data)
  * This function releases the memory reserved by the module and unregisters
  * everything that has been registered in the gtkTraceSet API.
  */
-G_MODULE_EXPORT void destroy() {
+static void destroy() {
   g_info("GUI Control Flow Viewer destroy()");
   int i;
 
@@ -118,3 +107,8 @@ G_MODULE_EXPORT void destroy() {
   menu_item_unreg(h_guicontrolflow);
   
 }
+
+
+LTTV_MODULE("guicontrolflow", "Control flow viewer", \
+    "Graphical module to view processes state and control flow", \
+    init, destroy, "mainwin")