X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..3676269c65359df0174fd13b6c11687992437df8:/src/xbt/xbt_sg_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index df45b81fa4..f0f87efa7e 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -11,11 +11,8 @@
 
 #include "xbt/ex.h"
 
-#include "xbt/synchro.h"        /* This module */
-
-#include "simix/simix.h"        /* used implementation */
-#include "simix/datatypes.h"
-#include "../simix/private.h" /* FIXME */
+#include "simgrid/simix.h"        /* used implementation */
+#include "../simix/smx_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
                                 "Synchronization mechanism");
@@ -29,7 +26,7 @@ typedef struct s_xbt_thread_ {
   void *userparam;
   void *father_data;
   /* stuff to allow other people to wait on me with xbt_thread_join */
-  int joinable:1, done:1;
+  unsigned joinable:1, done:1;
   xbt_cond_t cond;
   xbt_mutex_t mutex;
 } s_xbt_thread_t;
@@ -39,7 +36,7 @@ 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(self);
-  SIMIX_req_process_set_data(self, t->father_data);
+  simcall_process_set_data(self, t->father_data);
   t->code(t->userparam);
   if (t->joinable) {
     t->done = 1;
@@ -64,10 +61,10 @@ xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
   res->code = code;
   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,
+  simcall_process_create(&res->s_process, name,
                            xbt_thread_create_wrapper, res,
-                           SIMIX_host_self_get_name(), 0, NULL,
-                           /*props */ NULL);
+                           SIMIX_host_self_get_name(), -1.0, 0, NULL,
+                           /*props */ NULL,0);
   res->joinable = joinable;
   res->done = 0;
   res->cond = xbt_cond_init();
@@ -107,14 +104,14 @@ void xbt_thread_join(xbt_thread_t thread)
 
 void xbt_thread_cancel(xbt_thread_t thread)
 {
-  SIMIX_req_process_kill(thread->s_process);
+  simcall_process_kill(thread->s_process);
   free(thread->name);
   free(thread);
 }
 
 void xbt_thread_exit()
 {
-  SIMIX_req_process_kill(SIMIX_process_self());
+  simcall_process_kill(SIMIX_process_self());
 }
 
 xbt_thread_t xbt_thread_self(void)
@@ -134,22 +131,22 @@ struct s_xbt_mutex_ {
 
 xbt_mutex_t xbt_mutex_init(void)
 {
-  return (xbt_mutex_t) SIMIX_req_mutex_init();
+  return (xbt_mutex_t) simcall_mutex_init();
 }
 
 void xbt_mutex_acquire(xbt_mutex_t mutex)
 {
-  SIMIX_req_mutex_lock((smx_mutex_t) mutex);
+  simcall_mutex_lock((smx_mutex_t) mutex);
 }
 
 void xbt_mutex_release(xbt_mutex_t mutex)
 {
-  SIMIX_req_mutex_unlock((smx_mutex_t) mutex);
+  simcall_mutex_unlock((smx_mutex_t) mutex);
 }
 
 void xbt_mutex_destroy(xbt_mutex_t mutex)
 {
-  SIMIX_req_mutex_destroy((smx_mutex_t) mutex);
+  simcall_mutex_destroy((smx_mutex_t) mutex);
 }
 
 /***** condition related functions *****/
@@ -159,30 +156,30 @@ struct s_xbt_cond_ {
 
 xbt_cond_t xbt_cond_init(void)
 {
-  return (xbt_cond_t) SIMIX_req_cond_init();
+  return (xbt_cond_t) simcall_cond_init();
 }
 
 void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex)
 {
-  SIMIX_req_cond_wait((smx_cond_t) cond, (smx_mutex_t) mutex);
+  simcall_cond_wait((smx_cond_t) cond, (smx_mutex_t) mutex);
 }
 
 void xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay)
 {
-  SIMIX_req_cond_wait_timeout((smx_cond_t) cond, (smx_mutex_t) mutex, delay);
+  simcall_cond_wait_timeout((smx_cond_t) cond, (smx_mutex_t) mutex, delay);
 }
 
 void xbt_cond_signal(xbt_cond_t cond)
 {
-  SIMIX_req_cond_signal((smx_cond_t) cond);
+  simcall_cond_signal((smx_cond_t) cond);
 }
 
 void xbt_cond_broadcast(xbt_cond_t cond)
 {
-  SIMIX_req_cond_broadcast((smx_cond_t) cond);
+  simcall_cond_broadcast((smx_cond_t) cond);
 }
 
 void xbt_cond_destroy(xbt_cond_t cond)
 {
-  SIMIX_req_cond_destroy((smx_cond_t) cond);
+  simcall_cond_destroy((smx_cond_t) cond);
 }