A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lua: removing the MSG_process_sleep hack changes the order of output
[simgrid.git]
/
src
/
surf
/
workstation.c
diff --git
a/src/surf/workstation.c
b/src/surf/workstation.c
index
457cfe3
..
0a8c322
100644
(file)
--- a/
src/surf/workstation.c
+++ b/
src/surf/workstation.c
@@
-8,6
+8,9
@@
#include "xbt/dict.h"
#include "portable.h"
#include "surf_private.h"
#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 */
typedef struct workstation_CLM03 {
s_surf_resource_t generic_resource; /* Must remain first to add this to a trace */
@@
-27,21
+30,20
@@
static workstation_CLM03_t workstation_new(const char *name, void *cpu)
workstation->generic_resource.name = xbt_strdup(name);
workstation->cpu = cpu;
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)
{
return workstation;
}
void create_workstations(void)
{
- xbt_
dict
_cursor_t cursor = NULL;
+ xbt_
lib
_cursor_t cursor = NULL;
char *name = 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]
);
}
}
}
}
@@
-348,25
+350,21
@@
static void surf_workstation_model_init_internal(void)
/* month = {may}, */
/* year = {2003} */
/* } */
/* 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_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();
+ surf_network_model_init_LegrandVelho();
xbt_dynar_push(model_list, &surf_workstation_model);
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_assert
0
(surf_cpu_model, "No CPU model defined yet!");
- xbt_assert
0
(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();
surf_workstation_model_init_internal();
-
- update_model_description(surf_workstation_model_description,
- "compound", surf_workstation_model);
-
xbt_dynar_push(model_list, &surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
+ sg_platf_postparse_add_cb(create_workstations);
}
}