X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5fd55f293d7e019e8c23e7ff76e2b3743e40cd6..6094020a03f9c10b954e3e1d32e1a3ffc75a8d7f:/src/surf/workstation_ptask_L07.c

diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c
index a5581e035a..315dc66278 100644
--- a/src/surf/workstation_ptask_L07.c
+++ b/src/surf/workstation_ptask_L07.c
@@ -100,7 +100,7 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action)
     }
   }
   lat_bound = sg_tcp_gamma / (2.0 * lat_current);
-  DEBUG2("action (%p) : lat_bound = %g", action, lat_bound);
+  XBT_DEBUG("action (%p) : lat_bound = %g", action, lat_bound);
   if ((action->latency == 0.0) && (action->suspended == 0)) {
     if (action->rate < 0)
       lmm_update_variable_bound(ptask_maxmin_system, action->variable,
@@ -145,14 +145,14 @@ static void ptask_action_cancel(surf_action_t action)
 
 static void ptask_action_suspend(surf_action_t action)
 {
-  XBT_IN1("(%p))", action);
+  XBT_IN("(%p))", action);
   if (((surf_action_workstation_L07_t) action)->suspended != 2) {
     ((surf_action_workstation_L07_t) action)->suspended = 1;
     lmm_update_variable_weight(ptask_maxmin_system,
                                ((surf_action_workstation_L07_t)
                                 action)->variable, 0.0);
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static void ptask_action_resume(surf_action_t action)
@@ -160,12 +160,12 @@ static void ptask_action_resume(surf_action_t action)
   surf_action_workstation_L07_t act =
       (surf_action_workstation_L07_t) action;
 
-  XBT_IN1("(%p)", act);
+  XBT_IN("(%p)", act);
   if (act->suspended != 2) {
     lmm_update_variable_weight(ptask_maxmin_system, act->variable, 1.0);
     act->suspended = 0;
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static int ptask_action_is_suspended(surf_action_t action)
@@ -176,25 +176,25 @@ static int ptask_action_is_suspended(surf_action_t action)
 static void ptask_action_set_max_duration(surf_action_t action,
                                           double duration)
 {                               /* FIXME: should inherit */
-  XBT_IN2("(%p,%g)", action, duration);
+  XBT_IN("(%p,%g)", action, duration);
   action->max_duration = duration;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 
 static void ptask_action_set_priority(surf_action_t action,
                                       double priority)
 {                               /* FIXME: should inherit */
-  XBT_IN2("(%p,%g)", action, priority);
+  XBT_IN("(%p,%g)", action, priority);
   action->priority = priority;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 static double ptask_action_get_remains(surf_action_t action)
 {
-  XBT_IN1("(%p)", action);
+  XBT_IN("(%p)", action);
   return action->remains;
-  XBT_OUT;
+  XBT_OUT();
 }
 
 /**************************************/
@@ -227,17 +227,17 @@ static double ptask_share_resources(double now)
     if (action->latency > 0) {
       if (min < 0) {
         min = action->latency;
-        DEBUG3("Updating min (value) with %p (start %f): %f", action,
+        XBT_DEBUG("Updating min (value) with %p (start %f): %f", action,
                action->generic_action.start, min);
       } else if (action->latency < min) {
         min = action->latency;
-        DEBUG3("Updating min (latency) with %p (start %f): %f", action,
+        XBT_DEBUG("Updating min (latency) with %p (start %f): %f", action,
                action->generic_action.start, min);
       }
     }
   }
 
-  DEBUG1("min value : %f", min);
+  XBT_DEBUG("min value : %f", min);
 
   return min;
 }
@@ -266,7 +266,7 @@ static void ptask_update_actions_state(double now, double delta)
                                    1.0);
       }
     }
-    DEBUG3("Action (%p) : remains (%g) updated by %g.",
+    XBT_DEBUG("Action (%p) : remains (%g) updated by %g.",
            action, action->generic_action.remains,
            lmm_variable_getvalue(action->variable) * delta);
     double_update(&(action->generic_action.remains),
@@ -275,7 +275,7 @@ static void ptask_update_actions_state(double now, double delta)
     if (action->generic_action.max_duration != NO_MAX_DURATION)
       double_update(&(action->generic_action.max_duration), delta);
 
-    DEBUG2("Action (%p) : remains (%g).",
+    XBT_DEBUG("Action (%p) : remains (%g).",
            action, action->generic_action.remains);
     if ((action->generic_action.remains <= 0) &&
         (lmm_get_variable_weight(action->variable) > 0)) {
@@ -298,13 +298,13 @@ static void ptask_update_actions_state(double now, double delta)
 
 /* 	if(((link_L07_t)constraint_id)->type== */
 /* 	   SURF_WORKSTATION_RESOURCE_LINK) { */
-/* 	  DEBUG2("Checking for link %s (%p)", */
+/* 	  XBT_DEBUG("Checking for link %s (%p)", */
 /* 		 ((link_L07_t)constraint_id)->name, */
 /* 		 ((link_L07_t)constraint_id)); */
 /* 	} */
 /* 	if(((cpu_L07_t)constraint_id)->type== */
 /* 	   SURF_WORKSTATION_RESOURCE_CPU) { */
-/* 	  DEBUG3("Checking for cpu %s (%p) : %s", */
+/* 	  XBT_DEBUG("Checking for cpu %s (%p) : %s", */
 /* 		 ((cpu_L07_t)constraint_id)->name, */
 /* 		 ((cpu_L07_t)constraint_id), */
 /* 		 ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */
@@ -318,7 +318,7 @@ static void ptask_update_actions_state(double now, double delta)
               SURF_WORKSTATION_RESOURCE_CPU) &&
              (((cpu_L07_t) constraint_id)->state_current ==
               SURF_RESOURCE_OFF))) {
-          DEBUG1("Action (%p) Failed!!", action);
+          XBT_DEBUG("Action (%p) Failed!!", action);
           action->generic_action.finish = surf_get_clock();
           surf_action_state_set((surf_action_t) action,
                                 SURF_ACTION_FAILED);
@@ -338,7 +338,7 @@ static void ptask_update_resource_state(void *id,
   link_L07_t nw_link = id;
 
   if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
-    DEBUG2("Updating link %s (%p)", surf_resource_name(nw_link), nw_link);
+    XBT_DEBUG("Updating link %s (%p)", surf_resource_name(nw_link), nw_link);
     if (event_type == nw_link->bw_event) {
       nw_link->bw_current = value;
       lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
@@ -369,12 +369,12 @@ static void ptask_update_resource_state(void *id,
       if (tmgr_trace_event_free(event_type))
         nw_link->state_event = NULL;
     } else {
-      CRITICAL0("Unknown event ! \n");
+      XBT_CRITICAL("Unknown event ! \n");
       xbt_abort();
     }
     return;
   } else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) {
-    DEBUG3("Updating cpu %s (%p) with value %g", surf_resource_name(cpu),
+    XBT_DEBUG("Updating cpu %s (%p) with value %g", surf_resource_name(cpu),
            cpu, value);
     if (event_type == cpu->power_event) {
       cpu->power_current = value;
@@ -390,7 +390,7 @@ static void ptask_update_resource_state(void *id,
       if (tmgr_trace_event_free(event_type))
         cpu->state_event = NULL;
     } else {
-      CRITICAL0("Unknown event ! \n");
+      XBT_CRITICAL("Unknown event ! \n");
       xbt_abort();
     }
     return;
@@ -489,7 +489,7 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb,
   action =
       surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount,
                       surf_workstation_model, 0);
-  DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
+  XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
          action, workstation_nb, nb_link);
   action->suspended = 0;        /* Should be useless because of the
                                    calloc but it seems to help valgrind... */
@@ -578,14 +578,14 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration)
 {
   surf_action_workstation_L07_t action = NULL;
 
-  XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
+  XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
 
   action = (surf_action_workstation_L07_t) ptask_execute(cpu, 1.0);
   action->generic_action.max_duration = duration;
   action->suspended = 2;
   lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0);
 
-  XBT_OUT;
+  XBT_OUT();
   return (surf_action_t) action;
 }
 
@@ -622,14 +622,14 @@ static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
                                xbt_dict_t cpu_properties)
 {
   cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
-  xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
+  xbt_assert1(!surf_workstation_resource_by_name(name),
               "Host '%s' declared several times in the platform file.",
               name);
 
   cpu->generic_resource.model = surf_workstation_model;
   cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
   cpu->generic_resource.name = xbt_strdup(name);
-  cpu->generic_resource.properties = current_property_set;
+  cpu->generic_resource.properties = cpu_properties;
   cpu->id = ptask_host_count++;
 
   cpu->power_scale = power_scale;
@@ -649,8 +649,7 @@ static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
       lmm_constraint_new(ptask_maxmin_system, cpu,
                          cpu->power_current * cpu->power_scale);
 
-  xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu,
-               surf_resource_free);
+  xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu);
 
   return cpu;
 }
@@ -676,9 +675,9 @@ static void ptask_parse_cpu_init(void)
     state_initial = SURF_RESOURCE_OFF;
   state_trace = tmgr_trace_new(A_surfxml_host_state_file);
 
-  current_property_set = xbt_dict_new();
   ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
                 state_initial, state_trace, current_property_set);
+  current_property_set=NULL;
 }
 
 static void ptask_cpu_create_resource(char *name, double power_peak,
@@ -705,8 +704,7 @@ static link_L07_t ptask_link_new(char *name,
                                  policy, xbt_dict_t properties)
 {
   link_L07_t nw_link = xbt_new0(s_link_L07_t, 1);
-  xbt_assert1(!xbt_dict_get_or_null
-              (surf_network_model->resource_set, name),
+  xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
               "Link '%s' declared several times in the platform file.",
               name);
 
@@ -734,10 +732,7 @@ static link_L07_t ptask_link_new(char *name,
   if (policy == SURF_LINK_FATPIPE)
     lmm_constraint_shared(nw_link->constraint);
 
-  xbt_dict_set(surf_network_model->resource_set, name, nw_link,
-               surf_resource_free);
-
-
+  xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link);
   return nw_link;
 }
 
@@ -783,8 +778,6 @@ static void ptask_parse_link_init(void)
 
   state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
-  current_property_set = xbt_dict_new();
-
   if(policy_initial_link == SURF_LINK_FULLDUPLEX)
   {
 	  ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace,
@@ -792,7 +785,7 @@ static void ptask_parse_link_init(void)
 	                 current_property_set);
 	  ptask_link_new(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace,
 	                 state_initial_link, state_trace, policy_initial_link,
-	                 xbt_dict_new());
+	                 current_property_set);
   }
   else
   {
@@ -800,6 +793,7 @@ static void ptask_parse_link_init(void)
 					 state_initial_link, state_trace, policy_initial_link,
 					 current_property_set);
   }
