SIGURS1 is not defined on windows (but signal() and signal.h are both here)

[simgrid.git] / src / gras / gras.c

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 65e2ebb..a85be22 100644 (file)
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -70,7 +70,9 @@ void gras_init(int *argc,char **argv) {
     gras_trp_init();
     gras_datadesc_init();
 #if defined(HAVE_SIGNAL) && defined(HAVE_SIGNAL_H)
+# ifdef SIGUSR1
     signal(SIGUSR1,gras_sigusr_handler);
+# endif
     signal(SIGINT,gras_sigint_handler);
 #endif     
   }
@@ -91,7 +93,7 @@ void gras_exit(void) {
   xbt_exit();
 }
 
-const char *hexa_str(unsigned char *data, int size) {
+const char *hexa_str(unsigned char *data, int size, int downside) {
   static char*buff=NULL;
   static int buffsize=0;
   int i,pos=0; 
@@ -102,17 +104,35 @@ const char *hexa_str(unsigned char *data, int size) {
     buffsize=5*(size+1);
     buff=xbt_malloc(buffsize);
   }
-  for (i=0;i<size;i++)  {
+   
+  int begin,increment;   
+  if (downside) {
+     begin=size-1;
+     increment=-1;
+  } else {
+     begin=0;
+     increment=1;
+  }
+   
+  for (i=begin; 0<=i && i<size ; i+=increment)  {
     if (data[i]<32 || data[i]>126)
-      sprintf(buff+pos,".(%02x)",data[i]);
+      sprintf(buff+pos,".");
     else
-      sprintf(buff+pos,"%c(%02x)",data[i],data[i]);
+      sprintf(buff+pos,"%c",data[i]);
+    while (buff[++pos]);
+   }
+  sprintf(buff+pos,"(");
+  while (buff[++pos]);
+  for (i=begin; 0<=i && i<size ; i+=increment)  {
+    sprintf(buff+pos,"%02x",data[i]);
     while (buff[++pos]);
    }
+  sprintf(buff+pos,")");
+  while (buff[++pos]);
   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));
+   printf("%s: %s\n", name,hexa_str(data,size,0));
 }