smx_process_t s_process;
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[]) {
res->s_process = SIMIX_process_create(name,
xbt_thread_create_wrapper, res,
SIMIX_host_get_name(SIMIX_host_self()),
- 0, NULL,/*props*/NULL);
+ 0,NULL,/*props*/NULL);
// free(name);
return res;
}
}
const char* xbt_thread_self_name(void) {
- return xbt_thread_self()->name;
+ xbt_thread_t me = xbt_thread_self();
+ return me ? me->name : "maestro";
}
void
xbt_thread_cancel(xbt_thread_t thread) {
SIMIX_process_kill(thread->s_process);
+ free(thread->name);
free(thread);
}
}
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) {