Add debugging informations

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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 2b6a7a0..45353ec 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -10,6 +10,9 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
 
 #include "xbt/log.h"
 #include "surf/surfxml_parse_private.h"
 

+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_deployment, msg,
+                               "Logging specific to MSG (deployment)");
+

 static int parse_argc = -1 ;
 static char **parse_argv = NULL;
 static m_process_code_t parse_code = NULL;
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;
 static m_process_code_t parse_code = NULL;


@@ -53,10 +56,14 @@ static void parse_process_finalize(void)
     arg->argv = parse_argv;
     arg-> kill_time = kill_time;
 
     arg->argv = parse_argv;
     arg-> kill_time = kill_time;
 

+    DEBUG3("Process %s(%s) will be started at time %f", arg->name, 
+          arg->host->name,start_time);

     surf_timer_resource->extension_public->set(start_time, (void*) &MSG_process_create_with_arguments,
                                               arg);
   }
   if((start_time<0) || (start_time==MSG_get_clock())) {
     surf_timer_resource->extension_public->set(start_time, (void*) &MSG_process_create_with_arguments,
                                               arg);
   }
   if((start_time<0) || (start_time==MSG_get_clock())) {

+    DEBUG2("Starting Process %s(%s) right now", parse_argv[0],
+          parse_host->name);

     process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
                                                NULL, parse_host,
                                                parse_argc,parse_argv);
     process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
                                                NULL, parse_host,
                                                parse_argc,parse_argv);

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 154ce3d..d200a79 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -8,8 +8,8 @@
 #include "surf_private.h"
 #include "xbt/module.h"
 
 #include "surf_private.h"
 #include "xbt/module.h"
 

-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_main, surf,
-                               "Logging specific to the SURF maxmin module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
+                               "Logging specific to SURF (kernel)");

 
 typedef struct surf_resource_object {
   surf_resource_t resource;
 
 typedef struct surf_resource_object {
   surf_resource_t resource;


@@ -249,6 +249,7 @@ double surf_solve(void)
   int i;
 
   if (first_run) {
   int i;
 
   if (first_run) {

+    DEBUG0("First Run! Let's \"purge\" events and put resources in the right state");

     while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
       if (next_event_date > NOW)
        break;
     while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
       if (next_event_date > NOW)
        break;


@@ -269,20 +270,27 @@ double surf_solve(void)
 
   min = -1.0;
 
 
   min = -1.0;
 

+  DEBUG0("Looking for next action end");

   xbt_dynar_foreach(resource_list, i, resource) {
     resource_next_action_end =
        resource->common_private->share_resources(NOW);
   xbt_dynar_foreach(resource_list, i, resource) {
     resource_next_action_end =
        resource->common_private->share_resources(NOW);

+    DEBUG2("Resource [%s] : next action end = %f",resource->common_public->name,
+          resource_next_action_end);

     if (((min < 0.0) || (resource_next_action_end < min))
        && (resource_next_action_end >= 0.0))
       min = resource_next_action_end;
   }
     if (((min < 0.0) || (resource_next_action_end < min))
        && (resource_next_action_end >= 0.0))
       min = resource_next_action_end;
   }

+  DEBUG1("Next action end : %f", min);

 
   if (min < 0.0)
     return -1.0;
 
 
   if (min < 0.0)
     return -1.0;
 

+  DEBUG0("Looking for next event");

   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {

+    DEBUG1("Next event : %f",next_event_date);

     if (next_event_date > NOW + min)
       break;
     if (next_event_date > NOW + min)
       break;

+    DEBUG0("Updating resources");

     while ((event =
            tmgr_history_get_next_event_leq(history, next_event_date,
                                            &value,
     while ((event =
            tmgr_history_get_next_event_leq(history, next_event_date,
                                            &value,


@@ -290,6 +298,7 @@ double surf_solve(void)
       if (resource_obj->resource->common_private->
          resource_used(resource_obj)) {
        min = next_event_date - NOW;
       if (resource_obj->resource->common_private->
          resource_used(resource_obj)) {
        min = next_event_date - NOW;

+       DEBUG1("This event will modify resource state. Next event set to %f", min);

       }
       /* update state of resource_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */
       }
       /* update state of resource_obj according to new value. Does not touch lmm.
          It will be modified if needed when updating actions */


@@ -298,6 +307,7 @@ double surf_solve(void)
     }
   }
 
     }
   }
 

+  DEBUG1("Duration set to %f", min);

 
   xbt_dynar_foreach(resource_list, i, resource) {
     resource->common_private->update_actions_state(NOW, min);
 
   xbt_dynar_foreach(resource_list, i, resource) {
     resource->common_private->update_actions_state(NOW, min);