+  current_property_set = NULL;
 }
 
 static void ptask_link_create_resource(char *name,
@@ -813,10 +807,9 @@ static void ptask_link_create_resource(char *name,
                                        e_surf_link_sharing_policy_t
                                        policy, xbt_dict_t properties)
 {
-
   ptask_link_new(name, bw_initial, bw_trace,
                  lat_initial, lat_trace, state_initial, state_trace,
-                 policy, xbt_dict_new());
+                 policy, properties);
 }
 
 
@@ -831,8 +824,7 @@ static void ptask_add_traces(void)
   /* Connect traces relative to cpu */
   xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
-    cpu_L07_t host =
-        surf_model_resource_by_name(surf_workstation_model, elm);
+    cpu_L07_t host = surf_workstation_resource_by_name(elm);
 
     xbt_assert1(host, "Host %s undefined", elm);
     xbt_assert1(trace, "Trace %s undefined", trace_name);
@@ -843,8 +835,7 @@ static void ptask_add_traces(void)
 
   xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
-    cpu_L07_t host =
-        surf_model_resource_by_name(surf_workstation_model, elm);
+    cpu_L07_t host = surf_workstation_resource_by_name(elm);
 
     xbt_assert1(host, "Host %s undefined", elm);
     xbt_assert1(trace, "Trace %s undefined", trace_name);
