Procházet zdrojové kódy

Fix using simgrid_get_clock

Samuel Thibault před 5 roky
rodič
revize
b14b294d78
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1 1
      configure.ac
  2. 2 2
      src/common/timing.c

+ 1 - 1
configure.ac

@@ -185,7 +185,7 @@ if test x$enable_simgrid = xyes ; then
 	AC_CHECK_FUNCS([MSG_process_attach MSG_zone_get_hosts MSG_process_self_name MSG_process_userdata_init])
 	AC_CHECK_FUNCS([xbt_mutex_try_acquire smpi_process_set_user_data sg_zone_get_by_name sg_link_name sg_host_route sg_host_self sg_host_speed simcall_process_create sg_config_continue_after_help])
 	AC_CHECK_FUNCS([xbt_barrier_init], [AC_DEFINE([STARPU_SIMGRID_HAVE_XBT_BARRIER_INIT], [1], [Define to 1 if you have the `xbt_barrier_init' function.])])
-	AC_CHECK_FUNCS([sg_actor_sleep_for sg_actor_self sg_host_get_properties])
+	AC_CHECK_FUNCS([sg_actor_sleep_for sg_actor_self sg_host_get_properties simgrid_get_clock])
 	AC_CHECK_DECLS([smpi_process_set_user_data], [], [], [[#include <smpi/smpi.h>]])
 
 	# Oldies for compatibility with older simgrid

+ 2 - 2
src/common/timing.c

@@ -40,7 +40,7 @@ void _starpu_timing_init(void)
 
 void _starpu_clock_gettime(struct timespec *ts)
 {
-#ifdef HAVE_SIMGRID_ENGINE_H
+#ifdef HAVE_SIMGRID_GET_CLOCK
 	double now = simgrid_get_clock();
 #else
 	double now = MSG_get_clock();
@@ -253,7 +253,7 @@ double starpu_timing_timespec_to_us(struct timespec *ts)
 double starpu_timing_now(void)
 {
 #ifdef STARPU_SIMGRID
-#  ifdef HAVE_SIMGRID_ENGINE_H
+#  ifdef HAVE_SIMGRID_GET_CLOCK
 	return simgrid_get_clock()*1000000;
 #  else
 	return MSG_get_clock()*1000000;