-/* $Id$ */
-
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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 "xbt/ex.h"
#include "xbt/dict.h"
#include "portable.h"
-#include "workstation_private.h"
-#include "cpu_private.h"
-#include "network_common.h"
+#include "surf_private.h"
+
+typedef struct workstation_CLM03 {
+ s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
+ void *cpu;
+ int id;
+} s_workstation_CLM03_t, *workstation_CLM03_t;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
- "Logging specific to the SURF workstation module");
+ "Logging specific to the SURF workstation module");
-surf_workstation_model_t surf_workstation_model = NULL;
-xbt_dict_t workstation_set = NULL;
+surf_model_t surf_workstation_model = NULL;
static workstation_CLM03_t workstation_new(const char *name,
- void *cpu, void *card)
+ void *cpu, int id)
{
workstation_CLM03_t workstation = xbt_new0(s_workstation_CLM03_t, 1);
- workstation->model = (surf_model_t) surf_workstation_model;
- workstation->name = xbt_strdup(name);
+ workstation->generic_resource.model = surf_workstation_model;
+ workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
- workstation->network_card = card;
+ workstation->id = id;
- return workstation;
-}
+ xbt_dict_set(surf_model_resource_set(surf_workstation_model), name,
+ workstation, surf_resource_free);
-static void workstation_free(void *workstation)
-{
- free(((workstation_CLM03_t) workstation)->name);
- free(workstation);
+ return workstation;
}
void create_workstations(void)
xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
void *cpu = NULL;
- void *nw_card = NULL;
- xbt_dict_foreach(cpu_set, cursor, name, cpu) {
- nw_card = xbt_dict_get_or_null(network_card_set, name);
- xbt_assert1(nw_card, "No corresponding card found for %s", name);
+ xbt_dict_foreach(surf_model_resource_set(surf_cpu_model), cursor, name, cpu) {
+ int *id = NULL;
+// COMMENTED BY DAVID
+// if (used_routing && used_routing->host_id)
+// id = xbt_dict_get_or_null(used_routing->host_id,name);
- xbt_dict_set(workstation_set, name,
- workstation_new(name, cpu, nw_card), workstation_free);
+ workstation_new(name, cpu, id ? *id : 0);
}
}
-static void *name_service(const char *name)
+static int ws_resource_used(void *resource_id)
{
- return xbt_dict_get_or_null(workstation_set, name);
+ THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
}
-static const char *get_resource_name(void *resource_id)
+static void ws_parallel_action_cancel(surf_action_t action)
{
- return ((workstation_CLM03_t) resource_id)->name;
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
-static int resource_used(void *resource_id)
+static int ws_parallel_action_free(surf_action_t action)
{
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
-static void parallel_action_cancel(surf_action_t action)
+static int ws_action_unref(surf_action_t action)
{
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
-}
-
-static int parallel_action_free(surf_action_t action)
-{
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
-}
-
-static void parallel_action_use(surf_action_t action)
-{
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
-}
-
-static int action_free(surf_action_t action)
-{
- if (action->model_type == (surf_model_t) surf_network_model)
- return surf_network_model->common_public->action_free(action);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- return surf_cpu_model->common_public->action_free(action);
- else if (action->model_type ==
- (surf_model_t) surf_workstation_model)
- return parallel_action_free(action);
+ if (action->model_type == surf_network_model)
+ return surf_network_model->action_unref(action);
+ else if (action->model_type == surf_cpu_model)
+ return surf_cpu_model->action_unref(action);
+ else if (action->model_type == surf_workstation_model)
+ return ws_parallel_action_free(action);
else
DIE_IMPOSSIBLE;
return 0;
}
-static void action_use(surf_action_t action)
-{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->action_use(action);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->action_use(action);
- else if (action->model_type ==
- (surf_model_t) surf_workstation_model)
- parallel_action_use(action);
- else
- DIE_IMPOSSIBLE;
- return;
-}
-
-static void action_cancel(surf_action_t action)
+static void ws_action_cancel(surf_action_t action)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->action_cancel(action);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->action_cancel(action);
- else if (action->model_type ==
- (surf_model_t) surf_workstation_model)
- parallel_action_cancel(action);
+ if (action->model_type == surf_network_model)
+ surf_network_model->action_cancel(action);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->action_cancel(action);
+ else if (action->model_type == surf_workstation_model)
+ ws_parallel_action_cancel(action);
else
DIE_IMPOSSIBLE;
return;
}
-static void action_recycle(surf_action_t action)
-{
- DIE_IMPOSSIBLE;
- return;
-}
-
-static void action_change_state(surf_action_t action,
- e_surf_action_state_t state)
+static void ws_action_state_set(surf_action_t action,
+ e_surf_action_state_t state)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->action_change_state(action,
- state);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->action_change_state(action, state);
- else if (action->model_type ==
- (surf_model_t) surf_workstation_model)
- surf_action_change_state(action, state);
+ if (action->model_type == surf_network_model)
+ surf_network_model->action_state_set(action, state);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->action_state_set(action, state);
+ else if (action->model_type == surf_workstation_model)
+ surf_action_state_set(action, state);
else
DIE_IMPOSSIBLE;
return;
}
-static double share_resources(double now)
+static double ws_share_resources(double now)
{
return -1.0;
}
-static void update_actions_state(double now, double delta)
+static void ws_update_actions_state(double now, double delta)
{
return;
}
-static void update_resource_state(void *id,
- tmgr_trace_event_t event_type,
- double value)
+static void ws_update_resource_state(void *id,
+ tmgr_trace_event_t event_type,
+ double value, double date)
{
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
+ THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
}
-static surf_action_t execute(void *workstation, double size)
+static surf_action_t ws_execute(void *workstation, double size)
{
- return surf_cpu_model->extension_public->
- execute(((workstation_CLM03_t) workstation)->cpu, size);
+ return surf_cpu_model->extension.cpu.
+ execute(((workstation_CLM03_t) workstation)->cpu, size);
}
-static surf_action_t action_sleep(void *workstation, double duration)
+static surf_action_t ws_action_sleep(void *workstation, double duration)
{
- return surf_cpu_model->extension_public->
- sleep(((workstation_CLM03_t) workstation)->cpu, duration);
+ return surf_cpu_model->extension.cpu.
+ sleep(((workstation_CLM03_t) workstation)->cpu, duration);
}
-static void action_suspend(surf_action_t action)
+static void ws_action_suspend(surf_action_t action)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->suspend(action);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->suspend(action);
+ if (action->model_type == surf_network_model)
+ surf_network_model->suspend(action);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->suspend(action);
else
DIE_IMPOSSIBLE;
}
-static void action_resume(surf_action_t action)
+static void ws_action_resume(surf_action_t action)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->resume(action);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->resume(action);
+ if (action->model_type == surf_network_model)
+ surf_network_model->resume(action);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->resume(action);
else
DIE_IMPOSSIBLE;
}
-static int action_is_suspended(surf_action_t action)
+static int ws_action_is_suspended(surf_action_t action)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- return surf_network_model->common_public->is_suspended(action);
- if (action->model_type == (surf_model_t) surf_cpu_model)
- return surf_cpu_model->common_public->is_suspended(action);
+ if (action->model_type == surf_network_model)
+ return surf_network_model->is_suspended(action);
+ if (action->model_type == surf_cpu_model)
+ return surf_cpu_model->is_suspended(action);
DIE_IMPOSSIBLE;
}
-static void action_set_max_duration(surf_action_t action, double duration)
+static void ws_action_set_max_duration(surf_action_t action, double duration)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->set_max_duration(action,
- duration);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->set_max_duration(action, duration);
+ if (action->model_type == surf_network_model)
+ surf_network_model->set_max_duration(action, duration);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->set_max_duration(action, duration);
else
DIE_IMPOSSIBLE;
}
-static void action_set_priority(surf_action_t action, double priority)
+static void ws_action_set_priority(surf_action_t action, double priority)
{
- if (action->model_type == (surf_model_t) surf_network_model)
- surf_network_model->common_public->set_priority(action, priority);
- else if (action->model_type == (surf_model_t) surf_cpu_model)
- surf_cpu_model->common_public->set_priority(action, priority);
+ if (action->model_type == surf_network_model)
+ surf_network_model->set_priority(action, priority);
+ else if (action->model_type == surf_cpu_model)
+ surf_cpu_model->set_priority(action, priority);
else
DIE_IMPOSSIBLE;
}
-static surf_action_t communicate(void *workstation_src,
- void *workstation_dst, double size,
- double rate)
+static int ws_get_latency_limited(surf_action_t action)
{
- return surf_network_model->extension_public->
- communicate(((workstation_CLM03_t) workstation_src)->network_card,
- ((workstation_CLM03_t) workstation_dst)->network_card,
- size, rate);
+ 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;
}
-static e_surf_cpu_state_t get_state(void *workstation)
+static double ws_action_get_remains(surf_action_t action)
{
- return surf_cpu_model->extension_public->
- get_state(((workstation_CLM03_t) workstation)->cpu);
+ if (action->model_type == surf_network_model)
+ return surf_network_model->get_remains(action);
+ if (action->model_type == surf_cpu_model)
+ return surf_cpu_model->get_remains(action);
+ DIE_IMPOSSIBLE;
}
-static double get_speed(void *workstation, double load)
+static surf_action_t ws_communicate(void *workstation_src,
+ void *workstation_dst, double size,
+ double rate)
{
- return surf_cpu_model->extension_public->
- get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+ workstation_CLM03_t src = (workstation_CLM03_t) workstation_src;
+ workstation_CLM03_t dst = (workstation_CLM03_t) workstation_dst;
+ return surf_network_model->extension.network.
+ communicate(surf_resource_name(src->cpu), surf_resource_name(dst->cpu),
+ src->id, dst->id, size, rate);
}
-static double get_available_speed(void *workstation)
+static e_surf_resource_state_t ws_get_state(void *workstation)
{
- return surf_cpu_model->extension_public->
- get_available_speed(((workstation_CLM03_t) workstation)->cpu);
+ return surf_cpu_model->extension.cpu.
+ get_state(((workstation_CLM03_t) workstation)->cpu);
}
-static xbt_dict_t get_properties(void *workstation)
+static double ws_get_speed(void *workstation, double load)
{
- return surf_cpu_model->common_public->
- get_properties(((workstation_CLM03_t) workstation)->cpu);
+ return surf_cpu_model->extension.cpu.
+ get_speed(((workstation_CLM03_t) workstation)->cpu, load);
}
-static surf_action_t execute_parallel_task(int workstation_nb,
- void **workstation_list,
- double *computation_amount,
- double *communication_amount,
- double amount,
- double rate)
+static double ws_get_available_speed(void *workstation)
{
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
+ return surf_cpu_model->extension.cpu.
+ get_available_speed(((workstation_CLM03_t)
+ workstation)->cpu);
+}
+
+static surf_action_t ws_execute_parallel_task(int workstation_nb,
+ void **workstation_list,
+ double *computation_amount,
+ double *communication_amount,
+ double amount, double rate)
+{
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
/* returns an array of network_link_CM02_t */
-static const void **get_route(void *src, void *dst)
+static xbt_dynar_t ws_get_route(void *src, void *dst)
{
workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
- return surf_network_model->extension_public->
- get_route(workstation_src->network_card,
- workstation_dst->network_card);
+ return surf_network_model->extension.network.get_route(workstation_src->id,
+ workstation_dst->id);
}
-static int get_route_size(void *src, void *dst)
+static double ws_get_link_bandwidth(const void *link)
{
- workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
- workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
- return surf_network_model->extension_public->
- get_route_size(workstation_src->network_card,
- workstation_dst->network_card);
+ return surf_network_model->extension.network.get_link_bandwidth(link);
}
-static const char *get_link_name(const void *link)
+static double ws_get_link_latency(const void *link)
{
- return surf_network_model->extension_public->get_link_name(link);
+ return surf_network_model->extension.network.get_link_latency(link);
}
-static double get_link_bandwidth(const void *link)
+static int ws_link_shared(const void *link)
{
- return surf_network_model->extension_public->get_link_bandwidth(link);
+ return surf_network_model->extension.network.get_link_latency(link);
}
-static double get_link_latency(const void *link)
+static void ws_finalize(void)
{
- return surf_network_model->extension_public->get_link_latency(link);
+ surf_model_exit(surf_workstation_model);
+ surf_workstation_model = NULL;
}
-static void finalize(void)
+static xbt_dict_t ws_get_properties(const void *ws)
{
- xbt_dict_free(&workstation_set);
- xbt_swag_free(surf_workstation_model->common_public->states.
- ready_action_set);
- xbt_swag_free(surf_workstation_model->common_public->states.
- running_action_set);
- xbt_swag_free(surf_workstation_model->common_public->states.
- failed_action_set);
- xbt_swag_free(surf_workstation_model->common_public->states.
- done_action_set);
-
- free(surf_workstation_model->common_public);
- free(surf_workstation_model->common_private);
- free(surf_workstation_model->extension_public);
-
- free(surf_workstation_model);
- surf_workstation_model = NULL;
+ return surf_resource_properties(((workstation_CLM03_t) ws)->cpu);
}
static void surf_workstation_model_init_internal(void)
{
- s_surf_action_t action;
-
- surf_workstation_model = xbt_new0(s_surf_workstation_model_t, 1);
-
- surf_workstation_model->common_private =
- xbt_new0(s_surf_model_private_t, 1);
- surf_workstation_model->common_public =
- xbt_new0(s_surf_model_public_t, 1);
-/* surf_workstation_model->extension_private = xbt_new0(s_surf_workstation_model_extension_private_t,1); */
- surf_workstation_model->extension_public =
- xbt_new0(s_surf_workstation_model_extension_public_t, 1);
-
- surf_workstation_model->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_model->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_model->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_model->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_workstation_model->common_public->name_service = name_service;
- surf_workstation_model->common_public->get_resource_name =
- get_resource_name;
- surf_workstation_model->common_public->action_get_state =
- surf_action_get_state;
- surf_workstation_model->common_public->action_get_start_time =
- surf_action_get_start_time;
- surf_workstation_model->common_public->action_get_finish_time =
- surf_action_get_finish_time;
- surf_workstation_model->common_public->action_free = action_free;
- surf_workstation_model->common_public->action_use = action_use;
- surf_workstation_model->common_public->action_cancel = action_cancel;
- surf_workstation_model->common_public->action_recycle =
- action_recycle;
- surf_workstation_model->common_public->action_change_state =
- action_change_state;
- surf_workstation_model->common_public->action_set_data =
- surf_action_set_data;
- surf_workstation_model->common_public->name = "Workstation";
-
- surf_workstation_model->common_private->resource_used = resource_used;
- surf_workstation_model->common_private->share_resources =
- share_resources;
- surf_workstation_model->common_private->update_actions_state =
- update_actions_state;
- surf_workstation_model->common_private->update_resource_state =
- update_resource_state;
- surf_workstation_model->common_private->finalize = finalize;
-
- surf_workstation_model->common_public->suspend = action_suspend;
- surf_workstation_model->common_public->resume = action_resume;
- surf_workstation_model->common_public->is_suspended =
- action_is_suspended;
- surf_workstation_model->common_public->set_max_duration =
- action_set_max_duration;
- surf_workstation_model->common_public->set_priority =
- action_set_priority;
-
- surf_workstation_model->extension_public->execute = execute;
- surf_workstation_model->extension_public->sleep = action_sleep;
- surf_workstation_model->extension_public->get_state = get_state;
- surf_workstation_model->extension_public->get_speed = get_speed;
- surf_workstation_model->extension_public->get_available_speed =
- get_available_speed;
-
- /*manage the properties of the workstation*/
- surf_workstation_model->common_public->get_properties = get_properties;
-
- surf_workstation_model->extension_public->communicate = communicate;
- surf_workstation_model->extension_public->execute_parallel_task =
- execute_parallel_task;
- surf_workstation_model->extension_public->get_route = get_route;
- surf_workstation_model->extension_public->get_route_size =
- get_route_size;
- surf_workstation_model->extension_public->get_link_name =
- get_link_name;
- surf_workstation_model->extension_public->get_link_bandwidth =
- get_link_bandwidth;
- surf_workstation_model->extension_public->get_link_latency =
- get_link_latency;
- workstation_set = xbt_dict_new();
+ surf_workstation_model = surf_model_init();
+
+ surf_workstation_model->name = "Workstation";
+ surf_workstation_model->action_unref = ws_action_unref;
+ surf_workstation_model->action_cancel = ws_action_cancel;
+ surf_workstation_model->action_state_set = ws_action_state_set;
+
+ surf_workstation_model->model_private->resource_used = ws_resource_used;
+ surf_workstation_model->model_private->share_resources = ws_share_resources;
+ surf_workstation_model->model_private->update_actions_state =
+ ws_update_actions_state;
+ surf_workstation_model->model_private->update_resource_state =
+ ws_update_resource_state;
+ surf_workstation_model->model_private->finalize = ws_finalize;
+
+ surf_workstation_model->suspend = ws_action_suspend;
+ surf_workstation_model->resume = ws_action_resume;
+ 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;
+ surf_workstation_model->get_remains = ws_action_get_remains;
+ surf_workstation_model->get_latency_limited = ws_get_latency_limited;
+
+ surf_workstation_model->extension.workstation.execute = ws_execute;
+ surf_workstation_model->extension.workstation.sleep = ws_action_sleep;
+ surf_workstation_model->extension.workstation.get_state = ws_get_state;
+ surf_workstation_model->extension.workstation.get_speed = ws_get_speed;
+ surf_workstation_model->extension.workstation.get_available_speed =
+ ws_get_available_speed;
+
+ surf_workstation_model->extension.workstation.communicate = ws_communicate;
+ surf_workstation_model->extension.workstation.get_route = ws_get_route;
+ surf_workstation_model->extension.workstation.execute_parallel_task =
+ ws_execute_parallel_task;
+ surf_workstation_model->extension.workstation.get_link_bandwidth =
+ ws_get_link_bandwidth;
+ surf_workstation_model->extension.workstation.get_link_latency =
+ ws_get_link_latency;
+ surf_workstation_model->extension.workstation.link_shared = ws_link_shared;
+ surf_workstation_model->extension.workstation.get_properties =
+ ws_get_properties;
+
}
/********************************************************************/
void surf_workstation_model_init_CLM03(const char *filename)
{
surf_workstation_model_init_internal();
- surf_cpu_model_init_Cas01(filename);
- surf_network_model_init_CM02(filename);
+ surf_cpu_model_init_Cas01_im(filename);
+ surf_network_model_init_LegrandVelho(filename);
update_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- "CLM03",
- (surf_model_t) surf_workstation_model);
+ "CLM03", surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}
surf_workstation_model_init_internal();
update_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- "compound",
- (surf_model_t) surf_workstation_model);
+ "compound", surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}