@@ -857,7 +848,7 @@ static void ptask_add_traces(void)
   xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
     link_L07_t link =
-        xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+    		xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
     xbt_assert1(link, "Link %s undefined", elm);
     xbt_assert1(trace, "Trace %s undefined", trace_name);
@@ -869,7 +860,7 @@ static void ptask_add_traces(void)
   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
     link_L07_t link =
-        xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+    		xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
     xbt_assert1(link, "Link %s undefined", elm);
     xbt_assert1(trace, "Trace %s undefined", trace_name);
@@ -880,7 +871,7 @@ static void ptask_add_traces(void)
   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
     tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
     link_L07_t link =
-        xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+    		xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
 
     xbt_assert1(link, "Link %s undefined", elm);
     xbt_assert1(trace, "Trace %s undefined", trace_name);
@@ -892,8 +883,8 @@ static void ptask_add_traces(void)
 static void ptask_define_callbacks(const char *file)
 {
   /* Adding callback functions */
-  surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init);
-  surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init);
+  surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
+  surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
   surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
 }
 
@@ -973,7 +964,7 @@ static void ptask_model_init_internal(void)
 /**************************************/
 void surf_workstation_model_init_ptask_L07(const char *filename)
 {
-  INFO0("surf_workstation_model_init_ptask_L07");
+  XBT_INFO("surf_workstation_model_init_ptask_L07");
   xbt_assert0(!surf_cpu_model, "CPU model type already defined");
   xbt_assert0(!surf_network_model, "network model type already defined");
   surf_network_model = surf_model_init();