From b48a2fd4e7621cbc0f96e39bf7db3a0263232908 Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 8 Sep 2005 18:43:26 +0000
Subject: [PATCH] Rework the hexadecimal displayer I use to debug the Transport
 layer, and give it a proper header file

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1699 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/gras/gras.c | 35 +++++++++++++++++++++++------------
 src/portable.h  |  6 ++++++
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/gras/gras.c b/src/gras/gras.c
index 740c7a7c82..35b79801e1 100644
--- a/src/gras/gras.c
+++ b/src/gras/gras.c
@@ -17,9 +17,7 @@
 #include "gras.h"
 #include "gras/process.h" /* FIXME: killme and put process_init in modinter */
 
-/* FIXME: move it to some random header */
-void hexa_print(const char*name, unsigned char *data, int size);
-
+#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;
@@ -67,15 +65,28 @@ void gras_exit(void) {
   xbt_exit();
 }
 
-void 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));
 }
 
diff --git a/src/portable.h b/src/portable.h
index 8db663048e..3596f340c5 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -177,4 +177,10 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 #  include <execinfo.h>
 #endif
 
+/*
+ * Some debugging functions. Can't we find a better place for this??
+ */
+void hexa_print(const char*name, unsigned char *data, int size);
+const char *hexa_str(unsigned char *data, int size);
+
 #endif /* GRAS_PORTABLE_H */
-- 
2.20.1