A distraction, the SIMIX_process_create() function takes only six parameters.

[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 3788d37..bc80b82 100644 (file)
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_sg_synchro.c
@@ -23,9 +23,9 @@
 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;
+   void *father_data;
 } s_xbt_thread_t;
 
 static int xbt_thread_create_wrapper(int argc, char *argv[]) {
@@ -35,7 +35,7 @@ static int xbt_thread_create_wrapper(int argc, char *argv[]) {
    return 0;
 }
 
-xbt_thread_t xbt_thread_create(const char*name,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;
@@ -45,11 +45,21 @@ xbt_thread_t xbt_thread_create(const char*name,void_f_pvoid_t* code, void* param
    res->s_process = SIMIX_process_create(name, 
                                         xbt_thread_create_wrapper, res,
                                         SIMIX_host_get_name(SIMIX_host_self()),
-                                        0, NULL);
+                                        0,/*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) {
+   xbt_thread_t me = xbt_thread_self();
+   return me ? me->name : "maestro";
+}
+
+
 void 
 xbt_thread_join(xbt_thread_t thread) {
    THROW_UNIMPLEMENTED; /* FIXME */
@@ -68,7 +78,8 @@ void xbt_thread_exit() {
 }
 
 xbt_thread_t xbt_thread_self(void) {
-   return SIMIX_process_get_data(SIMIX_process_self());
+   smx_process_t p = SIMIX_process_self();
+   return p ? SIMIX_process_get_data(p) : NULL;
 }
 
 void xbt_thread_yield(void) {
@@ -89,11 +100,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 );
 }