Improve detection of remote exceptions

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

diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c
index fb3e50f..de4d620 100644 (file)
--- a/src/gras/DataDesc/datadesc.c
+++ b/src/gras/DataDesc/datadesc.c
@@ -2,7 +2,9 @@
 
 /* datadesc - data description in order to send/recv it in GRAS             */
 
-/* Copyright (c) 2004 Olivier Aumage, Martin Quinson. All rights reserved.  */
+/* Copyright (c) 2003 Olivier Aumage.                                       */
+/* Copyright (c) 2003, 2004 Martin Quinson.                                 */
+/* All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -11,14 +13,14 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(datadesc,gras,"Data description");
 /* FIXME: make this host-dependent using a trick such as UserData*/
-xbt_set_t gras_datadesc_set_local=NULL;
+/*@null@*/xbt_set_t gras_datadesc_set_local=NULL;
 
 
 /* callback for array size when sending strings */
 static int
-_strlen_cb(gras_cbps_t vars, void *data) {
+_strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, void *data) {
 
-  return 1+(long int)strlen(data);
+  return 1+(int)strlen(data);
 }
 
 
@@ -110,6 +112,26 @@ gras_datadesc_init(void) {
                                _strlen_cb);
   ddt = gras_datadesc_ref("string",ddt);
 
+
+  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("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,"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,"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_append(ddt,"bt");
+  gras_datadesc_struct_close(ddt);
 }
 
 /**
@@ -124,20 +146,12 @@ gras_datadesc_exit(void) {
   DEBUG0("Exited DataDesc");
 }
 
-/**
- * gras_datadesc_get_name:
- *
- * Returns the name of a datadescription (to ease the debug)
- */
-char *
+/** This is mainly to debug */
+const char *
 gras_datadesc_get_name(gras_datadesc_type_t ddt) {
-  return ddt->name;
+  return ddt?(const char*)ddt->name:"(null)";
 }
-/**
- * gras_datadesc_get_id:
- *
- * Returns the name of a datadescription (to ease the debug)
- */
+/** This is mainly to debug */
 int
 gras_datadesc_get_id(gras_datadesc_type_t ddt) {
   return ddt->code;
@@ -150,7 +164,7 @@ gras_datadesc_get_id(gras_datadesc_type_t ddt) {
  *
  */
 int gras_datadesc_size(gras_datadesc_type_t type) {
-  return type->size[GRAS_THISARCH];
+  return type?type->size[GRAS_THISARCH]:0;
 }
 
 /**