try to fix build with jedule/latency bound

diff --git a/include/simgrid/jedule/jedule_events.h b/include/simgrid/jedule/jedule_events.h
index b5e6dbc..d3132c5 100644 (file)
--- a/include/simgrid/jedule/jedule_events.h
+++ b/include/simgrid/jedule/jedule_events.h
@@ -12,7 +12,7 @@
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
 

-#include "instr/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_platform.h"

 
 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE

diff --git a/include/simgrid/jedule/jedule_sd_binding.h b/include/simgrid/jedule/jedule_sd_binding.h
index 1c244c3..9803c5c 100644 (file)
--- a/include/simgrid/jedule/jedule_sd_binding.h
+++ b/include/simgrid/jedule/jedule_sd_binding.h
@@ -12,17 +12,17 @@
 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

-void jedule_log_sd_event(SD_task_t task);
+XBT_PUBLIC(void) jedule_log_sd_event(SD_task_t task);

 
 

-void jedule_setup_platform(void);
+XBT_PUBLIC(void) jedule_setup_platform(void);

 
 

-void jedule_sd_init(void);
+XBT_PUBLIC(void) jedule_sd_init(void);

 
 

-void jedule_sd_cleanup(void);
+XBT_PUBLIC(void) jedule_sd_cleanup(void);

 
 

-void jedule_sd_exit(void);
+XBT_PUBLIC(void) jedule_sd_exit(void);

 
 

-void jedule_sd_dump(void);
+XBT_PUBLIC(void) jedule_sd_dump(void);

 
 #endif /* JEDULE_SD_BINDING_H_ */
 
 
 #endif /* JEDULE_SD_BINDING_H_ */
 

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 6a66212..47e937a 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -465,7 +465,7 @@ typedef struct s_instr_extra_data {
 SG_END_DECL()
 
 #ifdef HAVE_JEDULE
 SG_END_DECL()
 
 #ifdef HAVE_JEDULE

-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"

 #endif
 
 #endif /* INSTR_PRIVATE_H_ */
 #endif
 
 #endif /* INSTR_PRIVATE_H_ */

diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.c
index 07a5dca..12572e3 100644 (file)
--- a/src/instr/jedule/jedule_events.c
+++ b/src/instr/jedule/jedule_events.c
@@ -12,8 +12,8 @@
 #include "xbt/dynar.h"
 #include "xbt/asserts.h"
 
 #include "xbt/dynar.h"
 #include "xbt/asserts.h"
 

-#include "instr/jedule/jedule_events.h"
-#include "instr/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_events.h"
+#include "simgrid/jedule/jedule_platform.h"

 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

diff --git a/src/instr/jedule/jedule_output.c b/src/instr/jedule/jedule_output.c
index aa286e5..67f15ec 100644 (file)
--- a/src/instr/jedule/jedule_output.c
+++ b/src/instr/jedule/jedule_output.c
@@ -11,7 +11,7 @@
 #include "xbt/dynar.h"
 #include "xbt/asserts.h"
 
 #include "xbt/dynar.h"
 #include "xbt/asserts.h"
 

-#include "instr/jedule/jedule_output.h"
+#include "simgrid/jedule/jedule_output.h"

 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.c
index e5593f3..08fd7e7 100644 (file)
--- a/src/instr/jedule/jedule_platform.c
+++ b/src/instr/jedule/jedule_platform.c
@@ -9,7 +9,7 @@
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 

-#include "instr/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_platform.h"

 
 #ifdef HAVE_JEDULE
 
 
 #ifdef HAVE_JEDULE
 

diff --git a/src/instr/jedule/jedule_sd_binding.c b/src/instr/jedule/jedule_sd_binding.c
index bfd0258..2958a8b 100644 (file)
--- a/src/instr/jedule/jedule_sd_binding.c
+++ b/src/instr/jedule/jedule_sd_binding.c
@@ -7,16 +7,16 @@
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 

-#include "surf/surf_private.h"
-#include "surf/surf_resource.h"
+#include "src/surf/surf_private.h"

 #include "surf/surf.h"
 
 #include "surf/surf.h"
 

-#include "instr/jedule/jedule_sd_binding.h"
-#include "instr/jedule/jedule_events.h"
-#include "instr/jedule/jedule_platform.h"
-#include "instr/jedule/jedule_output.h"
+#include "simgrid/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_events.h"
+#include "simgrid/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_output.h"

 
 

-#include "simdag/private.h"
+#include "simgrid/simdag.h"
+#include "src/simdag/simdag_private.h"

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -39,7 +39,7 @@ 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 = sg_host_name(task->workstation_list[i]);
+    const char *hostname = sg_host_get_name(task->workstation_list[i]);

     xbt_dynar_push(host_list, &hostname);
   }
 
     xbt_dynar_push(host_list, &hostname);
   }
 


@@ -74,7 +74,7 @@ static void create_hierarchy(AS_t current_comp,
     hosts = xbt_dynar_new(sizeof(char*), NULL);
 
     xbt_dynar_foreach(table, dynar_cursor, host_elem) {
     hosts = xbt_dynar_new(sizeof(char*), NULL);
 
     xbt_dynar_foreach(table, dynar_cursor, host_elem) {

-      xbt_dynar_push_as(hosts, char*, sg_host_name(host_elem));
+      xbt_dynar_push_as(hosts, const char*, sg_host_get_name(host_elem));

     }
 
     jed_simgrid_add_resources(current_container, hosts);
     }
 
     jed_simgrid_add_resources(current_container, hosts);

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 389d9f5..6fe06bd 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef HAVE_JEDULE
 #endif
 
 #ifdef HAVE_JEDULE

-#include "instr/jedule/jedule_sd_binding.h"
+#include "simgrid/jedule/jedule_sd_binding.h"

 #endif
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
 #endif
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 69dd67f..e627079 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -419,7 +419,7 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 double surf_network_action_get_latency_limited(surf_action_t action) {
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 double surf_network_action_get_latency_limited(surf_action_t action) {

-  return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+  return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();

 }
 #endif
 
 }
 #endif