Let's compile SURF once in the afternoon and cleanup the mess I've set by changing...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1821 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 8668832..c586fc5 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -9,8 +9,6 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "surf/surf_parse_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(deployment, msg,
-                               "Logging specific to MSG (environment)");
 
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;

diff --git a/src/msg/host.c b/src/msg/host.c
index 17249ba..8e2fd41 100644 (file)
--- a/src/msg/host.c
+++ b/src/msg/host.c
@@ -8,8 +8,6 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(host, msg,
-                               "Logging specific to MSG (host)");
 
 /** \defgroup m_host_management Management functions of Hosts
  *  \brief This section describes the host structure of MSG

diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index 50cb176..30c330a 100644 (file)
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -12,10 +12,6 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_cfg, msg,
-                               "Configuration support in \ref MSG_API");
-
-
 int _msg_init_status = 0; /* 0: beginning of time; 
                              1: pre-inited (cfg_set created); 
                              2: inited (running) */

diff --git a/src/msg/task.c b/src/msg/task.c
index b6c608a..e5dda01 100644 (file)
--- a/src/msg/task.c
+++ b/src/msg/task.c
@@ -8,8 +8,6 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(task, msg,
-                               "Logging specific to MSG (task)");
 
 /** \defgroup m_task_management Managing functions of Tasks
  *  \brief This section describes the task structure of MSG

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index f3d7fe4..e3c0967 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -66,7 +66,7 @@ static void parse_cpu(void)
   surf_parse_get_trace(&power_trace,A_cpu_availability_file);
 
   xbt_assert0((A_cpu_state==A_cpu_state_ON)||(A_cpu_state==A_cpu_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
   if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
   surf_parse_get_trace(&state_trace,A_cpu_state_file);

diff --git a/src/surf/network.c b/src/surf/network.c
index 1f9f4c7..202c2c6 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -127,7 +127,7 @@ static void parse_network_link(void)
 
   xbt_assert0((A_network_link_state==A_network_link_state_ON)||
              (A_network_link_state==A_network_link_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
   else if (A_network_link_state==A_network_link_state_OFF) 

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 9d5d10f..b307415 100644 (file)
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -121,7 +121,7 @@ static void parse_network_link(void)
 
   xbt_assert0((A_network_link_state==A_network_link_state_ON)||
              (A_network_link_state==A_network_link_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
   if (A_network_link_state==A_network_link_state_OFF) 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 633675d..30bdc88 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -12,10 +12,6 @@ typedef struct surf_resource_object {
   surf_resource_t resource;
 } s_surf_resource_object_t, *surf_resource_object_t;
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf,
-                               "Logging specific to the SURF global module");
-
-
 static double NOW = 0;
 
 xbt_dynar_t resource_list = NULL;

diff --git a/src/surf/surf_parse.c b/src/surf/surf_parse.c
index e432e14..1bbc565 100644 (file)
--- a/src/surf/surf_parse.c
+++ b/src/surf/surf_parse.c
@@ -11,6 +11,7 @@
 #include "surf/surf_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf ,"Logging specific to the SURF  module");
 
+#undef CLEANUP
 #include "surfxml.c"
 
 static xbt_dynar_t surf_input_buffer_stack=NULL;

diff --git a/src/surf/surf_timer.c b/src/surf/surf_timer.c
index 678af82..9f4d72d 100644 (file)
--- a/src/surf/surf_timer.c
+++ b/src/surf/surf_timer.c
@@ -8,9 +8,6 @@
 #include "xbt/ex.h"
 #include "surf_timer_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(timer, surf,
-                               "Logging specific to the SURF timer module");
-
 surf_timer_resource_t surf_timer_resource = NULL;
 static tmgr_trace_t empty_trace = NULL;
 static xbt_swag_t command_pending = NULL;

diff --git a/src/surf/trace_mgr.c b/src/surf/trace_mgr.c
index b5ddf85..aee5753 100644 (file)
--- a/src/surf/trace_mgr.c
+++ b/src/surf/trace_mgr.c
@@ -10,10 +10,6 @@
 #include "xbt/dict.h"
 #include "trace_mgr_private.h"
 #include "surf_private.h"
-#include <stdlib.h>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trace, surf,
-                               "Logging specific to the SURF trace module");
 
 static xbt_dict_t trace_list = NULL;
 static void _tmgr_trace_free(void *trace)

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index fc6a97e..757e10e 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -11,9 +11,6 @@
 #include "cpu_private.h"
 #include "network_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf,
-                               "Logging specific to the SURF workstation module");
-
 surf_workstation_resource_t surf_workstation_resource = NULL;
 
 xbt_dict_t workstation_set = NULL;

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 0221e7c..fc2e0c7 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -103,7 +103,7 @@ static void parse_workstation(void)
 
   xbt_assert0((A_cpu_state==A_cpu_state_ON)||
              (A_cpu_state==A_cpu_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_cpu_state==A_cpu_state_ON) state_initial = SURF_CPU_ON;
   if (A_cpu_state==A_cpu_state_OFF) state_initial = SURF_CPU_OFF;
   surf_parse_get_trace(&state_trace,A_cpu_state_file);
@@ -229,7 +229,7 @@ static void parse_network_link(void)
 
   xbt_assert0((A_network_link_state==A_network_link_state_ON)||
              (A_network_link_state==A_network_link_state_OFF),
-             "Invalid state")
+             "Invalid state");
   if (A_network_link_state==A_network_link_state_ON) 
     state_initial = SURF_NETWORK_LINK_ON;
   if (A_network_link_state==A_network_link_state_OFF)