X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/775bbff55d13fae1433908f75b8e2d26e2ad3db0..f22432486ef4631dfc0b19340ae387a0ecf84c20:/src/gras/DataDesc/ddt_exchange.c

diff --git a/src/gras/DataDesc/ddt_exchange.c b/src/gras/DataDesc/ddt_exchange.c
index ed2e96cb42..62873e4ace 100644
--- a/src/gras/DataDesc/ddt_exchange.c
+++ b/src/gras/DataDesc/ddt_exchange.c
@@ -13,7 +13,7 @@
 #include "gras/DataDesc/datadesc_private.h"
 #include "gras/Transport/transport_interface.h" /* gras_trp_send/recv */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_exchange,datadesc,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_exchange,gras_ddt,
 				 "Sending data over the network");
 const char *gras_datadesc_cat_names[9] = { 
   "undefined", 
@@ -122,8 +122,8 @@ gras_datadesc_copy_rec(gras_cbps_t           state,
 
   VERB4("Copy a %s (%s) from %p to %p", 
 	type->name, gras_datadesc_cat_names[type->category_code],
-	src,dst);
-
+	src,dst);	
+   
   if (type->send) {
     type->send(type,state,src);
   }
@@ -154,9 +154,27 @@ gras_datadesc_copy_rec(gras_cbps_t           state,
       if (field->send)
 	field->send(type,state,field_src);
       
-      VERB1("Copy field %s",field->name);
+      DEBUG1("Copy field %s",field->name);
       count += gras_datadesc_copy_rec(state,refs,sub_type, field_src, field_dst, 0,
 				      detect_cycle || sub_type->cycle);
+       
+       if (XBT_LOG_ISENABLED(gras_ddt_exchange,xbt_log_priority_verbose)) {
+	  if (sub_type == gras_datadesc_by_name("unsigned int")) {
+	     VERB2("Copied value for field %s: %d (type: unsigned int)",field->name, *(unsigned int*)field_dst);
+	  } else if (sub_type == gras_datadesc_by_name("int")) {
+	     VERB2("Copied value for field %s: %d (type: int)",field->name, *(int*)field_dst);
+	     
+	  } else if (sub_type == gras_datadesc_by_name("unsigned long int")) {
+	     VERB2("Copied value for field %s: %ld (type: unsigned long int)",field->name, *(unsigned long int*)field_dst);
+	  } else if (sub_type == gras_datadesc_by_name("long int")) {
+	     VERB2("Copied value for field %s: %ld (type: long int)",field->name, *(long int*)field_dst);
+
+	  } else if (sub_type == gras_datadesc_by_name("string")) {
+	     VERB2("Copied value for field %s: '%s' (type: string)", field->name, *(char**)field_dst);	 
+	  } else {
+	     VERB1("Copied a value for field %s (type not scalar?)", field->name);
+	  }
+       }
       
     }
     VERB1("<< Copied all fields of the structure %s", type->name);
@@ -338,6 +356,7 @@ gras_datadesc_copy_rec(gras_cbps_t           state,
   default:
     xbt_assert0(0, "Invalid type");
   }
+   
   return count;
 }
 /**
@@ -390,6 +409,9 @@ gras_datadesc_send_rec(gras_socket_t         sock,
   VERB2("Send a %s (%s)", 
 	type->name, gras_datadesc_cat_names[type->category_code]);
 
+  if (!strcmp(type->name,"string"))
+    VERB1("value: '%s'",*(char**)data);
+
   if (type->send) {
     type->send(type,state,data);
     DEBUG0("Run the emission callback");
@@ -902,6 +924,9 @@ gras_datadesc_recv_rec(gras_socket_t         sock,
   if (type->recv)
     type->recv(type,state,l_data);
 
+  if (!strcmp(type->name,"string"))
+    VERB1("value: '%s'",*(char**)l_data);
+
 }
 
 /**