X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e54c5e982d2a6dd3d2d152038819639b088a1086..0f5e8daaa6e9f74521068aa75837200bcd182ea6:/src/simix/smx_context_thread.c

diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c
index 51593917ca..95989a807d 100644
--- a/src/simix/smx_context_thread.c
+++ b/src/simix/smx_context_thread.c
@@ -25,8 +25,10 @@ typedef struct s_smx_ctx_thread {
 } s_smx_ctx_thread_t, *smx_ctx_thread_t;
 
 static smx_context_t
-smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
-                                      void_f_pvoid_t cleanup_func, void* cleanup_arg);
+smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
+                                      char **argv,
+                                      void_f_pvoid_t cleanup_func,
+                                      void *cleanup_arg);
 
 static void smx_ctx_thread_free(smx_context_t context);
 static void smx_ctx_thread_stop(smx_context_t context);
@@ -35,7 +37,8 @@ static void smx_ctx_thread_resume(smx_context_t new_context);
 
 static void *smx_ctx_thread_wrapper(void *param);
 
-void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) {
+void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory)
+{
 
   smx_ctx_base_factory_init(factory);
 
@@ -48,16 +51,20 @@ void SIMIX_ctx_thread_factory_init(smx_context_factory_t * factory) {
   (*factory)->name = "ctx_thread_factory";
 }
 
-static smx_context_t 
-smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** argv, 
-                                      void_f_pvoid_t cleanup_func, void* cleanup_arg)
+static smx_context_t
+smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc,
+                                      char **argv,
+                                      void_f_pvoid_t cleanup_func,
+                                      void *cleanup_arg)
 {
-  smx_ctx_thread_t context = (smx_ctx_thread_t)smx_ctx_base_factory_create_context_sized
-      (sizeof(s_smx_ctx_thread_t), code,argc,argv,cleanup_func,cleanup_arg);
+  smx_ctx_thread_t context = (smx_ctx_thread_t)
+      smx_ctx_base_factory_create_context_sized(sizeof(s_smx_ctx_thread_t),
+                                                code, argc, argv,
+                                                cleanup_func, cleanup_arg);
 
   /* If the user provided a function for the process then use it
      otherwise is the context for maestro */
-  if(code){
+  if (code) {
     context->begin = xbt_os_sem_init(0);
     context->end = xbt_os_sem_init(0);
 
@@ -66,37 +73,37 @@ smx_ctx_thread_factory_create_context(xbt_main_func_t code, int argc, char** arg
     /* NOTE: The first argument to xbt_os_thread_create used to be the process *
      * name, but now the name is stored at SIMIX level, so we pass a null      */
     context->thread =
-      xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context);
+        xbt_os_thread_create(NULL, smx_ctx_thread_wrapper, context);
 
     /* wait the starting of the newly created process */
     xbt_os_sem_acquire(context->end);
   }
-    
-  return (smx_context_t)context;
+
+  return (smx_context_t) context;
 }
 
 static void smx_ctx_thread_free(smx_context_t pcontext)
 {
-  smx_ctx_thread_t context = (smx_ctx_thread_t)pcontext;
+  smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
 
-  /* check if this is the context of maestro (it doesn't has a real thread) */  
+  /* check if this is the context of maestro (it doesn't has a real thread) */
   if (context->thread) {
     /* wait about the thread terminason */
     xbt_os_thread_join(context->thread, NULL);
-    
+
     /* destroy the synchronisation objects */
     xbt_os_sem_destroy(context->begin);
     xbt_os_sem_destroy(context->end);
   }
-  
+
   smx_ctx_base_free(pcontext);
 }
 
 static void smx_ctx_thread_stop(smx_context_t pcontext)
 {
 
-  smx_ctx_thread_t context = (smx_ctx_thread_t)pcontext;
-  
+  smx_ctx_thread_t context = (smx_ctx_thread_t) pcontext;
+
   /* please no debug here: our procdata was already free'd */
   smx_ctx_base_stop(pcontext);
 
@@ -105,7 +112,7 @@ static void smx_ctx_thread_stop(smx_context_t pcontext)
 
   /* exit */
   /* We should provide return value in case other wants it */
-  xbt_os_thread_exit(NULL);     
+  xbt_os_thread_exit(NULL);
 }
 
 static void *smx_ctx_thread_wrapper(void *param)
@@ -118,16 +125,18 @@ static void *smx_ctx_thread_wrapper(void *param)
 
   (context->super.code) (context->super.argc, context->super.argv);
 
-  smx_ctx_thread_stop((smx_context_t)context);
+  smx_ctx_thread_stop((smx_context_t) context);
   return NULL;
 }
 
-static void smx_ctx_thread_suspend(smx_context_t context) {
+static void smx_ctx_thread_suspend(smx_context_t context)
+{
   xbt_os_sem_release(((smx_ctx_thread_t) context)->end);
   xbt_os_sem_acquire(((smx_ctx_thread_t) context)->begin);
 }
 
-static void smx_ctx_thread_resume(smx_context_t new_context) {
+static void smx_ctx_thread_resume(smx_context_t new_context)
+{
   xbt_os_sem_release(((smx_ctx_thread_t) new_context)->begin);
   xbt_os_sem_acquire(((smx_ctx_thread_t) new_context)->end);
 }