convert Jedule bindings to C++

diff --git a/include/simgrid/jedule/jedule_events.h b/include/simgrid/jedule/jedule_events.h
index d3132c5..1e6a87b 100644 (file)
--- a/include/simgrid/jedule/jedule_events.h
+++ b/include/simgrid/jedule/jedule_events.h
@@ -17,6 +17,8 @@
 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

+SG_BEGIN_DECL()
+

 struct jed_event {
   int event_id;
   char *name;
 struct jed_event {
   int event_id;
   char *name;


@@ -42,6 +44,8 @@ void jed_event_add_characteristic(jed_event_t event, char *characteristic);
 
 void jed_event_add_info(jed_event_t event, char *key, char *value);
 
 
 void jed_event_add_info(jed_event_t event, char *key, char *value);
 

+SG_END_DECL()
+

 #endif
 
 #endif /* JEDULE_EVENTS_H_ */
 #endif
 
 #endif /* JEDULE_EVENTS_H_ */

diff --git a/include/simgrid/jedule/jedule_output.h b/include/simgrid/jedule/jedule_output.h
index 60ae564..6a4a148 100644 (file)
--- a/include/simgrid/jedule/jedule_output.h
+++ b/include/simgrid/jedule/jedule_output.h
@@ -16,6 +16,8 @@
 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

+SG_BEGIN_DECL()
+

 extern xbt_dynar_t jedule_event_list;
 
 void jedule_init_output(void);
 extern xbt_dynar_t jedule_event_list;
 
 void jedule_init_output(void);


@@ -27,6 +29,8 @@ void jedule_store_event(jed_event_t event);
 void write_jedule_output(FILE *file, jedule_t jedule,
     xbt_dynar_t event_list, xbt_dict_t meta_info_dict);
 
 void write_jedule_output(FILE *file, jedule_t jedule,
     xbt_dynar_t event_list, xbt_dict_t meta_info_dict);
 

+SG_END_DECL()
+

 #endif
 
 #endif /* JEDULE_OUTPUT_H_ */
 #endif
 
 #endif /* JEDULE_OUTPUT_H_ */

diff --git a/include/simgrid/jedule/jedule_platform.h b/include/simgrid/jedule/jedule_platform.h
index aac8597..f74ddf6 100644 (file)
--- a/include/simgrid/jedule/jedule_platform.h
+++ b/include/simgrid/jedule/jedule_platform.h
@@ -14,6 +14,8 @@
 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

+SG_BEGIN_DECL()
+

 typedef struct jed_simgrid_container s_jed_simgrid_container_t,
     *jed_simgrid_container_t;
 
 typedef struct jed_simgrid_container s_jed_simgrid_container_t,
     *jed_simgrid_container_t;
 


@@ -90,6 +92,8 @@ void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
 
 */
 
 
 */
 

+SG_END_DECL()
+

 #endif
 
 
 #endif
 
 

diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.cpp
similarity index 100%
rename from src/instr/jedule/jedule_events.c
rename to src/instr/jedule/jedule_events.cpp

diff --git a/src/instr/jedule/jedule_output.c b/src/instr/jedule/jedule_output.cpp
similarity index 99%
rename from src/instr/jedule/jedule_output.c
rename to src/instr/jedule/jedule_output.cpp
index b8195cd..1bac445 100644 (file)
--- a/src/instr/jedule/jedule_output.c
+++ b/src/instr/jedule/jedule_output.cpp
@@ -78,7 +78,7 @@ static void get_hierarchy_string(jed_simgrid_container_t container,
     xbt_dynar_t hier_list;
     unsigned int iter;
     int number;
     xbt_dynar_t hier_list;
     unsigned int iter;
     int number;

-    int length;
+    unsigned int length;

     
     outbuf[0] = '\0';
     hier_list = xbt_dynar_new(sizeof(int), NULL);
     
     outbuf[0] = '\0';
     hier_list = xbt_dynar_new(sizeof(int), NULL);


@@ -127,7 +127,7 @@ static void print_container(jed_simgrid_container_t container) {
 }
 
 static void print_resources(jed_simgrid_container_t resource_parent) {
 }
 
 static void print_resources(jed_simgrid_container_t resource_parent) {

-  int res_nb;
+  unsigned int res_nb;

   unsigned int i;
   char *res_name;
     char resid[1024];
   unsigned int i;
   char *res_name;
     char resid[1024];

diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.cpp
similarity index 93%
rename from src/instr/jedule/jedule_platform.c
rename to src/instr/jedule/jedule_platform.cpp
index 08fd7e7..312b06f 100644 (file)
--- a/src/instr/jedule/jedule_platform.c
+++ b/src/instr/jedule/jedule_platform.cpp
@@ -153,8 +153,8 @@ static void add_subsets_to(xbt_dynar_t subset_list, xbt_dynar_t hostgroup,
   xbt_dynar_foreach(hostgroup, iter, host_name) {
     jed_simgrid_container_t parent;
     xbt_assert( host_name != NULL );
   xbt_dynar_foreach(hostgroup, iter, host_name) {
     jed_simgrid_container_t parent;
     xbt_assert( host_name != NULL );

-    parent = xbt_dict_get(host2_simgrid_parent_container, host_name);
-    id_str = xbt_dict_get(parent->name2id, host_name);
+    parent = (jed_simgrid_container_t)xbt_dict_get(host2_simgrid_parent_container, host_name);
+    id_str = (char*)xbt_dict_get(parent->name2id, host_name);

     xbt_dynar_push(id_list, &id_str);
   }
 
     xbt_dynar_push(id_list, &id_str);
   }
 


@@ -215,15 +215,12 @@ void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
   //  group by parent container
 
   xbt_dynar_foreach(host_names, iter, host_name) {
   //  group by parent container
 
   xbt_dynar_foreach(host_names, iter, host_name) {

-    jed_simgrid_container_t parent;
-    xbt_dynar_t hostgroup;
-

     //printf("checking %s \n", host_name);
 
     //printf("checking %s \n", host_name);
 

-    parent = xbt_dict_get(host2_simgrid_parent_container, host_name);
+    jed_simgrid_container_t parent = (jed_simgrid_container_t)xbt_dict_get(host2_simgrid_parent_container, host_name);

     xbt_assert( parent != NULL );
 
     xbt_assert( parent != NULL );
 

-    hostgroup = xbt_dict_get_or_null (parent2hostgroup, parent->name);
+    xbt_dynar_t hostgroup = (xbt_dynar_t)xbt_dict_get_or_null (parent2hostgroup, parent->name);

     if( hostgroup == NULL ) {
       hostgroup = xbt_dynar_new(sizeof(char*), NULL);
       xbt_dict_set(parent2hostgroup, parent->name, hostgroup, NULL);
     if( hostgroup == NULL ) {
       hostgroup = xbt_dynar_new(sizeof(char*), NULL);
       xbt_dict_set(parent2hostgroup, parent->name, hostgroup, NULL);


@@ -239,7 +236,7 @@ void jed_simgrid_get_resource_selection_by_hosts(xbt_dynar_t subset_list,
     jed_simgrid_container_t parent;
 
     xbt_dict_foreach(parent2hostgroup,cursor,parent_name,hostgroup) {
     jed_simgrid_container_t parent;
 
     xbt_dict_foreach(parent2hostgroup,cursor,parent_name,hostgroup) {

-      parent = xbt_dict_get(container_name2container, parent_name);
+      parent = (jed_simgrid_container_t)xbt_dict_get(container_name2container, parent_name);

       // printf("subset parent >>> %s\n", parent->name);
       add_subsets_to(subset_list, hostgroup, parent);
     }
       // printf("subset parent >>> %s\n", parent->name);
       add_subsets_to(subset_list, hostgroup, parent);
     }

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.cpp
similarity index 100%
rename from src/instr/jedule/jedule_sd_binding.c
rename to src/instr/jedule/jedule_sd_binding.cpp

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 9351cf5..d7e8133 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -548,10 +548,10 @@ set(JEDULE_SRC
   include/simgrid/jedule/jedule_output.h
   include/simgrid/jedule/jedule_platform.h
   include/simgrid/jedule/jedule_sd_binding.h
   include/simgrid/jedule/jedule_output.h
   include/simgrid/jedule/jedule_platform.h
   include/simgrid/jedule/jedule_sd_binding.h

-  src/instr/jedule/jedule_events.c
-  src/instr/jedule/jedule_output.c
-  src/instr/jedule/jedule_platform.c
-  src/instr/jedule/jedule_sd_binding.c
+  src/instr/jedule/jedule_events.cpp
+  src/instr/jedule/jedule_output.cpp
+  src/instr/jedule/jedule_platform.cpp
+  src/instr/jedule/jedule_sd_binding.cpp

   )
 
 set(MC_SRC_BASE
   )
 
 set(MC_SRC_BASE