X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/284832ed09bcd8f66de2c3e6287fb11bb10dc9be..3e96889c27396fab9cf26b4c22d282dfc962a1a5:/src/gras/gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index b920bb0446..35b79801e1 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -14,18 +14,20 @@
 #include "gras_modinter.h"   /* module init/exit */
 #include "xbt_modinter.h"   /* module init/exit */
 
-#include "gras/core.h"
+#include "gras.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
 
+#include "portable.h" /* hexa_*() */
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras,XBT_LOG_ROOT_CAT,"All GRAS categories (cf. section \ref GRAS_API)");
 static int gras_running_process = 0;
 
-void gras_init(int *argc,char **argv, const char *defaultlog) {
+void gras_init(int *argc,char **argv) {
 
-  INFO0("Initialize GRAS");
+  VERB0("Initialize GRAS");
   
   /* First initialize the XBT */
-  xbt_init_defaultlog(argc,argv,defaultlog);
+  xbt_init(argc,argv);
    
   /* module registrations: 
    *    - declare process specific data we need (without creating them) 
@@ -53,25 +55,38 @@ void gras_init(int *argc,char **argv, const char *defaultlog) {
 
 void gras_exit(void) {
   INFO0("Exiting GRAS");
-  gras_process_exit();
   if (--gras_running_process == 0) {
     gras_msg_exit();
     gras_trp_exit();
     gras_datadesc_exit();
     gras_emul_exit();
   }
+  gras_process_exit();
   xbt_exit();
 }
 
-hexa_print(const char*name, unsigned char *data, int size) {
-   int i;
-   printf("%s: ", name);
-   for (i=0;i<size;i++)  {
-      if (data[i]<32)// || data[i]>'9')
-	printf("'\\%d'",data[i]);
-      else
-	printf("%c",data[i]);
+const char *hexa_str(unsigned char *data, int size) {
+  static char*buff=NULL;
+  static int buffsize=0;
+  int i,pos=0;	
+  
+  if (buffsize<5*(size+1)) {
+    if (buff)
+      free(buff);
+    buffsize=5*(size+1);
+    buff=xbt_malloc(buffsize);
+  }
+  for (i=0;i<size;i++)  {
+    if (data[i]<32 || data[i]>126)
+      sprintf(buff+pos,".(%02x)",data[i]);
+    else
+      sprintf(buff+pos,"%c(%02x)",data[i],data[i]);
+    while (buff[++pos]);
    }
-   printf("\n");
+  buff[pos]='\0';  
+  return buff;
+}
+void hexa_print(const char*name, unsigned char *data, int size) {
+   printf("%s: %s\n", name,hexa_str(data,size));
 }