X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c808cbd02cbb8305a87172367afe6e29fae033e..9ba7b88014d3dfe4aa65b777260ed1d07a3cc56c:/src/gras/DataDesc/datadesc_private.h?ds=sidebyside

diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h
index d975b74f93..f0001eb2c9 100644
--- a/src/gras/DataDesc/datadesc_private.h
+++ b/src/gras/DataDesc/datadesc_private.h
@@ -14,7 +14,7 @@
 #define GRAS_DATADESC_PRIVATE_H
 
 #include "gras_private.h"
-#include "DataDesc/datadesc_interface.h"
+#include "gras/DataDesc/datadesc_interface.h"
 
 /**
  * aligned:
@@ -24,12 +24,12 @@
 #define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
 
 extern gras_set_t *gras_datadesc_set_local;
-
+void gras_ddt_freev(void *ddt);
 /*******************************************
  * Descriptions of all known architectures *
  *******************************************/
 
-#define gras_arch_count 4
+#define gras_arch_count 5
 typedef enum {
   gras_ddt_scalar_char      = 0,
   gras_ddt_scalar_short     = 1,
@@ -49,9 +49,10 @@ typedef struct {
 
   int endian;
 
-  int sizeof_scalars[9]; /* char,short,int,long,long_long,
-			    pdata,pfunc,
-			    float,double */
+  int sizeofs[9]; /* char,short,int,long,long_long,
+		   pdata,pfunc,
+		   float,double */
+  int boundaries[9]; /* idem */
 } gras_arch_desc_t;
 
 extern const gras_arch_desc_t gras_arches[gras_arch_count];
@@ -92,9 +93,9 @@ typedef enum e_gras_datadesc_type_category {
  */
 typedef struct s_gras_dd_cat_field {
 
-  char 			      *name;
-  long int		       offset[gras_arch_count]; /* only for struct */
-  int                          code;
+  char 	   *name;
+  long int  offset[gras_arch_count];
+  gras_datadesc_type_t *type;
   
   gras_datadesc_type_cb_void_t pre;
   gras_datadesc_type_cb_void_t post;
@@ -119,6 +120,7 @@ enum e_gras_dd_scalar_encoding {
 };
 typedef struct s_gras_dd_cat_scalar {
   enum e_gras_dd_scalar_encoding encoding;
+  gras_ddt_scalar_type_t type; /* to check easily that redefinition matches*/
 } gras_dd_cat_scalar_t;
 
 /**
@@ -128,6 +130,7 @@ typedef struct s_gras_dd_cat_scalar {
  */
 typedef struct s_gras_dd_cat_struct {
   gras_dynar_t *fields; /* elm type = gras_dd_cat_field_t */
+  int closed; /* gras_datadesc_declare_struct_close() was called */
 } gras_dd_cat_struct_t;
 
 /**
@@ -138,6 +141,7 @@ typedef struct s_gras_dd_cat_struct {
 typedef struct s_gras_dd_cat_union {
   gras_datadesc_type_cb_int_t selector;
   gras_dynar_t *fields; /* elm type = gras_dd_cat_field_t */
+  int closed; /* gras_datadesc_declare_union_close() was called */
 } gras_dd_cat_union_t;
 
 /**
@@ -146,10 +150,10 @@ typedef struct s_gras_dd_cat_union {
  * Specific fields of a reference
  */
 typedef struct s_gras_dd_cat_ref {
-  int	 	 		code;
+  gras_datadesc_type_t     *type;
 
   /* callback used to return the referenced type number  */
-  gras_datadesc_type_cb_int_t   selector;
+  gras_datadesc_selector_t  selector;
 } gras_dd_cat_ref_t;
 
 
@@ -159,13 +163,14 @@ typedef struct s_gras_dd_cat_ref {
  * Specific fields of an array
  */
 typedef struct s_gras_dd_cat_array {
-  int	 	 		code;
+  gras_datadesc_type_t *type;
 
   /* element_count < 0 means dynamically defined */
   long int                  	  fixed_size;
 
   /* callback used to return the dynamic length */
   gras_datadesc_type_cb_int_t dynamic_size;
+
 } gras_dd_cat_array_t;
 
 /**
@@ -209,38 +214,37 @@ struct s_gras_datadesc_type {
   char                                *name;
   unsigned int                         name_len;
         
-  unsigned int                         refcounter;
-   
   /* payload */
   long int                             size[gras_arch_count];
   
-  long int                             alignment[gras_arch_count];
+  long int                             alignment[gras_arch_count];  
   long int                             aligned_size[gras_arch_count];
   
   enum  e_gras_datadesc_type_category  category_code;
   union u_gras_datadesc_category       category;
   
-  gras_datadesc_type_cb_void_t         pre;
-  gras_datadesc_type_cb_void_t         post;
+  gras_datadesc_type_cb_void_t         send;
+  gras_datadesc_type_cb_void_t         recv;
 };
 
 /***************************
- * Type creation functions *
+ * constructor/desctructor *
  ***************************/
+void gras_datadesc_free(gras_datadesc_type_t *type);
+
 gras_error_t 
-gras_datadesc_declare_scalar(const char                       *name,
-			     gras_ddt_scalar_type_t           type,
-			     enum e_gras_dd_scalar_encoding   encoding,
-			     gras_datadesc_type_cb_void_t     cb,
-			     gras_datadesc_type_t           **dst);
+gras_datadesc_scalar(const char                       *name,
+		     gras_ddt_scalar_type_t           type,
+		     enum e_gras_dd_scalar_encoding   encoding,
+		     gras_datadesc_type_t           **dst);
 
 /****************************************************
  * Callback persistant state constructor/destructor *
  ****************************************************/
 gras_error_t
-gras_dd_cbps_new(gras_dd_cbps_t **dst);
+gras_cbps_new(gras_cbps_t **dst);
 void
-gras_dd_cbps_free(gras_dd_cbps_t **state);
+gras_cbps_free(gras_cbps_t **state);
 
 /***************
  * Convertions *