X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7166ae6c85f79709c2d6dedb68b0c39af3222857..504b4d20dd2db9ea1eaa9c4b390b2a412d7c9779:/src/xbt/xbt_sg_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_sg_synchro.c
index bf28586441..306436d45c 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -21,28 +21,44 @@
 /* the implementation would be cleaner (and faster) with ELF symbol aliasing */
 
 typedef struct s_xbt_thread_ {
+   char *name;
    smx_process_t s_process;
-   void_f_pvoid_t *code;
+   void_f_pvoid_t code;
    void *userparam;
+	 void *father_data;
 } s_xbt_thread_t;
 
 static int xbt_thread_create_wrapper(int argc, char *argv[]) {
    xbt_thread_t t = (xbt_thread_t)SIMIX_process_get_data(SIMIX_process_self());
+	 SIMIX_process_set_data(SIMIX_process_self(),t->father_data);
    (*t->code)(t->userparam);
    return 0;
 }
 
-xbt_thread_t xbt_thread_create(void_f_pvoid_t* code, void* param)  {
+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->name = xbt_strdup(name);
    res->userparam = param;
    res->code = code;
-   res->s_process = SIMIX_process_create(NULL, 
+   res->father_data = SIMIX_process_get_data(SIMIX_process_self());
+//   char*name = bprintf("%s#%p",SIMIX_process_get_name(SIMIX_process_self()), param);
+   res->s_process = SIMIX_process_create(name, 
 					 xbt_thread_create_wrapper, res,
 					 SIMIX_host_get_name(SIMIX_host_self()),
-					 0, NULL);
+					 0, NULL,/*props*/NULL);
+//   free(name);
    return res;
 }
 
+const char* xbt_thread_name(xbt_thread_t t) {
+   return t->name;
+}
+
+const char* xbt_thread_self_name(void) {
+   return xbt_thread_self()->name;
+}
+
+
 void 
 xbt_thread_join(xbt_thread_t thread) {
    THROW_UNIMPLEMENTED; /* FIXME */
@@ -82,11 +98,11 @@ xbt_mutex_t xbt_mutex_init(void) {
    return (xbt_mutex_t)SIMIX_mutex_init();
 }
 
-void xbt_mutex_lock(xbt_mutex_t mutex) {
+void xbt_mutex_acquire(xbt_mutex_t mutex) {
    SIMIX_mutex_lock( (smx_mutex_t)mutex) ;
 }
 
-void xbt_mutex_unlock(xbt_mutex_t mutex) {
+void xbt_mutex_release(xbt_mutex_t mutex) {
    SIMIX_mutex_unlock( (smx_mutex_t)mutex );
 }