X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5fb2fa67ea062d8c26cfe3e6669a93fc2b7607bd..bf3214f060ff7f2548d7f0fa2569f03fe3e58441:/src/gras/DataDesc/datadesc_private.h diff --git a/src/gras/DataDesc/datadesc_private.h b/src/gras/DataDesc/datadesc_private.h index 1d842fca93..5560238652 100644 --- a/src/gras/DataDesc/datadesc_private.h +++ b/src/gras/DataDesc/datadesc_private.h @@ -16,12 +16,11 @@ #include "xbt/sysdep.h" #include "xbt/log.h" -#include "xbt/error.h" #include "xbt/dynar.h" #include "xbt/dict.h" #include "xbt/set.h" -#include "gras_config.h" /* GRAS_THISARCH */ +#include "portable.h" /* GRAS_THISARCH */ #include "gras/transport.h" /* socket handling */ @@ -31,11 +30,11 @@ #include "gras/DataDesc/datadesc_interface.h" /* semi-public API */ /** - * aligned: - * + * ddt_aligned: + * * Align the data v on the boundary a. */ -#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1)) +#define ddt_aligned(v, a) (((v) + (a - 1)) & ~(a - 1)) /*@null@*/extern xbt_set_t gras_datadesc_set_local; void gras_ddt_freev(void *ddt); @@ -43,30 +42,28 @@ void gras_ddt_freev(void *ddt); * Descriptions of all known architectures * *******************************************/ -#define gras_arch_count 9 +#define gras_arch_count 11 typedef enum { - gras_ddt_scalar_char = 0, - gras_ddt_scalar_short = 1, - gras_ddt_scalar_int = 2, - gras_ddt_scalar_long = 3, - gras_ddt_scalar_long_long = 4, + gras_ddt_scalar_char = 0, + gras_ddt_scalar_short = 1, + gras_ddt_scalar_int = 2, + gras_ddt_scalar_long = 3, + gras_ddt_scalar_long_long = 4, - gras_ddt_scalar_pdata = 5, - gras_ddt_scalar_pfunc = 6, + gras_ddt_scalar_pdata = 5, + gras_ddt_scalar_pfunc = 6, - gras_ddt_scalar_float = 7, - gras_ddt_scalar_double = 8 + gras_ddt_scalar_float = 7, + gras_ddt_scalar_double = 8 } gras_ddt_scalar_type_t; typedef struct { - const char *name; + const char *name; - int endian; + int endian; - int sizeofs[9]; /* char,short,int,long,long_long, - pdata,pfunc, - float,double */ - int boundaries[9]; /* idem */ + 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]; @@ -79,21 +76,21 @@ extern const char *gras_datadesc_cat_names[9]; /** * e_gras_datadesc_type_category: * - * Defines all possible type categories. + * Defines all possible type categories. */ typedef enum e_gras_datadesc_type_category { - - /* if you edit this, also fix gras_datadesc_cat_names in ddt_exchange.c */ - - e_gras_datadesc_type_cat_undefined = 0, - - e_gras_datadesc_type_cat_scalar = 1, - e_gras_datadesc_type_cat_struct = 2, - 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_invalid = 6 + + /* if you edit this, also fix gras_datadesc_cat_names in ddt_exchange.c */ + + e_gras_datadesc_type_cat_undefined = 0, + + e_gras_datadesc_type_cat_scalar = 1, + e_gras_datadesc_type_cat_struct = 2, + 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_invalid = 6 } gras_datadesc_type_category_t; /*------------------------------------------------*/ @@ -106,12 +103,12 @@ typedef enum e_gras_datadesc_type_category { */ typedef struct s_gras_dd_cat_field { - char *name; - long int offset[gras_arch_count]; - gras_datadesc_type_t type; - - gras_datadesc_type_cb_void_t send; - gras_datadesc_type_cb_void_t recv; + char *name; + long int offset[gras_arch_count]; + gras_datadesc_type_t type; + + 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; @@ -123,17 +120,17 @@ void gras_dd_cat_field_free(void *f); * Specific fields of a scalar */ enum e_gras_dd_scalar_encoding { - e_gras_dd_scalar_encoding_undefined = 0, - - e_gras_dd_scalar_encoding_uint, - e_gras_dd_scalar_encoding_sint, - e_gras_dd_scalar_encoding_float, - - e_gras_dd_scalar_encoding_invalid + e_gras_dd_scalar_encoding_undefined = 0, + + e_gras_dd_scalar_encoding_uint, + e_gras_dd_scalar_encoding_sint, + e_gras_dd_scalar_encoding_float, + + e_gras_dd_scalar_encoding_invalid }; 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 */ + enum e_gras_dd_scalar_encoding encoding; + gras_ddt_scalar_type_t type; /* to check easily that redefinition matches */ } gras_dd_cat_scalar_t; /** @@ -142,8 +139,8 @@ typedef struct s_gras_dd_cat_scalar { * Specific fields of a struct */ typedef struct s_gras_dd_cat_struct { - xbt_dynar_t fields; /* elm type = gras_dd_cat_field_t */ - int closed; /* gras_datadesc_declare_struct_close() was called */ + xbt_dynar_t fields; /* elm type = gras_dd_cat_field_t */ + int closed; /* gras_datadesc_declare_struct_close() was called */ } gras_dd_cat_struct_t; /** @@ -152,9 +149,9 @@ typedef struct s_gras_dd_cat_struct { * Specific fields of a union */ typedef struct s_gras_dd_cat_union { - gras_datadesc_type_cb_int_t selector; - xbt_dynar_t fields; /* elm type = gras_dd_cat_field_t */ - int closed; /* gras_datadesc_declare_union_close() was called */ + gras_datadesc_type_cb_int_t selector; + xbt_dynar_t fields; /* elm type = gras_dd_cat_field_t */ + int closed; /* gras_datadesc_declare_union_close() was called */ } gras_dd_cat_union_t; /** @@ -163,10 +160,10 @@ typedef struct s_gras_dd_cat_union { * Specific fields of a reference */ typedef struct s_gras_dd_cat_ref { - gras_datadesc_type_t type; + gras_datadesc_type_t type; - /* callback used to return the referenced type number */ - gras_datadesc_selector_t selector; + /* callback used to return the referenced type number */ + gras_datadesc_selector_t selector; } gras_dd_cat_ref_t; @@ -176,13 +173,13 @@ typedef struct s_gras_dd_cat_ref { * Specific fields of an array */ typedef struct s_gras_dd_cat_array { - gras_datadesc_type_t type; + gras_datadesc_type_t type; - /* element_count == 0 means dynamically defined */ - unsigned long int fixed_size; + /* element_count == 0 means dynamically defined */ + unsigned long int fixed_size; - /* callback used to return the dynamic length */ - gras_datadesc_type_cb_int_t dynamic_size; + /* callback used to return the dynamic length */ + gras_datadesc_type_cb_int_t dynamic_size; } gras_dd_cat_array_t; @@ -192,12 +189,12 @@ typedef struct s_gras_dd_cat_array { * Specific data to each possible category */ union u_gras_datadesc_category { - void *undefined_data; - gras_dd_cat_scalar_t scalar_data; - gras_dd_cat_struct_t struct_data; - gras_dd_cat_union_t union_data; - gras_dd_cat_ref_t ref_data; - gras_dd_cat_array_t array_data; + void *undefined_data; + gras_dd_cat_scalar_t scalar_data; + gras_dd_cat_struct_t struct_data; + gras_dd_cat_union_t union_data; + gras_dd_cat_ref_t ref_data; + gras_dd_cat_array_t array_data; }; /****************************************/ @@ -209,28 +206,28 @@ union u_gras_datadesc_category { * Type descriptor. */ typedef struct s_gras_datadesc_type { - /* headers for the data set */ - unsigned int code; - char *name; - unsigned int name_len; - - /* payload */ - unsigned long int size[gras_arch_count]; - - unsigned long int alignment[gras_arch_count]; - unsigned 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 send; - gras_datadesc_type_cb_void_t recv; - - /* flags */ - int cycle :1; - - /* random value for users (like default value or whatever) */ - char extra[SIZEOF_MAX]; + /* headers for the data set */ + unsigned int code; + char *name; + unsigned int name_len; + + /* payload */ + unsigned long int size[gras_arch_count]; + + unsigned long int alignment[gras_arch_count]; + unsigned 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 send; + gras_datadesc_type_cb_void_t recv; + + /* flags */ + int cycle :1; + + /* random value for users (like default value or whatever) */ + char extra[SIZEOF_MAX]; } s_gras_datadesc_type_t; @@ -239,24 +236,30 @@ typedef struct s_gras_datadesc_type { ***************************/ void gras_datadesc_free(gras_datadesc_type_t *type); -gras_datadesc_type_t - gras_datadesc_scalar(const char *name, - gras_ddt_scalar_type_t type, - enum e_gras_dd_scalar_encoding encoding); +gras_datadesc_type_t +gras_datadesc_scalar(const char *name, + gras_ddt_scalar_type_t type, + enum e_gras_dd_scalar_encoding encoding); /**************************************************** * Callback persistant state constructor/destructor * ****************************************************/ gras_cbps_t gras_cbps_new(void); void gras_cbps_free(gras_cbps_t *state); +void gras_cbps_reset(gras_cbps_t state); /*************** * Convertions * ***************/ -xbt_error_t +void gras_dd_convert_elm(gras_datadesc_type_t type, int count, - int r_arch, - void *src, void *dst); + int r_arch, + void *src, void *dst); + +/******************************************************************** + * Dictionnary containing the constant values for the parsing macro * + ********************************************************************/ +extern xbt_dict_t gras_dd_constants; /* lives in ddt_parse.c of course */ #endif /* GRAS_DATADESC_PRIVATE_H */