#include "xbt/dict.h"
#include "portable.h"
#include "surf_private.h"
+#include "surf/surf_resource.h"
+
+
typedef struct workstation_CLM03 {
s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
- xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
- workstation, surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, workstation);
return workstation;
}
void create_workstations(void)
{
- xbt_dict_cursor_t cursor = NULL;
+ xbt_lib_cursor_t cursor = NULL;
char *name = NULL;
- void *cpu = NULL;
+ void **cpu = NULL;
- xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name,
- cpu) {
- workstation_new(name, cpu);
+ xbt_lib_foreach(host_lib, cursor, name, cpu) {
+ if(cpu[SURF_CPU_LEVEL])
+ workstation_new(name, cpu[SURF_CPU_LEVEL]);
}
}
DIE_IMPOSSIBLE;
}
+#ifdef HAVE_TRACING
+static void ws_action_set_category(surf_action_t action, const char *category)
+{
+ if (action->model_type == surf_network_model)
+ surf_network_model->set_category(action, category);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->set_category(action, category);
+ else
+ DIE_IMPOSSIBLE;
+}
+#endif
+
#ifdef HAVE_LATENCY_BOUND_TRACKING
static int ws_get_latency_limited(surf_action_t action)
{
if (action->model_type == surf_network_model)
return surf_network_model->get_latency_limited(action);
- INFO0
- ("You tried to ask if a non network action is limited by latency, aborting...");
- DIE_IMPOSSIBLE;
+ else
+ return 0;
}
#endif
surf_workstation_model->is_suspended = ws_action_is_suspended;
surf_workstation_model->set_max_duration = ws_action_set_max_duration;
surf_workstation_model->set_priority = ws_action_set_priority;
+#ifdef HAVE_TRACING
+ surf_workstation_model->set_category = ws_action_set_category;
+#endif
surf_workstation_model->get_remains = ws_action_get_remains;
#ifdef HAVE_LATENCY_BOUND_TRACKING
surf_workstation_model->get_latency_limited = ws_get_latency_limited;
/* month = {may}, */
/* year = {2003} */
/* } */
-void surf_workstation_model_init_CLM03(const char *filename)
+void surf_workstation_model_init_CLM03(void)
{
surf_workstation_model_init_internal();
- surf_cpu_model_init_Cas01_im(filename);
- surf_network_model_init_LegrandVelho(filename);
- update_model_description(surf_workstation_model_description,
- "CLM03", surf_workstation_model);
+ surf_cpu_model_init_Cas01_im();
+ im_surf_network_model_init_LegrandVelho();
+ // FIXME: prefer the proper interface instead of bypassing the cfg module that way
+ //xbt_cfg_set_parse(_surf_cfg_set, "network/model:LV08");
+ //xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
xbt_dynar_push(model_list, &surf_workstation_model);
+ sg_platf_postparse_add_cb(create_workstations);
}
-void surf_workstation_model_init_compound(const char *filename)
+void surf_workstation_model_init_compound()
{
- xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
- xbt_assert0(surf_network_model, "No network model defined yet!");
+ xbt_assert(surf_cpu_model, "No CPU model defined yet!");
+ xbt_assert(surf_network_model, "No network model defined yet!");
surf_workstation_model_init_internal();
-
- update_model_description(surf_workstation_model_description,
- "compound", surf_workstation_model);
-
xbt_dynar_push(model_list, &surf_workstation_model);
+ sg_platf_postparse_add_cb(create_workstations);
}