X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ec7e0c51314baeb73e5132b97b804e265699714..6fb0204d71beff637638ef52978df0e8f58453d7:/src/gras/DataDesc/datadesc.c?ds=sidebyside

diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c
index 6fc0e5975c..7be56977d5 100644
--- a/src/gras/DataDesc/datadesc.c
+++ b/src/gras/DataDesc/datadesc.c
@@ -11,7 +11,7 @@
 
 #include "gras/DataDesc/datadesc_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,gras,"Data description");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt,gras,"Data description");
 /* FIXME: make this host-dependent using a trick such as UserData*/
 /*@null@*/xbt_set_t gras_datadesc_set_local=NULL;
 
@@ -115,20 +115,35 @@ gras_datadesc_init(void) {
 
   ddt = gras_datadesc_struct("ex_t");
   gras_datadesc_struct_append(ddt,"msg",gras_datadesc_by_name("string"));
-  gras_datadesc_struct_append(ddt,"category",gras_datadesc_by_name("short int"));
+  gras_datadesc_struct_append(ddt,"category",gras_datadesc_by_name("int"));
   gras_datadesc_struct_append(ddt,"value",gras_datadesc_by_name("int"));
 
+  gras_datadesc_struct_append(ddt,"remote",gras_datadesc_by_name("short int"));
+
   gras_datadesc_struct_append(ddt,"host",gras_datadesc_by_name("string"));
   gras_datadesc_struct_append(ddt,"procname",gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt,"pid",gras_datadesc_by_name("long int"));
   gras_datadesc_struct_append(ddt,"file",gras_datadesc_by_name("string"));
   gras_datadesc_struct_append(ddt,"line",gras_datadesc_by_name("int"));
   gras_datadesc_struct_append(ddt,"func",gras_datadesc_by_name("string"));
-  gras_datadesc_struct_append(ddt,"bt", 
-			      gras_datadesc_array_fixed("char*{XBT_BACKTRACE_SIZE]", 
-							gras_datadesc_by_name("string"),
-							XBT_BACKTRACE_SIZE));
   gras_datadesc_struct_append(ddt,"used",gras_datadesc_by_name("int"));
+  gras_datadesc_cb_field_push(ddt,"used");
+  gras_datadesc_struct_append(ddt,"bt_strings", 
+			      gras_datadesc_ref_pop_arr(gras_datadesc_by_name("string")));
+
+  gras_datadesc_struct_close(ddt);
+
+
+  ddt = gras_datadesc_struct("s_xbt_host_t");
+  gras_datadesc_struct_append(ddt,"name",gras_datadesc_by_name("string"));
+  gras_datadesc_struct_append(ddt,"port",gras_datadesc_by_name("int"));
   gras_datadesc_struct_close(ddt);
+
+  ddt = gras_datadesc_ref("xbt_host_t",ddt);
+
+  /* Dict containing the constant value (for the parsing macro) */
+  gras_dd_constants = xbt_dict_new();
+  
 }
 
 /**