A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
smpicc/smpirun no longer require special envirnment variables. also they're now
[simgrid.git]
/
src
/
gras
/
DataDesc
/
datadesc_private.h
diff --git
a/src/gras/DataDesc/datadesc_private.h
b/src/gras/DataDesc/datadesc_private.h
index
4b762be
..
0e79380
100644
(file)
--- 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/sysdep.h"
#include "xbt/log.h"
-#include "xbt/error.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/set.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 */
#include "gras/transport.h" /* socket handling */
@@
-31,19
+30,19
@@
#include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
/**
#include "gras/DataDesc/datadesc_interface.h" /* semi-public API */
/**
- * aligned:
+ *
ddt_
aligned:
*
* Align the data v on the boundary a.
*/
*
* 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))
-extern xbt_set_t gras_datadesc_set_local;
+
/*@null@*/
extern xbt_set_t gras_datadesc_set_local;
void gras_ddt_freev(void *ddt);
/*******************************************
* Descriptions of all known architectures *
*******************************************/
void gras_ddt_freev(void *ddt);
/*******************************************
* Descriptions of all known architectures *
*******************************************/
-#define gras_arch_count
7
+#define gras_arch_count
11
typedef enum {
gras_ddt_scalar_char = 0,
gras_ddt_scalar_short = 1,
typedef enum {
gras_ddt_scalar_char = 0,
gras_ddt_scalar_short = 1,
@@
-63,9
+62,7
@@
typedef struct {
int endian;
int endian;
- int sizeofs[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;
int boundaries[9]; /* idem */
} gras_arch_desc_t;
@@
-92,9
+89,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_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;
/*------------------------------------------------*/
} gras_datadesc_type_category_t;
/*------------------------------------------------*/
@@
-111,8
+107,8
@@
typedef struct s_gras_dd_cat_field {
long int offset[gras_arch_count];
gras_datadesc_type_t type;
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;
} s_gras_dd_cat_field_t,*gras_dd_cat_field_t;
@@
-134,7
+130,7
@@
enum e_gras_dd_scalar_encoding {
};
typedef struct s_gras_dd_cat_scalar {
enum e_gras_dd_scalar_encoding 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;
/**
} gras_dd_cat_scalar_t;
/**
@@
-187,17
+183,6
@@
typedef struct s_gras_dd_cat_array {
} gras_dd_cat_array_t;
} 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:
*
/**
* u_gras_datadesc_category:
*
@@
-210,10
+195,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_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 */
/****************************************/
/****************************************/
/* The holy grail: type descriptor type */
/****************************************/
@@
-240,7
+223,12
@@
typedef struct s_gras_datadesc_type {
gras_datadesc_type_cb_void_t send;
gras_datadesc_type_cb_void_t recv;
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;
/***************************
} s_gras_datadesc_type_t;
/***************************
@@
-248,7
+236,7
@@
typedef struct s_gras_datadesc_type {
***************************/
void gras_datadesc_free(gras_datadesc_type_t *type);
***************************/
void gras_datadesc_free(gras_datadesc_type_t *type);
-gras_datadesc_type_t
+ 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_scalar(const char *name,
gras_ddt_scalar_type_t type,
enum e_gras_dd_scalar_encoding encoding);
@@
-258,14
+246,20
@@
gras_datadesc_type_t
****************************************************/
gras_cbps_t gras_cbps_new(void);
void gras_cbps_free(gras_cbps_t *state);
****************************************************/
gras_cbps_t gras_cbps_new(void);
void gras_cbps_free(gras_cbps_t *state);
+void gras_cbps_reset(gras_cbps_t state);
/***************
* Convertions *
***************/
/***************
* Convertions *
***************/
-xbt_error_t
+void
gras_dd_convert_elm(gras_datadesc_type_t type, int count,
int r_arch,
void *src, void *dst);
gras_dd_convert_elm(gras_datadesc_type_t type, int count,
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 */
#endif /* GRAS_DATADESC_PRIVATE_H */