|
|
@@ -1,6 +1,6 @@
|
|
|
/* StarPU --- Runtime system for heterogeneous multicore architectures.
|
|
|
*
|
|
|
- * Copyright (C) 2010, 2012-2016 Université de Bordeaux
|
|
|
+ * Copyright (C) 2010, 2012-2017 Université de Bordeaux
|
|
|
* Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016 CNRS
|
|
|
*
|
|
|
* StarPU is free software; you can redistribute it and/or modify
|
|
|
@@ -68,9 +68,8 @@ int starpu_pthread_create(starpu_pthread_t *thread, const starpu_pthread_attr_t
|
|
|
|
|
|
int starpu_pthread_join(starpu_pthread_t thread STARPU_ATTRIBUTE_UNUSED, void **retval STARPU_ATTRIBUTE_UNUSED)
|
|
|
{
|
|
|
-#if 0 //def HAVE_MSG_PROCESS_JOIN
|
|
|
- /* https://gforge.inria.fr/tracker/index.php?func=detail&aid=13601&group_id=12&atid=165 */
|
|
|
- MSG_process_join(thread, 100);
|
|
|
+#if SIMGRID_VERSION_MAJOR > 3 || (SIMGRID_VERSION_MAJOR == 3 && SIMGRID_VERSION_MINOR >= 14)
|
|
|
+ MSG_process_join(thread, 1000000);
|
|
|
#else
|
|
|
MSG_process_sleep(1);
|
|
|
#endif
|
