-static void surf_workstation_resource_init_internal(void)
-{
- s_surf_action_t action;
-
- surf_workstation_resource = xbt_new0(s_surf_workstation_resource_t, 1);
-
- surf_workstation_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_workstation_resource->common_public =
- xbt_new0(s_surf_resource_public_t, 1);
-/* surf_workstation_resource->extension_private = xbt_new0(s_surf_workstation_resource_extension_private_t,1); */
- surf_workstation_resource->extension_public =
- xbt_new0(s_surf_workstation_resource_extension_public_t, 1);
-
- surf_workstation_resource->common_public->states.ready_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.running_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.failed_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.done_action_set =
- xbt_swag_new(xbt_swag_offset(action, state_hookup));
-
- surf_workstation_resource->common_public->name_service = name_service;
- surf_workstation_resource->common_public->get_resource_name =
- get_resource_name;
- surf_workstation_resource->common_public->action_get_state =
- surf_action_get_state;
- surf_workstation_resource->common_public->action_free = action_free;
- surf_workstation_resource->common_public->action_cancel = action_cancel;
- surf_workstation_resource->common_public->action_recycle =
- action_recycle;
- surf_workstation_resource->common_public->action_change_state =
- action_change_state;
- surf_workstation_resource->common_public->action_set_data = surf_action_set_data;
- surf_workstation_resource->common_public->name = "Workstation";
-
- surf_workstation_resource->common_private->resource_used = resource_used;
- surf_workstation_resource->common_private->share_resources =
- share_resources;
- surf_workstation_resource->common_private->update_actions_state =
- update_actions_state;
- surf_workstation_resource->common_private->update_resource_state =
- update_resource_state;
- surf_workstation_resource->common_private->finalize = finalize;
-
- surf_workstation_resource->extension_public->execute = execute;
- surf_workstation_resource->extension_public->sleep = action_sleep;
- surf_workstation_resource->extension_public->suspend = action_suspend;
- surf_workstation_resource->extension_public->resume = action_resume;
- surf_workstation_resource->extension_public->is_suspended = action_is_suspended;
- surf_workstation_resource->extension_public->get_state = get_state;
- surf_workstation_resource->extension_public->communicate = communicate;
-
- workstation_set = xbt_dict_new();
-
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
-}
-
-void surf_workstation_resource_init(const char *filename)
-{
-/* int i ; */
-/* surf_resource_t resource = NULL; */
-
- surf_workstation_resource_init_internal();
- surf_cpu_resource_init(filename);
- surf_network_resource_init(filename);
- create_workstations();
- xbt_dynar_push(resource_list, &surf_workstation_resource);
-/* xbt_dynar_foreach(resource_list, i, resource) { */
-/* if(resource==surf_cpu_resource) { */
-/* xbt_dynar_remove_at(resource_list, i, NULL); */
-/* i--; */
-/* continue; */
-/* } */
-/* if(resource==surf_network_resource) { */
-/* xbt_dynar_remove_at(resource_list, i, NULL); */
-/* i--; */
-/* continue; */
-/* } */
-/* } */
+/********************************************************************/
+/* The model used in MSG and presented at CCGrid03 */
+/********************************************************************/
+/* @InProceedings{Casanova.CLM_03, */
+/* author = {Henri Casanova and Arnaud Legrand and Loris Marchal}, */
+/* title = {Scheduling Distributed Applications: the SimGrid Simulation Framework}, */
+/* booktitle = {Proceedings of the third IEEE International Symposium on Cluster Computing and the Grid (CCGrid'03)}, */
+/* publisher = {"IEEE Computer Society Press"}, */
+/* month = {may}, */
+/* year = {2003} */
+/* } */
+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);
+ update_model_description(surf_workstation_model_description,
+ "CLM03", surf_workstation_model);
+ xbt_dynar_push(model_list, &surf_workstation_model);
+}
+
+void surf_workstation_model_init_compound(const char *filename)
+{
+
+ xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
+ xbt_assert0(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);