merge trunk

configure.ac

@@ -1012,7 +1012,7 @@ if test x$enable_simgrid = xyes ; then
 			AC_MSG_ERROR(Simgrid support needs simgrid installed)
 		]
 	)
-   	AC_CHECK_FUNCS([MSG_process_join MSG_get_as_by_name MSG_environment_get_routing_root])
+   	AC_CHECK_FUNCS([MSG_process_join MSG_get_as_by_name MSG_environment_get_routing_root xbt_mutex_try_acquire])
 	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_COMPILE_IFELSE([AC_LANG_PROGRAM(
 		    		[[#include <msg/msg.h>]],

examples/pi/SobolQRNG/sobol_primitives.c

@@ -66,7 +66,7 @@
 const struct primitive sobol_primitives[] =
 {
     /* First dimension is a special case so this entry is actually ignored */
-    {1, 0, 0, 0},
+    {1, 0, 0 },
     {2, 1, 0, {1}},
     {3, 2, 1, {1, 3}},
     {4, 3, 1, {1, 3, 1}},

src/common/thread.c

@@ -134,10 +134,12 @@ int starpu_pthread_mutex_trylock(starpu_pthread_mutex_t *mutex)
 	int ret;
 	_STARPU_TRACE_TRYLOCK_MUTEX();
 
-	/* TODO: use what simgrid will provide some day */
-	/* xbt_mutex_try_acquire(*mutex); */
+#ifdef HAVE_XBT_MUTEX_TRY_ACQUIRE
+	ret = xbt_mutex_try_acquire(*mutex);
+#else
 	ret = simcall_mutex_trylock((smx_mutex_t)*mutex);
-	ret = ret ? 0 : -EBUSY;
+#endif
+	ret = ret ? 0 : EBUSY;
 
 	_STARPU_TRACE_MUTEX_LOCKED();
 

src/common/timing.c

@@ -147,7 +147,7 @@ void _starpu_timing_init(void)
 
 		STARPU_GET_TICK(t1);
 		gettimeofday(&tv1,0);
-		_starpu_sleep(&ts);
+		_starpu_sleep(ts);
 		STARPU_GET_TICK(t2);
 		gettimeofday(&tv2,0);
 		_starpu_scale = ((tv2.tv_sec*1e6 + tv2.tv_usec) -