X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e5027d10e013486f32881c05c8c90463b1549250..6fb0204d71beff637638ef52978df0e8f58453d7:/src/gras/DataDesc/datadesc.c diff --git a/src/gras/DataDesc/datadesc.c b/src/gras/DataDesc/datadesc.c index b073511561..7be56977d5 100644 --- a/src/gras/DataDesc/datadesc.c +++ b/src/gras/DataDesc/datadesc.c @@ -2,31 +2,148 @@ /* datadesc - data description in order to send/recv it in 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. */ -#include "DataDesc/datadesc_private.h" +#include "gras/DataDesc/datadesc_private.h" + +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt,gras,"Data description"); +/* FIXME: make this host-dependent using a trick such as UserData*/ +/*@null@*/xbt_set_t gras_datadesc_set_local=NULL; + + +/* callback for array size when sending strings */ +static int +_strlen_cb(/*@unused@*/gras_datadesc_type_t type,/*@unused@*/gras_cbps_t vars, void *data) { + + return 1+(int)strlen(data); +} -GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(DataDesc,GRAS); -/* FIXME: make this machine-dependent using a trick such as UserData*/ -gras_set_t *gras_datadesc_set_local=NULL; /** * gras_datadesc_init: * - * Initialize the datadesc module + * Initialize the datadesc module. + * FIXME: We assume that when neither signed nor unsigned is given, + * that means signed. To be checked by configure. **/ void gras_datadesc_init(void) { - gras_error_t errcode; + gras_datadesc_type_t ddt; /* What to add */ + /* only initialize once */ + if (gras_datadesc_set_local != NULL) + return; + VERB0("Initializing DataDesc"); - errcode = gras_set_new(&gras_datadesc_set_local); - gras_assert0(errcode==no_error, - "Impossible to create the data set containg locally known types"); + + gras_datadesc_set_local = xbt_set_new(); + + ddt = gras_datadesc_scalar("signed char", + gras_ddt_scalar_char, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("char", + gras_ddt_scalar_char, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("unsigned char", + gras_ddt_scalar_char, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("signed short int", + gras_ddt_scalar_short, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("short int", + gras_ddt_scalar_short, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("unsigned short int", + gras_ddt_scalar_short, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("signed int", + gras_ddt_scalar_int, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("int", + gras_ddt_scalar_int, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("unsigned int", + gras_ddt_scalar_int, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("signed long int", + gras_ddt_scalar_long, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("long int", + gras_ddt_scalar_long, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("unsigned long int", + gras_ddt_scalar_long, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("signed long long int", + gras_ddt_scalar_long_long, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("long long int", + gras_ddt_scalar_long_long, + e_gras_dd_scalar_encoding_sint); + ddt = gras_datadesc_scalar("unsigned long long int", + gras_ddt_scalar_long_long, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("data pointer", + gras_ddt_scalar_pdata, + e_gras_dd_scalar_encoding_uint); + ddt = gras_datadesc_scalar("function pointer", + gras_ddt_scalar_pfunc, + e_gras_dd_scalar_encoding_uint); + + ddt = gras_datadesc_scalar("float", + gras_ddt_scalar_float, + e_gras_dd_scalar_encoding_float); + ddt = gras_datadesc_scalar("double", + gras_ddt_scalar_double, + e_gras_dd_scalar_encoding_float); + + ddt = gras_datadesc_array_dyn("char[]", + gras_datadesc_by_name("char"), + _strlen_cb); + ddt = gras_datadesc_ref("string",ddt); + + + ddt = gras_datadesc_struct("ex_t"); + gras_datadesc_struct_append(ddt,"msg",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"category",gras_datadesc_by_name("int")); + gras_datadesc_struct_append(ddt,"value",gras_datadesc_by_name("int")); + + gras_datadesc_struct_append(ddt,"remote",gras_datadesc_by_name("short int")); + + gras_datadesc_struct_append(ddt,"host",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"procname",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"pid",gras_datadesc_by_name("long int")); + gras_datadesc_struct_append(ddt,"file",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"line",gras_datadesc_by_name("int")); + gras_datadesc_struct_append(ddt,"func",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"used",gras_datadesc_by_name("int")); + gras_datadesc_cb_field_push(ddt,"used"); + gras_datadesc_struct_append(ddt,"bt_strings", + gras_datadesc_ref_pop_arr(gras_datadesc_by_name("string"))); + + gras_datadesc_struct_close(ddt); + + + ddt = gras_datadesc_struct("s_xbt_host_t"); + gras_datadesc_struct_append(ddt,"name",gras_datadesc_by_name("string")); + gras_datadesc_struct_append(ddt,"port",gras_datadesc_by_name("int")); + gras_datadesc_struct_close(ddt); + + ddt = gras_datadesc_ref("xbt_host_t",ddt); + + /* Dict containing the constant value (for the parsing macro) */ + gras_dd_constants = xbt_dict_new(); + } /** @@ -37,10 +154,87 @@ gras_datadesc_init(void) { void gras_datadesc_exit(void) { VERB0("Exiting DataDesc"); - gras_set_free(&gras_datadesc_set_local); + xbt_set_free(&gras_datadesc_set_local); + DEBUG0("Exited DataDesc"); } +/** This is mainly to debug */ +const char * +gras_datadesc_get_name(gras_datadesc_type_t ddt) { + return ddt?(const char*)ddt->name:"(null)"; +} +/** This is mainly to debug */ +int +gras_datadesc_get_id(gras_datadesc_type_t ddt) { + return ddt->code; +} + +/** + * gras_datadesc_size: + * + * Returns the size occuped by data of this type (on the current arch). + * + */ +int gras_datadesc_size(gras_datadesc_type_t type) { + return type?type->size[GRAS_THISARCH]:0; +} -/*** - *** BOOTSTRAPING FUNCTIONS: known within GRAS only - ***/ +/** + * gras_datadesc_type_dump: + * + * For debugging purpose + */ +void gras_datadesc_type_dump(const gras_datadesc_type_t ddt){ + int cpt; + + printf("DataDesc dump:"); + if(!ddt) { + printf("(null)\n"); + return; + } + printf ("%s (ID:%d)\n",ddt->name,ddt->code); + printf (" category: %s\n",gras_datadesc_cat_names[ddt->category_code]); + + printf (" size["); + for (cpt=0; cpt0?", ":"", + cpt == GRAS_THISARCH ? ">":"", + ddt->size[cpt], + cpt == GRAS_THISARCH ? "<":""); + } + printf ("]\n"); + + printf (" alignment["); + for (cpt=0; cpt0?", ":"", + cpt == GRAS_THISARCH ? ">":"", + ddt->alignment[cpt], + cpt == GRAS_THISARCH ? "<":""); + } + printf ("]\n"); + + printf (" aligned_size["); + for (cpt=0; cpt0?", ":"", + cpt == GRAS_THISARCH ? ">":"", + ddt->aligned_size[cpt], + cpt == GRAS_THISARCH ? "<":""); + } + printf ("]\n"); + if (ddt->category_code == e_gras_datadesc_type_cat_struct) { + gras_dd_cat_struct_t struct_data; + gras_dd_cat_field_t field; + + struct_data = ddt->category.struct_data; + xbt_dynar_foreach(struct_data.fields, cpt, field) { + printf(">>> Dump field #%d (%s) (offset=%ld)\n", + cpt,field->name,field->offset[GRAS_THISARCH]); + gras_datadesc_type_dump(field->type); + printf("<<< end dump field #%d (%s)\n",cpt,field->name); + } + } + fflush(stdout); +}