Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Reindent before change.
authorArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Mon, 7 Nov 2011 21:30:32 +0000 (22:30 +0100)
committerArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Wed, 9 Nov 2011 10:32:18 +0000 (11:32 +0100)
src/surf/network.c
src/surf/workstation_ptask_L07.c

index 6d203b3..fda3acd 100644 (file)
@@ -199,22 +199,37 @@ static void net_parse_link_init(sg_platf_link_cbarg_t link)
 {
   XBT_DEBUG("link_CM02");
 
-  if(link->policy == SURF_LINK_FULLDUPLEX)
-  {
-    net_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace,
-                      link->latency, link->latency_trace, link->state, link->state_trace,
-                      link->policy, link->properties);
-    net_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace,
-            link->latency, link->latency_trace, link->state, link->state_trace,
-            link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it
-  }
-  else
-  {
-    net_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace,
-               link->latency, link->latency_trace, link->state, link->state_trace,
-                      link->policy, link->properties);
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    net_create_resource(bprintf("%s_UP", link->id),
+                        link->bandwidth,
+                        link->bandwidth_trace,
+                        link->latency,
+                        link->latency_trace,
+                        link->state,
+                        link->state_trace,
+                        link->policy,
+                        link->properties);
+    net_create_resource(bprintf("%s_DOWN", link->id),
+                        link->bandwidth,
+                        link->bandwidth_trace,
+                        link->latency,
+                        link->latency_trace,
+                        link->state,
+                        link->state_trace,
+                        link->policy,
+                        NULL); /* FIXME: We need to deep copy the properties or
+                                * we won't be able to free it */
+  } else {
+    net_create_resource(xbt_strdup(link->id),
+                        link->bandwidth,
+                        link->bandwidth_trace,
+                        link->latency,
+                        link->latency_trace,
+                        link->state,
+                        link->state_trace,
+                        link->policy,
+                        link->properties);
   }
-
 }
 
 static void net_add_traces(void)
@@ -816,11 +831,12 @@ static void surf_network_model_init_internal(void)
     network_maxmin_system = lmm_system_new();
 
   routing_model_create(sizeof(link_CM02_t),
-      net_create_resource(xbt_strdup("__loopback__"),
-          498000000, NULL, 0.000015, NULL,
-            SURF_RESOURCE_ON, NULL,
-            SURF_LINK_FATPIPE, NULL),
-            net_get_link_latency);
+                       net_create_resource(xbt_strdup("__loopback__"),
+                                           498000000, NULL,
+                                           0.000015, NULL,
+                                           SURF_RESOURCE_ON, NULL,
+                                           SURF_LINK_FATPIPE, NULL),
+                       net_get_link_latency);
 }
 
 
index 59ae446..4425c74 100644 (file)
@@ -714,20 +714,37 @@ static void* ptask_link_create_resource(const char *name,
 
 static void ptask_parse_link_init(sg_platf_link_cbarg_t link)
 {
-  if(link->policy == SURF_LINK_FULLDUPLEX)
-  {
-         ptask_link_create_resource(bprintf("%s_UP",link->id), link->bandwidth, link->bandwidth_trace,
-                      link->latency, link->latency_trace, link->state, link->state_trace,
-                      link->policy, link->properties);
-    ptask_link_create_resource(bprintf("%s_DOWN",link->id), link->bandwidth, link->bandwidth_trace,
-            link->latency, link->latency_trace, link->state, link->state_trace,
-            link->policy, NULL); // FIXME: We need to deep copy the properties or we won't be able to free it
-  }
-  else
-  {
-         ptask_link_create_resource(xbt_strdup(link->id), link->bandwidth, link->bandwidth_trace,
-               link->latency, link->latency_trace, link->state, link->state_trace,
-                      link->policy, link->properties);
+  if (link->policy == SURF_LINK_FULLDUPLEX) {
+    ptask_link_create_resource(bprintf("%s_UP", link->id),
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               link->properties);
+    ptask_link_create_resource(bprintf("%s_DOWN", link->id),
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               NULL); /* FIXME: We need to deep copy the
+                                       * properties or we won't be able to free
+                                       * it */
+  } else {
+    ptask_link_create_resource(xbt_strdup(link->id),
+                               link->bandwidth,
+                               link->bandwidth_trace,
+                               link->latency,
+                               link->latency_trace,
+                               link->state,
+                               link->state_trace,
+                               link->policy,
+                               link->properties);
   }
 
   current_property_set = NULL;
@@ -870,10 +887,11 @@ static void ptask_model_init_internal(void)
     ptask_maxmin_system = lmm_system_new();
 
   routing_model_create(sizeof(link_L07_t),
-      ptask_link_create_resource(xbt_strdup("__loopback__"),
-                                      498000000, NULL, 0.000015, NULL,
-                                      SURF_RESOURCE_ON, NULL,
-                                      SURF_LINK_FATPIPE, NULL),
+                       ptask_link_create_resource(xbt_strdup("__loopback__"),
+                                                  498000000, NULL,
+                                                  0.000015, NULL,
+                                                  SURF_RESOURCE_ON, NULL,
+                                                  SURF_LINK_FATPIPE, NULL),
                        ptask_get_link_latency);
 
 }