From bf6791256c5865c68a174edc357a64da09652ab1 Mon Sep 17 00:00:00 2001 From: alegrand Date: Mon, 16 Jul 2007 14:32:42 +0000 Subject: [PATCH] surf_workstation_model -> workstation_model git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3803 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/msg/msg_config.c | 4 ++-- src/simix/smx_config.c | 12 ++++++------ src/simix/smx_environment.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/msg/msg_config.c b/src/msg/msg_config.c index 46fe08d257..3846bbc596 100644 --- a/src/msg/msg_config.c +++ b/src/msg/msg_config.c @@ -15,7 +15,7 @@ /** \brief set a configuration variable * * Currently existing configuation variable: - * - surf_workstation_model (string): Model of workstation to 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. @@ -25,7 +25,7 @@ * - "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","KCCFLN05"); + * MSG_config("workstation_model","KCCFLN05"); */ void MSG_config(const char *name, ...) { diff --git a/src/simix/smx_config.c b/src/simix/smx_config.c index ef77dd6928..b1ab29766d 100644 --- a/src/simix/smx_config.c +++ b/src/simix/smx_config.c @@ -15,8 +15,8 @@ int _simix_init_status = 0; /* 0: beginning of time; 2: inited (running) */ xbt_cfg_t _simix_cfg_set = NULL; -/* callback of the surf_workstation_model variable */ -static void _simix_cfg_cb__surf_workstation_model(const char *name, int pos) +/* callback of the workstation_model variable */ +static void _simix_cfg_cb__workstation_model(const char *name, int pos) { char *val; @@ -43,10 +43,10 @@ void simix_config_init(void) _simix_cfg_set = xbt_cfg_new(); xbt_cfg_register (_simix_cfg_set, - "surf_workstation_model", xbt_cfgelm_string, 1,1, - &_simix_cfg_cb__surf_workstation_model,NULL); + "workstation_model", xbt_cfgelm_string, 1,1, + &_simix_cfg_cb__workstation_model,NULL); - xbt_cfg_set_string(_simix_cfg_set,"surf_workstation_model", "KCCFLN05"); + xbt_cfg_set_string(_simix_cfg_set,"workstation_model", "KCCFLN05"); } void simix_config_finalize(void) @@ -62,7 +62,7 @@ void simix_config_finalize(void) /** \brief Set a configuration variable * * Currently existing configuration variable: - * - surf_workstation_model (string): Model of workstation to 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. diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c index 7119d22511..0cd11b0fd7 100644 --- a/src/simix/smx_environment.c +++ b/src/simix/smx_environment.c @@ -40,7 +40,7 @@ void SIMIX_create_environment(const char *file) surf_timer_resource_init(file); /* which model do you want today? */ - workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "surf_workstation_model"); + workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "workstation_model"); DEBUG1("Model : %s", workstation_model_name); if (!strcmp(workstation_model_name,"KCCFLN05")) { -- 2.20.1