gosh, this shitty code is even dupplicated!

[simgrid.git] / src / surf / network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index c30c13f..f235089 100644 (file)
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -19,7 +19,7 @@ xbt_dynar_t smpi_bw_factor = NULL;
 xbt_dynar_t smpi_lat_factor = NULL;
 
 typedef struct s_smpi_factor *smpi_factor_t;
-typedef struct s_smpi_factor {
+typedef struct s_smpi_factor { // FIXME: s_smpi_factor_multival (defined in smpi_base) should be used instead to dedupplicate this code
   long factor;
   double value;
 } s_smpi_factor_t;
@@ -47,8 +47,14 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string)
     radical_elements2 = xbt_str_split(value, ":");
     if (xbt_dynar_length(radical_elements2) != 2)
       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 *));
+
+    char *errmsg = bprintf("Invalid factor in chunk #%d: %%s", iter+1);
+    fact.factor = xbt_str_parse_int(xbt_dynar_get_as(radical_elements2, 0, char *), errmsg);
+    xbt_free(errmsg);
+    fact.value = xbt_str_parse_double(xbt_dynar_get_as(radical_elements2, 1, char *), errmsg);
+    errmsg = bprintf("Invalid factor value in chunk #%d: %%s", iter+1);
+    xbt_free(errmsg);
+
     xbt_dynar_push_as(smpi_factor, s_smpi_factor_t, fact);
     XBT_DEBUG("smpi_factor:\t%ld : %f", fact.factor, fact.value);
     xbt_dynar_free(&radical_elements2);
@@ -83,7 +89,7 @@ void surf_network_model_init_SMPI(void)
 
   if (surf_network_model)
     return;
-  surf_network_model = new NetworkSmpiModel();
+  surf_network_model = new simgrid::surf::NetworkSmpiModel();
   net_define_callbacks();
   xbt_dynar_push(all_existing_models, &surf_network_model);
 
@@ -91,23 +97,18 @@ void surf_network_model_init_SMPI(void)
   xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
 }
 
+namespace simgrid {
+namespace surf {
+
 NetworkSmpiModel::NetworkSmpiModel()
  : NetworkCm02Model() {
-       m_haveGap=true;
+  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;
-  }
+  xbt_dict_free(&gap_lookup);
+  xbt_dynar_free(&smpi_bw_factor);
+  xbt_dynar_free(&smpi_lat_factor);
 }
 
 void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkAction *act)
@@ -226,3 +227,6 @@ double NetworkSmpiModel::bandwidthConstraint(double rate, double bound, double s
 /**********
  * Action *
  **********/
+
+}
+}