X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc6485562c7f11b39a3a41e7d4504e4f5c40890a..5fb2fa67ea062d8c26cfe3e6669a93fc2b7607bd:/src/gras/DataDesc/datadesc_private.h diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h index 19030781b4..1d842fca93 100644 --- a/src/gras/DataDesc/datadesc_private.h +++ b/src/gras/DataDesc/datadesc_private.h @@ -92,9 +92,8 @@ typedef enum e_gras_datadesc_type_category { e_gras_datadesc_type_cat_union = 3, e_gras_datadesc_type_cat_ref = 4, /* ref to an uniq element */ e_gras_datadesc_type_cat_array = 5, - e_gras_datadesc_type_cat_ignored = 6, - e_gras_datadesc_type_cat_invalid = 7 + e_gras_datadesc_type_cat_invalid = 6 } gras_datadesc_type_category_t; /*------------------------------------------------*/ @@ -111,8 +110,8 @@ typedef struct s_gras_dd_cat_field { 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; + gras_datadesc_type_cb_void_t send; + gras_datadesc_type_cb_void_t recv; } s_gras_dd_cat_field_t,*gras_dd_cat_field_t; @@ -134,7 +133,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_ddt_scalar_type_t type; /* to check easily that redefinition matches */ } gras_dd_cat_scalar_t; /** @@ -187,17 +186,6 @@ typedef struct s_gras_dd_cat_array { } gras_dd_cat_array_t; -/** - * gras_dd_cat_ignored_t: - * - * Specific fields of an ignored field - */ -typedef struct s_gras_dd_cat_ignored { - void *default_value; - void_f_pvoid_t *free_func; -} gras_dd_cat_ignored_t; - - /** * u_gras_datadesc_category: * @@ -210,10 +198,8 @@ union u_gras_datadesc_category { gras_dd_cat_union_t union_data; gras_dd_cat_ref_t ref_data; gras_dd_cat_array_t array_data; - gras_dd_cat_ignored_t ignored_data; }; - /****************************************/ /* The holy grail: type descriptor type */ /****************************************/ @@ -240,7 +226,12 @@ typedef struct s_gras_datadesc_type { gras_datadesc_type_cb_void_t send; gras_datadesc_type_cb_void_t recv; - int cycle; /* true if the datatype may contain cycle */ + /* flags */ + int cycle :1; + + /* random value for users (like default value or whatever) */ + char extra[SIZEOF_MAX]; + } s_gras_datadesc_type_t; /***************************