- Removed unused functions:
- xbt/str.h: xbt_str_split_str(), xbt_str_subst(), xbt_str_ltrim(),
xbt_str_rtrim(), xbt_str_trim().
+ - xbt/xbt_os_thread.h: xbt_os_thread_cancel(), xbt_os_thread_detach().
Misc
- Removed header files obsolete since SimGrid 3.12:
typedef struct xbt_os_thread_ *xbt_os_thread_t;
XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *data);
XBT_PUBLIC(void) xbt_os_thread_exit(int *retcode);
-XBT_PUBLIC(void) xbt_os_thread_detach(xbt_os_thread_t thread);
XBT_PUBLIC(xbt_os_thread_t) xbt_os_thread_self(void);
XBT_PUBLIC(const char *) xbt_os_thread_self_name(void);
/* xbt_os_thread_join frees the joined thread (ie the XBT wrapper around it, the OS frees the rest) */
XBT_PUBLIC(void) xbt_os_thread_join(xbt_os_thread_t thread, void **thread_return);
XBT_PUBLIC(void) xbt_os_thread_yield(void);
-XBT_PUBLIC(void) xbt_os_thread_cancel(xbt_os_thread_t thread);
XBT_PUBLIC(void) xbt_os_thread_setstacksize(int stack_size);
XBT_PUBLIC(void) xbt_os_thread_setguardsize(int guard_size);
XBT_PUBLIC(int) xbt_os_thread_bind(xbt_os_thread_t thread, int core);
typedef struct xbt_os_thread_ {
pthread_t t;
- int detached;
char *name;
void *param;
pvoid_f_pvoid_t start_routine;
free(thread);
}
-/* callback: termination */
-static void _os_thread_ex_terminate(xbt_ex_t * e)
-{
- xbt_ex_display(e);
- xbt_abort();
- /* FIXME: there should be a configuration variable to choose to kill everyone or only this one */
-}
-
void xbt_os_thread_mod_preinit(void)
{
if (thread_mod_inited)
main_thread = xbt_new(s_xbt_os_thread_t, 1);
main_thread->name = NULL;
- main_thread->detached = 0;
main_thread->name = xbt_strdup("main");
main_thread->param = NULL;
main_thread->start_routine = NULL;
int errcode = pthread_setspecific(xbt_self_thread_key, t);
xbt_assert(errcode == 0, "pthread_setspecific failed for xbt_self_thread_key");
- void *res = t->start_routine(t->param);
- if (t->detached)
- xbt_os_thread_free_thread_data(t);
- return res;
+ return t->start_routine(t->param);
}
xbt_os_thread_t xbt_os_thread_create(const char *name, pvoid_f_pvoid_t start_routine, void *param, void *extra_data)
{
xbt_os_thread_t res_thread = xbt_new(s_xbt_os_thread_t, 1);
- res_thread->detached = 0;
res_thread->name = xbt_strdup(name);
res_thread->start_routine = start_routine;
res_thread->param = param;
return pthread_getspecific(key);
}
-void xbt_os_thread_detach(xbt_os_thread_t thread)
-{
- thread->detached = 1;
- pthread_detach(thread->t);
-}
-
#include <sched.h>
void xbt_os_thread_yield(void)
{
sched_yield();
}
-void xbt_os_thread_cancel(xbt_os_thread_t t)
-{
- pthread_cancel(t->t);
-}
-
/****** mutex related functions ******/
typedef struct xbt_os_mutex_ {
pthread_mutex_t m;