Integrate Bruno's work on SIMIX onto main stream. Tests are broken, but it looks...

[simgrid.git] / src / msg / msg_config.c

diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index d3e3498..811d1b5 100644 (file)
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -1,68 +1,16 @@
-/* $Id$ */
-
-/* msg_config.c - support for MSG user configuration                        */
-
-/* Copyright (c) 2005 Martin Quinson.                                       */
+/*     $Id$      */
+  
+/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
+/* Copyright (c) 2007 Bruno Donassolo.                                      */
 /* 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 "private.h"
+  
+#include "msg/private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "gras_config.h"
-
-int _msg_init_status = 0; /* 0: beginning of time; 
-                             1: pre-inited (cfg_set created); 
-                             2: inited (running) */
-xbt_cfg_t _msg_cfg_set = NULL;
-
-/* callback of the surf_workstation_model variable */
-static void _msg_cfg_cb__surf_workstation_model(const char *name, int pos) {
-  char *val;
-
-  xbt_assert0(_msg_init_status<2, "Cannot change the model after the initialization");
-  
-  val = xbt_cfg_get_string (_msg_cfg_set, name);
-
-#ifdef USE_GTNETS
-  xbt_assert1(!strcmp(val, "CLM03") ||
-              !strcmp(val, "KCCFLN05") ||
-             !strcmp(val, "GTNETS"),
-              "Unknown workstation model: %s (either 'CLM03', 'KCCFLN05', or 'GTNETS'",val);
-#else
-  xbt_assert1(!strcmp(val, "CLM03") ||
-              !strcmp(val, "KCCFLN05"),
-              "Unknown workstation model: %s (either 'CLM03' or 'KCCFLN05'",val);
-#endif
-
-}
-
-/* create the config set and register what should be */
-void msg_config_init(void) {
-
-  if (_msg_init_status) 
-    return; /* Already inited, nothing to do */
-
-  _msg_init_status = 1;
-  _msg_cfg_set = xbt_cfg_new();
-  
-  xbt_cfg_register (_msg_cfg_set, 
-                    "surf_workstation_model", xbt_cfgelm_string, 1,1,
-                    &_msg_cfg_cb__surf_workstation_model,NULL);
-                    
-  xbt_cfg_set_string(_msg_cfg_set,"surf_workstation_model", "KCCFLN05");
-}
-
-void msg_config_finalize(void) {
-
-  if (!_msg_init_status) 
-    return; /* Not initialized yet. Nothing to do */
-
-  xbt_cfg_free(&_msg_cfg_set);
-  _msg_init_status = 0;
-}
+#include "simix/simix.h"
 
 /** \brief set a configuration variable
  * 
@@ -75,16 +23,12 @@ void msg_config_finalize(void) {
  * Example:
  * MSG_config("surf_workstation_model","KCCFLN05");
  */
-void
-MSG_config(const char *name, ...) {
+void MSG_config(const char *name, ...) 
+{
   va_list pa;
-    
-  if (!_msg_init_status) {
-    msg_config_init();
-  }
   /*  xbt_cfg_dump("msg_cfg_set","",_msg_cfg_set);*/
   va_start(pa,name);
-  xbt_cfg_set_vargs(_msg_cfg_set,name,pa);
+       SIMIX_config(name,pa);
   va_end(pa);
-
+       return;
 }