/* 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"xbt/sysdep.h"
-#include "xbt/error.h"
+#include "private.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(environment, msg,
"Logging specific to MSG (environment)");
xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
void *workstation = NULL;
+ char *workstation_model_name;
-#ifdef ALVIN_SURF_SPECIAL
- surf_workstation_resource_init_KCCFLN05(file);
-#else
- surf_workstation_resource_init_CLM03(file);
-#endif
+ msg_config_init(); /* make sure that our configuration set is created */
+ surf_timer_resource_init(file);
+
+ /* which model do you want today? */
+ workstation_model_name = xbt_cfg_get_string (_msg_cfg_set, "surf_workstation_model");
+
+ DEBUG1("Model : %s", workstation_model_name);
+ if (!strcmp(workstation_model_name,"KCCFLN05")) {
+ surf_workstation_resource_init_KCCFLN05(file);
+ } else if (!strcmp(workstation_model_name,"CLM03")) {
+ surf_workstation_resource_init_CLM03(file);
+ } else {
+ xbt_assert0(0,"The impossible happened (once again)");
+ }
+ _msg_init_status = 2; /* inited; don't change settings now */
xbt_dict_foreach(workstation_set, cursor, name, workstation) {
__MSG_host_create(name, workstation, NULL);