X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/812231b11759373fd9b8877e966d8e0249e1dad0..b84bad24cc0d403e9773384376ecff7d360f8379:/src/surf/surf_config.c

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index 3e76e715e1..7533ba294f 100644
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -11,232 +11,267 @@
 #include "xbt/str.h"
 #include "surf/surf_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config,surf,"About the configuration of surf (and the rest of the simulation)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
+                                "About the configuration of surf (and the rest of the simulation)");
 
 xbt_cfg_t _surf_cfg_set = NULL;
 
 
 /* Parse the command line, looking for options */
-static void surf_config_cmd_line(int *argc,char **argv)
+static void surf_config_cmd_line(int *argc, char **argv)
 {
-	int i, j;
-	char *opt;
-
-	for (i = 1; i < *argc; i++) {
-		int remove_it = 0;
-		if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
-			opt = strchr(argv[i], '=');
-			opt++;
-
-			xbt_cfg_set_parse(_surf_cfg_set,opt);
-			DEBUG1("Did apply '%s' as config setting", opt);
-			remove_it = 1;
-		} else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help")+1) ||
-				!strncmp(argv[i], "--help", strlen("--help")+1)) {
-			printf("Description of the configuration accepted by this simulator:\n");
-			xbt_cfg_help(_surf_cfg_set);
-			remove_it=1;
-			exit(0);
-		}
-		if (remove_it) { /*remove this from argv */
-			for (j = i + 1; j < *argc; j++) {
-				argv[j - 1] = argv[j];
-			}
-
-			argv[j - 1] = NULL;
-			(*argc)--;
-			i--;                      /* compensate effect of next loop incrementation */
-		}
-	}
+  int i, j;
+  char *opt;
+
+  for (i = 1; i < *argc; i++) {
+    int remove_it = 0;
+    if (!strncmp(argv[i], "--cfg=", strlen("--cfg="))) {
+      opt = strchr(argv[i], '=');
+      opt++;
+
+      xbt_cfg_set_parse(_surf_cfg_set, opt);
+      DEBUG1("Did apply '%s' as config setting", opt);
+      remove_it = 1;
+    } else if (!strncmp(argv[i], "--cfg-help", strlen("--cfg-help") + 1) ||
+               !strncmp(argv[i], "--help", strlen("--help") + 1)) {
+      printf
+        ("Description of the configuration accepted by this simulator:\n");
+      xbt_cfg_help(_surf_cfg_set);
+      remove_it = 1;
+      exit(0);
+    }
+    if (remove_it) {            /*remove this from argv */
+      for (j = i + 1; j < *argc; j++) {
+        argv[j - 1] = argv[j];
+      }
+
+      argv[j - 1] = NULL;
+      (*argc)--;
+      i--;                      /* compensate effect of next loop incrementation */
+    }
+  }
 }
 
 
-int _surf_init_status = 0;     /* 0: beginning of time;
-                                  1: pre-inited (cfg_set created);
-                                  2: inited (running) */
+int _surf_init_status = 0;      /* 0: beginning of time;
+                                   1: pre-inited (cfg_set created);
+                                   2: inited (running) */
 
 /* callback of the workstation_model variable */
 static void _surf_cfg_cb__workstation_model(const char *name, int pos)
 {
-	char *val;
+  char *val;
 
-	xbt_assert0(_surf_init_status < 2,
-			"Cannot change the model after the initialization");
+  xbt_assert0(_surf_init_status < 2,
+              "Cannot change the model after the initialization");
 
-	val = xbt_cfg_get_string(_surf_cfg_set, name);
-	/* New Module missing */
+  val = xbt_cfg_get_string(_surf_cfg_set, name);
+  /* New Module missing */
 
-	find_model_description(surf_workstation_model_description, val);
+  find_model_description(surf_workstation_model_description, val);
 }
 
 /* callback of the cpu_model variable */
 static void _surf_cfg_cb__cpu_model(const char *name, int pos)
 {
-	char *val;
+  char *val;
 
-	xbt_assert0(_surf_init_status < 2,
-			"Cannot change the model after the initialization");
+  xbt_assert0(_surf_init_status < 2,
+              "Cannot change the model after the initialization");
 
-	val = xbt_cfg_get_string(_surf_cfg_set, name);
-	/* New Module missing */
-	find_model_description(surf_cpu_model_description, val);
+  val = xbt_cfg_get_string(_surf_cfg_set, name);
+  /* New Module missing */
+  find_model_description(surf_cpu_model_description, val);
 }
 
 /* callback of the workstation_model variable */
 static void _surf_cfg_cb__network_model(const char *name, int pos)
 {
-	char *val;
+  char *val;
 
-	xbt_assert0(_surf_init_status < 2,
-			"Cannot change the model after the initialization");
+  xbt_assert0(_surf_init_status < 2,
+              "Cannot change the model after the initialization");
 
-	val = xbt_cfg_get_string(_surf_cfg_set, name);
-	/* New Module missing */
-	find_model_description(surf_network_model_description, val);
+  val = xbt_cfg_get_string(_surf_cfg_set, name);
+  /* New Module missing */
+  find_model_description(surf_network_model_description, val);
 }
 
 /* callback of the tcp gamma variable */
