X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f384089af3d664bf1f59324d41f1511d5dfa0ab..f93d8dc87fcbe2f03c7b1642d01971cacc7d4844:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 4ec704d2a8..c810ef1442 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -1,9 +1,7 @@
-/* $Id$ */
-
 /* gras.c -- generic functions not fitting anywhere else                    */
 
-/* Copyright (c) 2003, 2004 Martin Quinson.                                 */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -31,7 +29,7 @@ static int gras_running_process = 0;
 #if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
 static void gras_sigusr_handler(int sig)
 {
-  INFO0("SIGUSR1 received. Display the backtrace");
+  XBT_INFO("SIGUSR1 received. Display the backtrace");
   xbt_backtrace_display_current();
 }
 
@@ -70,12 +68,16 @@ XBT_LOG_EXTERNAL_CATEGORY(gras_virtu);
 XBT_LOG_EXTERNAL_CATEGORY(gras_virtu_emul);
 XBT_LOG_EXTERNAL_CATEGORY(gras_virtu_process);
 
+/**
+ * @ingroup GRAS_API
+ * \brief Initialize the gras mechanisms.
+ */
 void gras_init(int *argc, char **argv)
 {
-
+  int first = 0;
   gras_procdata_t *pd;
   gras_msg_procdata_t msg_pd;
-  VERB0("Initialize GRAS");
+  XBT_VERB("Initialize GRAS");
 
   xbt_getpid = gras_os_getpid;
   /* First initialize the XBT */
@@ -85,6 +87,7 @@ void gras_init(int *argc, char **argv)
    *    - declare process specific data we need (without creating them)
    */
   if (gras_running_process == 0) {
+    first = 1;
     /* Connect our log channels: that must be done manually under windows */
     XBT_LOG_CONNECT(gras_ddt, gras);
     XBT_LOG_CONNECT(gras_ddt_cbps, gras_ddt);
@@ -112,6 +115,7 @@ void gras_init(int *argc, char **argv)
     gras_trp_register();
     gras_msg_register();
   }
+  gras_running_process++;
 
   /*
    * Initialize the process specific stuff
@@ -121,7 +125,7 @@ void gras_init(int *argc, char **argv)
   /*
    * Initialize the global stuff if it's not the first process created
    */
-  if (gras_running_process++ == 0) {
+  if (first) {
     gras_emul_init();
     gras_msg_init();
     gras_trp_init();
@@ -143,13 +147,15 @@ void gras_init(int *argc, char **argv)
   pd->listener = gras_msg_listener_launch(msg_pd->msg_received);
 }
 
+/**
+ * @ingroup GRAS_API
+ * @brief Finalize the gras mechanisms.
+ * */
 void gras_exit(void)
 {
-  gras_procdata_t *pd;
-  INFO0("Exiting GRAS");
+  XBT_INFO("Exiting GRAS");
   amok_exit();
   gras_moddata_leave();
-  pd = gras_procdata_get();
   gras_msg_listener_shutdown();
   gras_process_exit();
   if (--gras_running_process == 0) {
@@ -159,7 +165,6 @@ void gras_exit(void)
     gras_emul_exit();
     gras_moddata_exit();
   }
-  xbt_exit();
 }
 
 const char *hexa_str(unsigned char *data, int size, int downside)
@@ -170,8 +175,7 @@ const char *hexa_str(unsigned char *data, int size, int downside)
   int begin, increment;
 
   if (buffsize < 5 * (size + 1)) {
-    if (buff)
-      free(buff);
+    free(buff);
     buffsize = 5 * (size + 1);
     buff = xbt_malloc(buffsize);
   }