X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5faf49cdf3f8ad8751317b857a6d3134fe07eda3..f3677661714bf6122d678071c0bd44141417be14:/src/surf/network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 10d2e6247b..68174dae76 100644
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "network_smpi.hpp"
 #include "simgrid/sg_config.h"
 
@@ -16,7 +22,8 @@ xbt_dict_t gap_lookup = NULL;
 
 static int factor_cmp(const void *pa, const void *pb)
 {
-  return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor);
+ return (((s_smpi_factor_t*)pa)->factor > ((s_smpi_factor_t*)pb)->factor) ? 1 :
+         (((s_smpi_factor_t*)pa)->factor < ((s_smpi_factor_t*)pb)->factor) ? -1 : 0;
 }
 
 
@@ -33,7 +40,7 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string)
 
     radical_elements2 = xbt_str_split(value, ":");
     if (xbt_dynar_length(radical_elements2) != 2)
-      xbt_die("Malformed radical for smpi factor!");
+      surf_parse_error("Malformed radical for smpi factor!");
     fact.factor = atol(xbt_dynar_get_as(radical_elements2, 0, char *));
     fact.value = atof(xbt_dynar_get_as(radical_elements2, 1, char *));
     xbt_dynar_push_as(smpi_factor, s_smpi_factor_t, fact);
@@ -71,23 +78,43 @@ void surf_network_model_init_SMPI(void)
   if (surf_network_model)
     return;
   surf_network_model = new NetworkSmpiModel();
-
+  net_define_callbacks();
   xbt_dynar_push(model_list, &surf_network_model);
+  //network_solve = lmm_solve;
 
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/sender_gap", 10e-6);
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
-void NetworkSmpiModel::gapAppend(double size, const NetworkCm02LinkLmmPtr link, NetworkCm02ActionLmmPtr action)
+NetworkSmpiModel::NetworkSmpiModel()
+ : NetworkCm02Model() {
+	m_haveGap=true;
+}
+
+NetworkSmpiModel::~NetworkSmpiModel(){
+  if (gap_lookup) {
+    xbt_dict_free(&gap_lookup);
+  }
+  if (smpi_bw_factor) {
+    xbt_dynar_free(&smpi_bw_factor);
+    smpi_bw_factor = NULL;
+  }
+  if (smpi_lat_factor) {
+    xbt_dynar_free(&smpi_lat_factor);
+    smpi_lat_factor = NULL;
+  }
+}
+
+void NetworkSmpiModel::gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr action)
 {
-  const char *src = link->m_name;
+  const char *src = link->getName();
   xbt_fifo_t fifo;
   //surf_action_network_CM02_t last_action;
   //double bw;
 
   if (sg_sender_gap > 0.0) {
     if (!gap_lookup) {
-      gap_lookup = xbt_dict_new();
+      gap_lookup = xbt_dict_new_homogeneous(NULL);
     }
     fifo = (xbt_fifo_t) xbt_dict_get_or_null(gap_lookup, src);
     action->m_senderGap = 0.0;
@@ -115,11 +142,11 @@ void NetworkSmpiModel::gapAppend(double size, const NetworkCm02LinkLmmPtr link,
   }
 }
 
-void NetworkSmpiModel::gapRemove(ActionLmmPtr lmm_action)
+void NetworkSmpiModel::gapRemove(ActionPtr lmm_action)
 {
   xbt_fifo_t fifo;
   size_t size;
-  NetworkCm02ActionLmmPtr action = (NetworkCm02ActionLmmPtr)(lmm_action);
+  NetworkCm02ActionPtr action = static_cast<NetworkCm02ActionPtr>(lmm_action);
 
   if (sg_sender_gap > 0.0 && action->p_senderLinkName
       && action->p_senderFifoItem) {
@@ -139,7 +166,7 @@ void NetworkSmpiModel::gapRemove(ActionLmmPtr lmm_action)
   }
 }
 
-double NetworkSmpiModel::latencyFactor(double size)
+double NetworkSmpiModel::bandwidthFactor(double size)
 {
   if (!smpi_bw_factor)
     smpi_bw_factor =
@@ -150,16 +177,17 @@ double NetworkSmpiModel::latencyFactor(double size)
   double current=1.0;
   xbt_dynar_foreach(smpi_bw_factor, iter, fact) {
     if (size <= fact.factor) {
-      XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current);
+      XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current);
       return current;
     }else
       current=fact.value;
   }
-  XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current);
+  XBT_DEBUG("%f > %ld return %f", size, fact.factor, current);
 
   return current;
 }
-double NetworkSmpiModel::bandwidthFactor(double size)
+
+double NetworkSmpiModel::latencyFactor(double size)
 {
   if (!smpi_lat_factor)
     smpi_lat_factor =
@@ -170,12 +198,12 @@ double NetworkSmpiModel::bandwidthFactor(double size)
   double current=1.0;
   xbt_dynar_foreach(smpi_lat_factor, iter, fact) {
     if (size <= fact.factor) {
-      XBT_DEBUG("%lf <= %ld return %f", size, fact.factor, current);
+      XBT_DEBUG("%f <= %ld return %f", size, fact.factor, current);
       return current;
     }else
       current=fact.value;
   }
-  XBT_DEBUG("%lf > %ld return %f", size, fact.factor, current);
+  XBT_DEBUG("%f > %ld return %f", size, fact.factor, current);
 
   return current;
 }