Fix type name and parsing for random generator.

[simgrid.git] / src / surf / surfxml_parse.c

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index bad20fb..aee71a9 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -4,6 +4,8 @@
 /* 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 <stdarg.h> /* va_arg */
+
 #include "xbt/misc.h"
 #include "xbt/log.h"
 #include "xbt/str.h"
@@ -23,15 +25,27 @@ char* surf_parsed_filename = NULL; // to locate parse error messages
 /*
  * Helping functions
  */
-void surf_parse_error(const char *msg) {
-  xbt_die("Parse error at %s:%d: %s\n", surf_parsed_filename, surf_parse_lineno, msg);
+void surf_parse_error(const char *fmt, ...) {
+       va_list va;
+       va_start(va,fmt);
+       char *msg = bvprintf(fmt,va);
+       va_end(va);
+       xbt_die("Parse error at %s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+}
+void surf_parse_warn(const char *fmt, ...) {
+       va_list va;
+       va_start(va,fmt);
+       char *msg = bvprintf(fmt,va);
+       va_end(va);
+    XBT_WARN("%s:%d: %s", surf_parsed_filename, surf_parse_lineno, msg);
+    free(msg);
 }
 
 double surf_parse_get_double(const char *string) {
   double res;
   int ret = sscanf(string, "%lg", &res);
   if (ret != 1)
-    surf_parse_error(bprintf("%s is not a double", string));
+    surf_parse_error("%s is not a double", string);
   return res;
 }
 
@@ -39,7 +53,7 @@ int surf_parse_get_int(const char *string) {
   int res;
   int ret = sscanf(string, "%d", &res);
   if (ret != 1)
-    surf_parse_error(bprintf("%s is not an integer", string));
+    surf_parse_error("%s is not an integer", string);
   return res;
 }
 
@@ -332,9 +346,8 @@ void STag_surfxml_cluster(void){
     cluster.sharing_policy = SURF_LINK_FATPIPE;
     break;
   default:
-    surf_parse_error(bprintf
-                     ("Invalid cluster sharing policy for cluster %s",
-                      cluster.id));
+    surf_parse_error("Invalid cluster sharing policy for cluster %s",
+                     cluster.id);
     break;
   }
   switch (AX_surfxml_cluster_bb_sharing_policy) {
@@ -345,9 +358,8 @@ void STag_surfxml_cluster(void){
     cluster.bb_sharing_policy = SURF_LINK_SHARED;
     break;
   default:
-    surf_parse_error(bprintf
-                     ("Invalid bb sharing policy in cluster %s",
-                      cluster.id));
+    surf_parse_error("Invalid bb sharing policy in cluster %s",
+                     cluster.id);
     break;
   }
 
@@ -400,7 +412,7 @@ void ETag_surfxml_link(void){
     link.state = SURF_RESOURCE_OFF;
     break;
   default:
-    surf_parse_error(bprintf("invalid state for link %s",link.id));
+    surf_parse_error("invalid state for link %s", link.id);
     break;
   }
   link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
@@ -416,7 +428,7 @@ void ETag_surfxml_link(void){
      link.policy = SURF_LINK_FULLDUPLEX;
      break;
   default:
-    surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
+    surf_parse_error("Invalid sharing policy in link %s", link.id);
     break;
   }
 
@@ -626,8 +638,8 @@ double get_cpu_power(const char *power)
   return power_scale;
 }
 
-double random_min, random_max, random_mean, random_std_deviation,
-    random_generator;
+double random_min, random_max, random_mean, random_std_deviation;
+e_random_generator_t random_generator;
 char *random_id;
 
 static void init_randomness(void)
@@ -637,7 +649,24 @@ static void init_randomness(void)
   random_max = surf_parse_get_double(A_surfxml_random_max);
   random_mean = surf_parse_get_double(A_surfxml_random_mean);
   random_std_deviation = surf_parse_get_double(A_surfxml_random_std_deviation);
-  random_generator = A_surfxml_random_generator;
+  switch (A_surfxml_random_generator) {
+  case AU_surfxml_random_generator:
+  case A_surfxml_random_generator_NONE:
+    random_generator = NONE;
+    break;
+  case A_surfxml_random_generator_DRAND48:
+    random_generator = DRAND48;
+    break;
+  case A_surfxml_random_generator_RAND:
+    random_generator = RAND;
+    break;
+  case A_surfxml_random_generator_RNGSTREAM:
+    random_generator = RNGSTREAM;
+    break;
+  default:
+    surf_parse_error("Invalid random generator");
+    break;
+  }
 }
 
 static void add_randomness(void)