X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/614783abcb28c771ad302252888494fe36da2bd8..b43c07d35a1a9eff2ad7dd94ca72b62ccfe6d915:/src/msg/msg_config.c

diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c
index 50cb176d9f..5bb0763674 100644
--- a/src/msg/msg_config.c
+++ b/src/msg/msg_config.c
@@ -1,86 +1,48 @@
-/* $Id$ */
+/*     $Id$      */
 
-/* msg_config.c - support for MSG user configuration                        */
-
-/* Copyright (c) 2005 Martin Quinson.                                       */
+/* 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"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_cfg, msg,
-				"Configuration support in \ref MSG_API");
-
-
-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);
-  
-  xbt_assert1(!strcmp(val, "CLM03") ||
-              !strcmp(val, "KCCFLN05"),
-              "Unknown workstation model: %s (either 'CLM03' or 'KCCFLN05'",val);
-}
-
-/* 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", "CLM03");
-}
-
-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
  * 
  * Currently existing configuation variable:
- *   - surf_workstation_model (string): Model of workstation to use.  
- *     Possible values (defaults to "CLM03"):
- *     - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03])
- *     - "KCCFLN05": simple network model (no latency) but interference 
- *       between computations and communications (UNSTABLE, DONT USE)
+ *   - workstation_model (string): Model of workstation to use.  
+ *     Possible values (defaults to "KCCFLN05"):
+ *     - "CLM03": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + support for parallel tasks
+ *     - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file.
+ *     - "KCCFLN05": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Use maxmin for the network.
+ *     - "KCCFLN05_proportional": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Uses the proportional approahc as described in the Corine Touati's PhD Thesis.
+ *     - "KCCFLN05_Vegas": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Uses the fairness adapted to the TCP Vegas flow control.
+ *     - "KCCFLN05_Reno": realistic TCP behavior + basic CPU model (see [CML03 at CCGrid03]) + failure handling + interference between communications and computations if precised in the platform file. Uses the fairness adapted to the TCP Reno flow control.
  * 
  * Example:
- * MSG_config("surf_workstation_model","CLM03");
+ * MSG_config("workstation_model","KCCFLN05");
  */
-void
-MSG_config(const char *name, ...) {
-  va_list pa;
-    
-  if (!_msg_init_status) {
-    msg_config_init();
+void MSG_config(const char *name, ...)
+{
+
+  if (!msg_global) {
+    fprintf(stderr,
+	    "ERROR: Please call MSG_init() before using MSG_config()\n");
+    abort();
   }
-  /*  xbt_cfg_dump("msg_cfg_set","",_msg_cfg_set);*/
-  va_start(pa,name);
-  xbt_cfg_set_vargs(_msg_cfg_set,name,pa);
-  va_end(pa);
 
+
+  va_list pa;
+  /*  xbt_cfg_dump("msg_cfg_set","",_msg_cfg_set); */
+  va_start(pa, name);
+
+  SIMIX_config(name, pa);
+
+  va_end(pa);
+  return;
 }