/* the implementation would be cleaner (and faster) with ELF symbol aliasing */
typedef struct s_xbt_thread_ {
- /* KEEP IT IN SYNC WITH s_smx_process_ from src/include/simix/datatypes.h */
- char *name; /**< @brief process name if any */
- smx_simdata_process_t simdata; /**< @brief simulator data */
- s_xbt_swag_hookup_t process_hookup;
- s_xbt_swag_hookup_t synchro_hookup;
- s_xbt_swag_hookup_t host_proc_hookup;
- void *data; /**< @brief user data */
- /* KEEP IT IN SYNC WITH s_smx_process_ from src/include/simix/datatypes.h */
+ char *name;
+ smx_process_t s_process;
+ void_f_pvoid_t code;
+ void *userparam;
+ void *father_data;
} s_xbt_thread_t;
-xbt_thread_t xbt_thread_create(pvoid_f_pvoid_t start_routine, void* param) {
- THROW_UNIMPLEMENTED; /* FIXME */
+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(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->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,/*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,void ** thread_return) {
+xbt_thread_join(xbt_thread_t thread) {
THROW_UNIMPLEMENTED; /* FIXME */
}
-void xbt_thread_exit(int *retval) {
- THROW_UNIMPLEMENTED; /* FIXME */
+void
+xbt_thread_cancel(xbt_thread_t thread) {
+ SIMIX_process_kill(thread->s_process);
+ free(thread);
+}
+
+void xbt_thread_exit() {
+ xbt_thread_t me=SIMIX_process_get_data(SIMIX_process_self());
+ SIMIX_process_kill(me->s_process);
+ free(me);
}
xbt_thread_t xbt_thread_self(void) {
- THROW_UNIMPLEMENTED; /* FIXME */
+ smx_process_t p = SIMIX_process_self();
+ return p ? SIMIX_process_get_data(p) : NULL;
}
void xbt_thread_yield(void) {
THROW_UNIMPLEMENTED; /* FIXME */
}
+
/****** mutex related functions ******/
struct s_xbt_mutex_ {
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 );
}