/* module's private interface masked even to other parts of GRAS. */
-/* Authors: Olivier Aumage, Martin Quinson */
-/* Copyright (C) 2003, 2004 the GRAS posse. */
+/* Copyright (c) 2003 Olivier Aumage. */
+/* Copyright (c) 2003, 2004 Martin Quinson. */
+/* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#ifndef GRAS_DATADESC_PRIVATE_H
#define GRAS_DATADESC_PRIVATE_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"
*/
#define aligned(v, a) (((v) + (a - 1)) & ~(a - 1))
-extern gras_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 *
*******************************************/
-#define gras_arch_count 5
+#define gras_arch_count 9
typedef enum {
gras_ddt_scalar_char = 0,
gras_ddt_scalar_short = 1,
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;
/*------------------------------------------------*/
char *name;
long int offset[gras_arch_count];
- gras_datadesc_type_t *type;
+ 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;
-} 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_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 {
- gras_datadesc_type_t *type;
+ gras_datadesc_type_t type;
/* callback used to return the referenced type number */
gras_datadesc_selector_t selector;
* 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;
} 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:
*
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 */
/****************************************/
*
* Type descriptor.
*/
-struct s_gras_datadesc_type {
+typedef struct s_gras_datadesc_type {
/* headers for the data set */
unsigned int code;
char *name;
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;
/***************************
* constructor/desctructor *
***************************/
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);
/****************************************************
* Callback persistant state constructor/destructor *
****************************************************/
-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);
/***************
* Convertions *
***************/
-gras_error_t
-gras_dd_convert_elm(gras_datadesc_type_t *type, int count,
+void
+gras_dd_convert_elm(gras_datadesc_type_t type, int count,
int r_arch,
void *src, void *dst);