From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 10 Aug 2007 12:33:01 +0000 (+0000)
Subject: various cleanups
X-Git-Tag: v3.3~1294
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3cc98de394c2f860157a7a1dbb8b48d95de0fbc8?hp=97a04f6828d3861f6ec6f02b64866dd76662506c;ds=sidebyside

various cleanups


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4066 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index a552aa13fb..ccca24483c 100644
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -304,7 +304,7 @@ static surf_action_t execute_parallel_task_bogus (int workstation_nb,
 					    double amount,
 					    double rate)
 {
-  DIE_IMPOSSIBLE;
+  xbt_assert0(0,"This model does not implement parallel tasks");
 }
 
 static surf_action_t execute_parallel_task (int workstation_nb,
@@ -530,21 +530,13 @@ void surf_workstation_resource_init_CLM03(const char *filename)
   surf_cpu_resource_init_Cas01(filename);
   surf_network_resource_init_CM02(filename);
   create_workstations();
+  update_resource_description(surf_workstation_resource_description,
+			      surf_workstation_resource_description_size,
+			      "CLM03",
+			      (surf_resource_t) surf_workstation_resource);
   xbt_dynar_push(resource_list, &surf_workstation_resource);
 }
 
-#ifdef USE_GTNETS
-/* KF. Use GTNetS for the network. */
-void surf_workstation_resource_init_GTNETS(const char *filename)
-{
-  surf_workstation_resource_init_internal();
-  surf_cpu_resource_init_Cas01(filename);
-  surf_network_resource_init_GTNETS(filename);
-  create_workstations();
-  xbt_dynar_push(resource_list, &surf_workstation_resource);
-}
-#endif
-
 void surf_workstation_resource_init_compound(const char *filename)
 {
 
@@ -552,5 +544,11 @@ void surf_workstation_resource_init_compound(const char *filename)
   xbt_assert0(surf_network_resource,"No network resource defined yet!");
   surf_workstation_resource_init_internal();
   create_workstations();
+
+  update_resource_description(surf_workstation_resource_description,
+			      surf_workstation_resource_description_size,
+			      "compound",
+			      (surf_resource_t) surf_workstation_resource);
+
   xbt_dynar_push(resource_list, &surf_workstation_resource);
 }