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
Include surf_resource.h, for surf_resource_name().
[simgrid.git]
/
src
/
instr
/
jedule
/
jedule_sd_binding.c
diff --git
a/src/instr/jedule/jedule_sd_binding.c
b/src/instr/jedule/jedule_sd_binding.c
index
957989f
..
67a1e91
100644
(file)
--- a/
src/instr/jedule/jedule_sd_binding.c
+++ b/
src/instr/jedule/jedule_sd_binding.c
@@
-12,6
+12,7
@@
#include "xbt/dynar.h"
#include "surf/surf_private.h"
#include "xbt/dynar.h"
#include "surf/surf_private.h"
+#include "surf/surf_resource.h"
#include "surf/surf.h"
#include "instr/jedule/jedule_sd_binding.h"
#include "surf/surf.h"
#include "instr/jedule/jedule_sd_binding.h"
@@
-21,6
+22,10
@@
#ifdef HAVE_JEDULE
#ifdef HAVE_JEDULE
+XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule,
+ "Logging specific to Jedule SD binding");
+
jedule_t jedule;
void jedule_log_sd_event(SD_task_t task) {
jedule_t jedule;
void jedule_log_sd_event(SD_task_t task) {
@@
-33,12
+38,12
@@
void jedule_log_sd_event(SD_task_t task) {
host_list = xbt_dynar_new(sizeof(char*), NULL);
for(i=0; i<task->workstation_nb; i++) {
host_list = xbt_dynar_new(sizeof(char*), NULL);
for(i=0; i<task->workstation_nb; i++) {
- char *hostname = surf_resource_name(task->workstation_list[i]->surf_workstation);
+ char *hostname =
(char*)
surf_resource_name(task->workstation_list[i]->surf_workstation);
xbt_dynar_push(host_list, &hostname);
}
create_jed_event(&event,
xbt_dynar_push(host_list, &hostname);
}
create_jed_event(&event,
- SD_task_get_name(task),
+
(char*)
SD_task_get_name(task),
task->start_time,
task->finish_time,
"SD");
task->start_time,
task->finish_time,
"SD");
@@
-49,14
+54,14
@@
void jedule_log_sd_event(SD_task_t task) {
xbt_dynar_free(&host_list);
}
xbt_dynar_free(&host_list);
}
-static void create_hierarchy(
routing_component
_t current_comp,
+static void create_hierarchy(
AS
_t current_comp,
jed_simgrid_container_t current_container) {
xbt_dict_cursor_t cursor = NULL;
char *key;
jed_simgrid_container_t current_container) {
xbt_dict_cursor_t cursor = NULL;
char *key;
-
routing_component
_t elem;
+
AS
_t elem;
network_element_t network_elem;
network_element_t network_elem;
- if(
xbt_dict_length(current_comp->routing_sons) == 0
) {
+ if(
xbt_dict_is_empty(current_comp->routing_sons)
) {
// I am no AS
// add hosts to jedule platform
xbt_dynar_t hosts;
// I am no AS
// add hosts to jedule platform
xbt_dynar_t hosts;
@@
-65,7
+70,7
@@
static void create_hierarchy(routing_component_t current_comp,
xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
char *hostname;
xbt_dict_foreach(current_comp->to_index, cursor, key, network_elem) {
char *hostname;
-
printf("key %s value %d
\n", key, network_elem);
+
XBT_DEBUG("key %s value %p
\n", key, network_elem);
//xbt_dynar_push_as(hosts, char*, key);
hostname = strdup(key);
xbt_dynar_push(hosts, &hostname);
//xbt_dynar_push_as(hosts, char*, key);
hostname = strdup(key);
xbt_dynar_push(hosts, &hostname);
@@
-78,7
+83,7
@@
static void create_hierarchy(routing_component_t current_comp,
jed_simgrid_container_t child_container;
jed_simgrid_create_container(&child_container, elem->name);
jed_simgrid_add_container(current_container, child_container);
jed_simgrid_container_t child_container;
jed_simgrid_create_container(&child_container, elem->name);
jed_simgrid_add_container(current_container, child_container);
-
printf
("name : %s\n", elem->name);
+
XBT_DEBUG
("name : %s\n", elem->name);
create_hierarchy(elem, child_container);
}
}
create_hierarchy(elem, child_container);
}
}
@@
-86,8
+91,8
@@
static void create_hierarchy(routing_component_t current_comp,
void jedule_setup_platform() {
void jedule_setup_platform() {
-
routing_component
_t root_comp;
- e_surf_network_element_type_t type;
+
AS
_t root_comp;
+
//
e_surf_network_element_type_t type;
jed_simgrid_container_t root_container;
jed_simgrid_container_t root_container;
@@
-95,10
+100,10
@@
void jedule_setup_platform() {
jed_create_jedule(&jedule);
root_comp = global_routing->root;
jed_create_jedule(&jedule);
root_comp = global_routing->root;
-
printf
("root name %s\n", root_comp->name);
+
XBT_DEBUG
("root name %s\n", root_comp->name);
// that doesn't work
// that doesn't work
- type = root_comp->get_network_element_type(root_comp->name);
+
//
type = root_comp->get_network_element_type(root_comp->name);
jed_simgrid_create_container(&root_container, root_comp->name);
jedule->root_container = root_container;
jed_simgrid_create_container(&root_container, root_comp->name);
jedule->root_container = root_container;
@@
-115,12
+120,20
@@
void jedule_sd_cleanup() {
void jedule_sd_init() {
void jedule_sd_init() {
+ XBT_LOG_CONNECT(jed_sd, jedule);
+
jedule_init_output();
}
void jedule_sd_dump() {
jedule_init_output();
}
void jedule_sd_dump() {
+ FILE *fh;
+
+ fh = fopen("simgrid.jed", "w");
+
+ write_jedule_output(fh, jedule, jedule_event_list, NULL);
+
+ fclose(fh);
- write_jedule_output(stdout, jedule, jedule_event_list, NULL);
}
#endif
}
#endif