-static void _surf_cfg_cb__tcp_gamma(const char *name, int pos) {
-	sg_tcp_gamma =  xbt_cfg_get_double(_surf_cfg_set, name);
+static void _surf_cfg_cb__tcp_gamma(const char *name, int pos)
+{
+  sg_tcp_gamma = xbt_cfg_get_double(_surf_cfg_set, name);
 }
 
-static void _surf_cfg_cb__surf_path(const char *name, int pos) {
-	char *path = xbt_cfg_get_string_at(_surf_cfg_set, name,pos);
-    xbt_dynar_push(surf_path, &path);
+static void _surf_cfg_cb__surf_path(const char *name, int pos)
+{
+  char *path = xbt_cfg_get_string_at(_surf_cfg_set, name, pos);
+  xbt_dynar_push(surf_path, &path);
 }
 
 
 
 /* create the config set, register what should be and parse the command line*/
-void surf_config_init(int *argc, char **argv) {
-
-	/* Create the configuration support */
-	if (_surf_init_status==0) { /* Only create stuff if not already inited */
-		_surf_init_status = 1;
-
-		char *description = xbt_malloc(1024), *p = description;
-		char *default_value;
-		int i;
-		sprintf(description,"The model to use for the workstation. Possible values: ");
-		while (*(++p) != '\0');
-		for (i=0;surf_workstation_model_description[i].name;i++)
-			p+=sprintf(p,"%s%s",(i==0?"":", "),surf_workstation_model_description[i].name);
-		default_value = xbt_strdup("CLM03");
-		xbt_cfg_register(&_surf_cfg_set,
-				"workstation_model", description,  xbt_cfgelm_string, &default_value, 1, 1,
-				&_surf_cfg_cb__workstation_model, NULL);
-
-		sprintf(description,"The model to use for the CPU. Possible values: ");
-		p = description;
-		while (*(++p) != '\0');
-		for (i=0;surf_cpu_model_description[i].name;i++)
-			p+=sprintf(p,"%s%s",(i==0?"":", "),surf_cpu_model_description[i].name);
-		default_value = xbt_strdup("Cas01");
-		xbt_cfg_register(&_surf_cfg_set,
-				"cpu_model", description, xbt_cfgelm_string, &default_value, 1, 1,
-				&_surf_cfg_cb__cpu_model, NULL);
-
-		sprintf(description,"The model to use for the network. Possible values: ");
-		p = description;
-		while (*(++p) != '\0');
-		for (i=0;surf_network_model_description[i].name;i++)
-			p+=sprintf(p,"%s%s",(i==0?"":", "),surf_network_model_description[i].name);
-		default_value = xbt_strdup("CM02");
-		xbt_cfg_register(&_surf_cfg_set,
-				"network_model", description, xbt_cfgelm_string, &default_value, 1, 1,
-				&_surf_cfg_cb__network_model, NULL);
-		xbt_free(description);
-
-		double default_TCP_GAMMA = 20000.0;
-		xbt_cfg_register(&_surf_cfg_set,"TCP_gamma","Size of the biggest TCP window",
-					xbt_cfgelm_double,&default_TCP_GAMMA,1,1,_surf_cfg_cb__tcp_gamma,NULL);
-
-		xbt_cfg_register(&_surf_cfg_set,"path","Lookup path for inclusions in platform and deployment XML files",
-					xbt_cfgelm_string, NULL,0,0,_surf_cfg_cb__surf_path,NULL);
-		if (!surf_path) {
-			/* retrieves the current directory of the	 current process */
-			const char *initial_path = __surf_get_initial_path();
-			xbt_assert0((initial_path),
-					"__surf_get_initial_path() failed! Can't resolves current Windows directory");
-
-			surf_path = xbt_dynar_new(sizeof(char *), NULL);
-			xbt_cfg_set_string(_surf_cfg_set,"path", initial_path);
-		}
-
-		surf_config_cmd_line(argc,argv);
-	}
+void surf_config_init(int *argc, char **argv)
+{
+
+  /* Create the configuration support */
+  if (_surf_init_status == 0) { /* Only create stuff if not already inited */
+    _surf_init_status = 1;
+
+    char *description = xbt_malloc(1024), *p = description;
+    char *default_value;
+    int i;
+
+    sprintf(description, "The model to use for the CPU. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_cpu_model_description[i].name; i++)
+      p +=
+        sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                surf_cpu_model_description[i].name);
+    default_value = xbt_strdup("Cas01");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "cpu_model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__cpu_model, NULL);
+
+    sprintf(description,
+            "The model to use for the network. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_network_model_description[i].name; i++)
+      p +=
+        sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                surf_network_model_description[i].name);
+    default_value = xbt_strdup("CM02");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "network_model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__network_model,
+                     NULL);
+
+    sprintf(description,
+            "The model to use for the workstation. Possible values: ");
+    p = description;
+    while (*(++p) != '\0');
+    for (i = 0; surf_workstation_model_description[i].name; i++)
+      p +=
+        sprintf(p, "%s%s", (i == 0 ? "" : ", "),
+                surf_workstation_model_description[i].name);
+    default_value = xbt_strdup("CLM03");
+    xbt_cfg_register(&_surf_cfg_set,
+                     "workstation_model", description, xbt_cfgelm_string,
+                     &default_value, 1, 1, &_surf_cfg_cb__workstation_model,
+                     NULL);
+
+    xbt_free(description);
+
+    default_value = xbt_strdup("Full");
+    xbt_cfg_register(&_surf_cfg_set, "routing",
+                     "Model to use to store the routing information",
+                     xbt_cfgelm_string, &default_value, 0, 0, NULL,
+                     NULL);
+
+    xbt_cfg_register(&_surf_cfg_set, "TCP_gamma",
+                     "Size of the biggest TCP window", xbt_cfgelm_double,
+                     NULL, 1, 1, _surf_cfg_cb__tcp_gamma, NULL);
+    xbt_cfg_set_double(_surf_cfg_set, "TCP_gamma", 20000.0);
+
+    xbt_cfg_register(&_surf_cfg_set, "path",
+                     "Lookup path for inclusions in platform and deployment XML files",
+                     xbt_cfgelm_string, NULL, 0, 0, _surf_cfg_cb__surf_path,
+                     NULL);
+    if (!surf_path) {
+      /* retrieves the current directory of the        current process */
+      const char *initial_path = __surf_get_initial_path();
+      xbt_assert0((initial_path),
+                  "__surf_get_initial_path() failed! Can't resolves current Windows directory");
+
+      surf_path = xbt_dynar_new(sizeof(char *), NULL);
+      xbt_cfg_set_string(_surf_cfg_set, "path", initial_path);
+    }
+
+
+    surf_config_cmd_line(argc, argv);
+  }
 }
+
 void surf_config_finalize(void)
 {
-	if (!_surf_init_status)
-		return;                     /* Not initialized yet. Nothing to do */
+  if (!_surf_init_status)
+    return;                     /* Not initialized yet. Nothing to do */
 
-	xbt_cfg_free(&_surf_cfg_set);
-	_surf_init_status = 0;
+  xbt_cfg_free(&_surf_cfg_set);
+  _surf_init_status = 0;
 }
 
-void surf_config_models_setup(const char *platform_file){
-	char *workstation_model_name;
-	int workstation_id = -1;
-
-	workstation_model_name =
-		xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
-
-	DEBUG1("Model : %s", workstation_model_name);
-	workstation_id =
-		find_model_description(surf_workstation_model_description,
-				workstation_model_name);
-	if (!strcmp(workstation_model_name, "compound")) {
-		xbt_ex_t e;
-		char *network_model_name = NULL;
-		char *cpu_model_name = NULL;
-		int network_id = -1;
-		int cpu_id = -1;
-
-		TRY {
-			cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
-		} CATCH(e) {
-			if (e.category == bound_error) {
-				xbt_assert0(0,
-						"Set a cpu model to use with the 'compound' workstation model");
-				xbt_ex_free(e);
-			} else {
-				RETHROW;
-			}
-		}
-
-		TRY {
-			network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
-		}
-		CATCH(e) {
-			if (e.category == bound_error) {
-				xbt_assert0(0,
-						"Set a network model to use with the 'compound' workstation model");
-				xbt_ex_free(e);
-			} else {
-				RETHROW;
-			}
-		}
-
-		network_id =
-			find_model_description(surf_network_model_description,
-					network_model_name);
-		cpu_id =
-			find_model_description(surf_cpu_model_description, cpu_model_name);
-
-		surf_cpu_model_description[cpu_id].model_init(platform_file);
-		surf_network_model_description[network_id].model_init(platform_file);
-	}
-
-	DEBUG0("Call workstation_model_init");
-	surf_workstation_model_description[workstation_id].model_init(platform_file);
+void surf_config_models_setup(const char *platform_file)
+{
+  char *workstation_model_name;
+  int workstation_id = -1;
+
+  workstation_model_name =
+    xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
+
+  DEBUG1("Model : %s", workstation_model_name);
+  workstation_id =
+    find_model_description(surf_workstation_model_description,
+                           workstation_model_name);
+  if (!strcmp(workstation_model_name, "compound")) {
+    xbt_ex_t e;
+    char *network_model_name = NULL;
+    char *cpu_model_name = NULL;
+    int network_id = -1;
+    int cpu_id = -1;
+
+    TRY {
+      cpu_model_name = xbt_cfg_get_string(_surf_cfg_set, "cpu_model");
+    } CATCH(e) {
+      if (e.category == bound_error) {
+        xbt_assert0(0,
+                    "Set a cpu model to use with the 'compound' workstation model");
+        xbt_ex_free(e);
+      } else {
+        RETHROW;
+      }
+    }
+
+    TRY {
+      network_model_name = xbt_cfg_get_string(_surf_cfg_set, "network_model");
+    }
+    CATCH(e) {
+      if (e.category == bound_error) {
+        xbt_assert0(0,
+                    "Set a network model to use with the 'compound' workstation model");
+        xbt_ex_free(e);
+      } else {
+        RETHROW;
+      }
+    }
+
+    network_id =
+      find_model_description(surf_network_model_description,
+                             network_model_name);
+    cpu_id =
+      find_model_description(surf_cpu_model_description, cpu_model_name);
+
+    surf_cpu_model_description[cpu_id].model_init_preparse(platform_file);
+    surf_network_model_description[network_id].
+      model_init_preparse(platform_file);
+  }
+
+  DEBUG0("Call workstation_model_init");
+  surf_workstation_model_description[workstation_id].model_init_preparse
+    (platform_file);
 }
 
-void surf_config_models_create_elms(void) {
-	char *workstation_model_name = xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
-	int workstation_id =
-		find_model_description(surf_workstation_model_description,
-				workstation_model_name);
-	if (surf_workstation_model_description[workstation_id].create_ws != NULL)
-		surf_workstation_model_description[workstation_id].create_ws();
+void surf_config_models_create_elms(void)
+{
+  char *workstation_model_name =
+    xbt_cfg_get_string(_surf_cfg_set, "workstation_model");
+  int workstation_id =
+    find_model_description(surf_workstation_model_description,
+                           workstation_model_name);
+  if (surf_workstation_model_description[workstation_id].
+      model_init_postparse != NULL)
+    surf_workstation_model_description[workstation_id].model_init_postparse();
 }