X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/badae5b067e0b341051aa2eae2bf3afbc4311193:/src/xbt/xbt_sg_synchro.c..5c19d3d6403ded95f8675596aa250240b6f7e467:/src/xbt/xbt_os_synchro.c

diff --git a/src/xbt/xbt_sg_synchro.c b/src/xbt/xbt_os_synchro.c
similarity index 51%
rename from src/xbt/xbt_sg_synchro.c
rename to src/xbt/xbt_os_synchro.c
index 927d139840..db8e2acbde 100644
--- a/src/xbt/xbt_sg_synchro.c
+++ b/src/xbt/xbt_os_synchro.c
@@ -3,7 +3,7 @@
 
 /* This is the simulation implementation, using simix.                      */
 
-/* Copyright (c) 2007-2015. The SimGrid Team.
+/* Copyright (c) 2007-2016. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -18,113 +18,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_sync, xbt,
                                 "Synchronization mechanism");
 
-/* the implementation would be cleaner (and faster) with ELF symbol aliasing */
-
-typedef struct s_xbt_thread_ {
-  smx_process_t s_process; /* keep this first, gras_socket_im_the_server() does funky transtyping in sg_msg.c */
-  char *name;
-  void_f_pvoid_t code;
-  void *userparam;
-  void *father_data;
-  /* stuff to allow other people to wait on me with xbt_thread_join */
-  unsigned joinable:1, done:1;
-  xbt_cond_t cond;
-  xbt_mutex_t mutex;
-} s_xbt_thread_t;
-
-static int xbt_thread_create_wrapper(int argc, char *argv[])
-{
-  smx_process_t self = SIMIX_process_self();
-  xbt_thread_t t =
-      (xbt_thread_t) SIMIX_process_self_get_data(self);
-  simcall_process_set_data(self, t->father_data);
-  t->code(t->userparam);
-  if (t->joinable) {
-    t->done = 1;
-    xbt_mutex_acquire(t->mutex);
-    xbt_cond_broadcast(t->cond);
-    xbt_mutex_release(t->mutex);
-  } else {
-    xbt_mutex_destroy(t->mutex);
-    xbt_cond_destroy(t->cond);
-    free(t->name);
-    free(t);
-  }
-  return 0;
-}
-
-xbt_thread_t xbt_thread_create(const char *name, void_f_pvoid_t code,
-                               void *param, int joinable)
-{
-  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_self_get_data(SIMIX_process_self());
-  /*   char*name = bprintf("%s#%p",SIMIX_process_self_get_name(), param); */
-  res->s_process = simcall_process_create(name,
-                           xbt_thread_create_wrapper, res,
-                           SIMIX_host_self_get_name(), -1.0, 0, NULL,
-                           /*props */ NULL,0);
-  res->joinable = joinable;
-  res->done = 0;
-  res->cond = xbt_cond_init();
-  res->mutex = xbt_mutex_init();
-  //   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)
-{
-  xbt_mutex_acquire(thread->mutex);
-  xbt_assert(thread->joinable,
-              "Cannot join on %p: wasn't created joinable", thread);
-  if (!thread->done) {
-    xbt_cond_wait(thread->cond, thread->mutex);
-    xbt_mutex_release(thread->mutex);
-  }
-
-  xbt_mutex_destroy(thread->mutex);
-  xbt_cond_destroy(thread->cond);
-  free(thread->name);
-  free(thread);
-
-}
-
-void xbt_thread_cancel(xbt_thread_t thread)
-{
-  simcall_process_kill(thread->s_process);
-  free(thread->name);
-  free(thread);
-}
-
-void xbt_thread_exit()
-{
-  simcall_process_kill(SIMIX_process_self());
-}
-
-xbt_thread_t xbt_thread_self(void)
-{
-  return SIMIX_process_self_get_data(SIMIX_process_self());
-}
-
-void xbt_thread_yield(void)
-{
-  SIMIX_process_yield(SIMIX_process_self());
-}
-
 /****** mutex related functions ******/
 struct s_xbt_mutex_ {
   s_smx_mutex_t mutex;