create a singleton for s4u::Engine

[simgrid.git] / src / smpi / smpi_base.cpp

diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp
index 8d66a02..f2eda2f 100644 (file)
--- a/src/smpi/smpi_base.cpp
+++ b/src/smpi/smpi_base.cpp
@@ -102,12 +102,16 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string)
     if (xbt_dynar_length(radical_elements2) <2 || xbt_dynar_length(radical_elements2) > 5)
       xbt_die("Malformed radical for smpi factor: '%s'", smpi_coef_string);
     for(i =0; i<xbt_dynar_length(radical_elements2);i++ ){
-        if (i==0){
-           fact.factor = atol(xbt_dynar_get_as(radical_elements2, i, char *));
-        }else{
-           fact.values[fact.nb_values] = atof(xbt_dynar_get_as(radical_elements2, i, char *));
-           fact.nb_values++;
-        }
+      char *errmsg;
+      if (i==0) {
+        errmsg = bprintf("Invalid factor in chunk #%d: %%s", iter+1);
+        fact.factor = xbt_str_parse_int(xbt_dynar_get_as(radical_elements2, i, char *), errmsg);
+      } else {
+        errmsg = bprintf("Invalid factor value %d in chunk #%d: %%s", i, iter+1);
+        fact.values[fact.nb_values] = xbt_str_parse_double(xbt_dynar_get_as(radical_elements2, i, char *), errmsg);
+        fact.nb_values++;
+      }
+      xbt_free(errmsg);
     }
 
     xbt_dynar_push_as(smpi_factor, s_smpi_factor_multival_t, fact);
@@ -115,7 +119,6 @@ static xbt_dynar_t parse_factor(const char *smpi_coef_string)
     xbt_dynar_free(&radical_elements2);
   }
   xbt_dynar_free(&radical_elements);
-  iter=0;
   xbt_dynar_sort(smpi_factor, &factor_cmp);
   xbt_dynar_foreach(smpi_factor, iter, fact) {
     XBT_DEBUG("smpi_factor:\t%ld : %d values, first: %f", fact.factor, fact.nb_values ,fact.values[0]);
@@ -329,7 +332,7 @@ MPI_Request smpi_mpi_recv_init(void *buf, int count, MPI_Datatype datatype,
 
 void smpi_mpi_start(MPI_Request request)
 {
-  smx_rdv_t mailbox;
+  smx_mailbox_t mailbox;
   
   xbt_assert(!request->action, "Cannot (re)start a non-finished communication");
   request->flags &= ~PREPARED;
@@ -874,7 +877,7 @@ void smpi_mpi_iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status*
   static int nsleeps = 1;
   if(smpi_iprobe_sleep > 0)  simcall_process_sleep(nsleeps*smpi_iprobe_sleep);
   // behave like a receive, but don't do it
-  smx_rdv_t mailbox;
+  smx_mailbox_t mailbox;
 
   print_request("New iprobe", request);
   // We have to test both mailboxes as we don't know if we will receive one one or another