Rename SIMIX files

[simgrid.git] / src / xbt / xbt_sg_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index ec377f6..cddfce7 100644 (file)
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -15,7 +15,7 @@
 
 #include "simix/simix.h"        /* used implementation */
 #include "simix/datatypes.h"
-#include "../simix/private.h" /* FIXME */
+#include "../simix/smx_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
                                 "Synchronization mechanism");
@@ -36,10 +36,11 @@ typedef struct s_xbt_thread_ {
 
 static int xbt_thread_create_wrapper(int argc, char *argv[])
 {
+  smx_process_t self = SIMIX_process_self();
   xbt_thread_t t =
-      (xbt_thread_t) SIMIX_process_self_get_data();
-  SIMIX_req_process_set_data(SIMIX_process_self(), t->father_data);
-  (*t->code) (t->userparam);
+      (xbt_thread_t) SIMIX_process_self_get_data(self);
+  SIMIX_req_process_set_data(self, t->father_data);
+  t->code(t->userparam);
   if (t->joinable) {
     t->done = 1;
     xbt_mutex_acquire(t->mutex);
@@ -61,7 +62,7 @@ xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
   res->name = xbt_strdup(name);
   res->userparam = param;
   res->code = code;
-  res->father_data = SIMIX_process_self_get_data();
+  res->father_data = SIMIX_process_self_get_data(SIMIX_process_self());
   /*   char*name = bprintf("%s#%p",SIMIX_process_self_get_name(), param); */
   SIMIX_req_process_create(&res->s_process, name,
                            xbt_thread_create_wrapper, res,
@@ -90,7 +91,7 @@ const char *xbt_thread_self_name(void)
 void xbt_thread_join(xbt_thread_t thread)
 {
   xbt_mutex_acquire(thread->mutex);
-  xbt_assert1(thread->joinable,
+  xbt_assert(thread->joinable,
               "Cannot join on %p: wasn't created joinable", thread);
   if (!thread->done) {
     xbt_cond_wait(thread->cond, thread->mutex);
@@ -118,12 +119,12 @@ void xbt_thread_exit()
 
 xbt_thread_t xbt_thread_self(void)
 {
-  return SIMIX_process_self_get_data();
+  return SIMIX_process_self_get_data(SIMIX_process_self());
 }
 
 void xbt_thread_yield(void)
 {
-  SIMIX_process_yield();
+  SIMIX_process_yield(SIMIX_process_self());
 }
 
 /****** mutex related functions ******/