#ifndef GRAS_DATADESC_PRIVATE_H
#define GRAS_DATADESC_PRIVATE_H
-#include "gras_private.h"
-#include "DataDesc/datadesc_interface.h"
+#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 "gras/transport.h" /* socket handling */
+
+#include "gras_modinter.h" /* module init/exit */
+#include "gras/datadesc.h" /* rest of module public interface */
+
+#include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
/**
* aligned:
*/
#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
-extern gras_set_t *gras_datadesc_set_local;
-
+extern xbt_set_t gras_datadesc_set_local;
+void gras_ddt_freev(void *ddt);
/*******************************************
* Descriptions of all known architectures *
*******************************************/
-#define gras_arch_count 1
+#define gras_arch_count 6
typedef enum {
gras_ddt_scalar_char = 0,
gras_ddt_scalar_short = 1,
int endian;
- int sizeof_scalars[9]; /* char,short,int,long,long_long,
- pdata,pfunc,
- float,double */
-} gras_arch_sizes_t;
-
-extern const gras_arch_sizes_t gras_arch_sizes[gras_arch_count];
+ 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];
+extern const char *gras_datadesc_cat_names[9];
/**********************************************************/
/* Actual definitions of the stuff in the type descriptor */
/**
* e_gras_datadesc_type_category:
*
- * Defines all possible type categories
+ * Defines all possible type categories.
*/
typedef enum e_gras_datadesc_type_category {
- 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_ignored = 6,
+
+ /* if you edit this, also fix gras_datadesc_cat_names in ddt_exchange.c */
- e_gras_datadesc_type_cat_invalid = 7
+ 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_ignored = 6,
+
+ e_gras_datadesc_type_cat_invalid = 7
} gras_datadesc_type_category_t;
-
/*------------------------------------------------*/
/* definitions of specific data for each 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;
-} gras_dd_cat_field_t;
+} s_gras_dd_cat_field_t,*gras_dd_cat_field_t;
void gras_dd_cat_field_free(void *f);
};
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;
/**
* Specific fields of a struct
*/
typedef struct s_gras_dd_cat_struct {
- gras_dynar_t *fields; /* elm type = gras_dd_cat_field_t */
+ 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;
/**
*/
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 */
+ 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;
/**
* 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;
* 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;
+ /* 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;
+
} gras_dd_cat_array_t;
/**
*
* Type descriptor.
*/
-struct s_gras_datadesc_type {
+typedef struct s_gras_datadesc_type {
/* headers for the data set */
unsigned int code;
char *name;
unsigned int name_len;
/* payload */
- long int size[gras_arch_count];
+ unsigned long int size[gras_arch_count];
- long int alignment[gras_arch_count];
- long int aligned_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 pre;
- gras_datadesc_type_cb_void_t post;
-};
+ gras_datadesc_type_cb_void_t send;
+ gras_datadesc_type_cb_void_t recv;
+
+ int cycle; /* true if the datatype may contain cycle */
+} s_gras_datadesc_type_t;
/***************************
- * Type creation functions *
+ * constructor/desctructor *
***************************/
-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);
+void gras_datadesc_free(gras_datadesc_type_t *type);
-/* Do not use it on a registered type ! */
-void gras_ddt_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);
/****************************************************
* Callback persistant state constructor/destructor *
****************************************************/
-gras_error_t
-gras_dd_cbps_new(gras_dd_cbps_t **dst);
-void
-gras_dd_cbps_free(gras_dd_cbps_t **state);
+gras_cbps_t gras_cbps_new(void);
+void gras_cbps_free(gras_cbps_t *state);
/***************
* Convertions *
***************/
-gras_error_t
-gras_dd_convert_elm(gras_datadesc_type_t *type,
+xbt_error_t
+gras_dd_convert_elm(gras_datadesc_type_t type, int count,
int r_arch,
void *src, void *dst);
#endif /* GRAS_DATADESC_PRIVATE_H */
+
