X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c81b88b7af71898176fabb4177118edfc3a70c22..3be198601dc7795688cc8f464cc7a69d5e6e5f53:/src/xbt/xbt_rl_synchro.c

diff --git a/src/xbt/xbt_rl_synchro.c b/src/xbt/xbt_rl_synchro.c
index 1f42eeaf25..3aaca7d125 100644
--- a/src/xbt/xbt_rl_synchro.c
+++ b/src/xbt/xbt_rl_synchro.c
@@ -20,34 +20,49 @@
 #include "xbt/xbt_os_thread.h" /* The implementation we use */
 
 /* the implementation would be cleaner (and faster) with ELF symbol aliasing */
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync_rl,xbt,"Synchronization mechanism (RL)");
+
+typedef struct s_xbt_thread_ {   
+   xbt_os_thread_t os_thread;
+   void_f_pvoid_t *code;
+   void *userparam;   
+}s_xbt_thread_t;
+
+static void *xbt_thread_create_wrapper(void *p)  {   
+   xbt_thread_t t = (xbt_thread_t)p;
+   DEBUG1("I'm thread %p",p);
+   (*t->code)(t->userparam);
+   return NULL;
+}
 
 
-struct xbt_thread_ {
-   /* KEEP IT IN SYNC WITH xbt_os_thread (both win and lin parts) */
-#ifdef HAVE_PTHREAD_H
-   pthread_t t;
-   void *param;
-   pvoid_f_pvoid_t *start_routine;
-#elif defined(WIN32)
-   HANDLE handle;                  /* the win thread handle        */
-   unsigned long id;               /* the win thread id            */
-   pvoid_f_pvoid_t *start_routine;
-   void* param;
-#endif
-};
+xbt_thread_t xbt_thread_create(const char*name,void_f_pvoid_t* code, void* param) {
+
+   xbt_thread_t res = xbt_new0(s_xbt_thread_t,1);
+   res->userparam = param;
+   res->code = code;
+   DEBUG1("Create thread %p",res);
+   res->os_thread = xbt_os_thread_create(name,xbt_thread_create_wrapper,res);
+   return res;
+}
 
-xbt_thread_t xbt_thread_create(pvoid_f_pvoid_t start_routine,
-			       void* param)  {
-   return (xbt_thread_t)xbt_os_thread_create(start_routine,param);
+const char* xbt_thread_name(xbt_thread_t t) {
+   return xbt_os_thread_name(t->os_thread);
+}
+
+const char* xbt_thread_self_name(void) {
+   return xbt_os_thread_self_name();
 }
 
 void 
-xbt_thread_join(xbt_thread_t thread,void ** thread_return) {
-   xbt_os_thread_join( (xbt_os_thread_t)thread, thread_return );
+xbt_thread_join(xbt_thread_t thread) {
+   DEBUG1("Join thread %p",thread);
+   xbt_os_thread_join( thread->os_thread, NULL );
 }		       
 
-void xbt_thread_exit(int *retval) {
-   xbt_os_thread_exit( retval );
+void xbt_thread_exit() {
+   DEBUG0("Thread exits");
+   xbt_os_thread_exit(NULL);
 }
 
 xbt_thread_t xbt_thread_self(void) {
@@ -55,8 +70,13 @@ xbt_thread_t xbt_thread_self(void) {
 }
 
 void xbt_thread_yield(void) {
+   DEBUG0("Thread yields");
    xbt_os_thread_yield();
 }
+void xbt_thread_cancel(xbt_thread_t t) {
+   DEBUG1("Cancel thread %p",t);
+   xbt_os_thread_cancel(t->os_thread);
+}
 /****** mutex related functions ******/
 struct xbt_mutex_ {
    /* KEEP IT IN SYNC WITH OS IMPLEMENTATION (both win and lin) */
@@ -68,18 +88,23 @@ struct xbt_mutex_ {
 };
 
 xbt_mutex_t xbt_mutex_init(void) {
-   return (xbt_mutex_t)xbt_os_mutex_init();
+   xbt_mutex_t res = (xbt_mutex_t)xbt_os_mutex_init();
+   DEBUG1("Create mutex %p", res);
+   return res;
 }
 
 void xbt_mutex_lock(xbt_mutex_t mutex) {
+   DEBUG1("Lock mutex %p", mutex);
    xbt_os_mutex_lock( (xbt_os_mutex_t)mutex );
 }
 
 void xbt_mutex_unlock(xbt_mutex_t mutex) {
+   DEBUG1("Unlock mutex %p", mutex);
    xbt_os_mutex_unlock( (xbt_os_mutex_t)mutex );
 }
 
 void xbt_mutex_destroy(xbt_mutex_t mutex) {
+   DEBUG1("Destroy mutex %p", mutex);
    xbt_os_mutex_destroy( (xbt_os_mutex_t)mutex );
 }
 
@@ -105,20 +130,32 @@ typedef struct xbt_cond_ {
 } s_xbt_cond_t;
 
 xbt_cond_t xbt_cond_init(void) {
+   xbt_cond_t res = (xbt_cond_t) xbt_os_cond_init();
+   DEBUG1("Create cond %p", res);
    return (xbt_cond_t) xbt_os_cond_init();
 }
 
 void xbt_cond_wait(xbt_cond_t cond, xbt_mutex_t mutex) {
+   DEBUG2("Wait cond %p, mutex %p", cond, mutex);
    xbt_os_cond_wait( (xbt_os_cond_t)cond, (xbt_os_mutex_t)mutex );
 }
 
+void xbt_cond_timedwait(xbt_cond_t cond, xbt_mutex_t mutex, double delay) {
+   DEBUG3("Wait cond %p, mutex %p for %f sec", cond, mutex,delay);
+   xbt_os_cond_timedwait( (xbt_os_cond_t)cond, (xbt_os_mutex_t)mutex, delay );
+   DEBUG3("Done waiting cond %p, mutex %p for %f sec", cond, mutex, delay);
+}
+
 void xbt_cond_signal(xbt_cond_t cond) {
+   DEBUG1("Signal cond %p", cond);
    xbt_os_cond_signal( (xbt_os_cond_t)cond );
 }
 	 
 void xbt_cond_broadcast(xbt_cond_t cond){
+   DEBUG1("Broadcast cond %p", cond);
    xbt_os_cond_broadcast( (xbt_os_cond_t)cond );
 }
 void xbt_cond_destroy(xbt_cond_t cond){
+   DEBUG1("Destroy cond %p", cond);
    xbt_os_cond_destroy( (xbt_os_cond_t)cond );
 }