J'en ai marre de faire des messages detailles. 'Current state' ;)

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

diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c
index 90b19c7..984df70 100644 (file)
--- a/src/gras/DataDesc/datadesc.c
+++ b/src/gras/DataDesc/datadesc.c
@@ -11,9 +11,20 @@
 #include "DataDesc/datadesc_private.h"
 
 GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(DataDesc,GRAS);
-/* FIXME: make this machine-dependent using a trick such as UserData*/
+/* FIXME: make this host-dependent using a trick such as UserData*/
 gras_set_t *gras_datadesc_set_local=NULL;
 
+
+/* callback for array size when sending strings */
+static int
+_strlen_cb(void                        *vars,
+           gras_datadesc_type_t        *type,
+           void                        *data) {
+
+  return 1+(long int)strlen(data);
+}
+
+
 /**
  * gras_datadesc_init:
  *
@@ -22,12 +33,92 @@ gras_set_t *gras_datadesc_set_local=NULL;
 void
 gras_datadesc_init(void) {
   gras_error_t errcode;
+  gras_datadesc_type_t *ddt; /* What to add */
+  gras_datadesc_type_t *elm; /* element of ddt when needed */
 
   VERB0("Initializing DataDesc");
 
-  errcode =  gras_dd_typeset_create(GRAS_THISARCH,&gras_datadesc_set_local);
-  gras_assert0(errcode==no_error,
-              "Impossible to create the data set containg locally known types");
+  TRYFAIL(gras_set_new(&gras_datadesc_set_local));
+
+  TRYFAIL(gras_ddt_new_scalar("signed char", 
+                             gras_ddt_scalar_char, e_gras_dd_scalar_encoding_sint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("unsigned char", 
+                             gras_ddt_scalar_char, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("signed short int", 
+                             gras_ddt_scalar_short, e_gras_dd_scalar_encoding_sint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("unsigned short int", 
+                             gras_ddt_scalar_short, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("signed int", 
+                             gras_ddt_scalar_int, e_gras_dd_scalar_encoding_sint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("unsigned int", 
+                             gras_ddt_scalar_int, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("signed long int", 
+                             gras_ddt_scalar_long, e_gras_dd_scalar_encoding_sint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("unsigned long int", 
+                             gras_ddt_scalar_long, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("signed long long int", 
+                             gras_ddt_scalar_long_long, e_gras_dd_scalar_encoding_sint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("unsigned long long int", 
+                             gras_ddt_scalar_long_long, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("data pointer", 
+                             gras_ddt_scalar_pdata, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("function pointer", 
+                             gras_ddt_scalar_pfunc, e_gras_dd_scalar_encoding_uint, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+
+  TRYFAIL(gras_ddt_new_scalar("float", 
+                             gras_ddt_scalar_float, e_gras_dd_scalar_encoding_float, 
+                             NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_new_scalar("double", 
+                             gras_ddt_scalar_float, e_gras_dd_scalar_encoding_float, 
+                             NULL,&ddt));
+  TRYFAIL(gras_ddt_register(ddt));
+
+  TRYFAIL(gras_ddt_get_by_name("unsigned char",&elm));
+  TRYFAIL(gras_ddt_new_array("string", elm, 0, _strlen_cb, NULL, &ddt));
+  TRYFAIL(gras_ddt_register(ddt));
 }
 
 /**