X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/445909d108dd025a885a6b33fa6f26b2a8582ae3..06080b9bcef5afd02c6235ba1468c7fd3c3146b3:/src/gras/DataDesc/ddt_parse.c diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c index 64361e2063..2bdd1229fe 100644 --- a/src/gras/DataDesc/ddt_parse.c +++ b/src/gras/DataDesc/ddt_parse.c @@ -15,19 +15,22 @@ #include "gras/DataDesc/datadesc_private.h" #include "gras/DataDesc/ddt_parse.yy.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_parse,datadesc, +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_parse,gras_ddt, "Parsing C data structures to build GRAS data description"); typedef struct s_type_modifier{ - short is_unsigned; - short is_short; short is_long; + int is_unsigned:1; + int is_short:1; - short is_struct; - short is_union; - short is_enum; + int is_struct:1; + int is_union:1; + int is_enum:1; - short is_ref; + int is_ref:1; + + int is_dynar:2; + int is_matrix:2; } s_type_modifier_t,*type_modifier_t; typedef struct s_field { @@ -163,6 +166,49 @@ static void change_to_ref_pop_array(xbt_dynar_t dynar) { XBT_OUT; } +static void change_to_dynar_of(xbt_dynar_t dynar,gras_datadesc_type_t subtype) { + s_identifier_t former,ref; + memset(&ref,0,sizeof(ref)); + + XBT_IN; + xbt_dynar_pop(dynar,&former); + ref.type = gras_datadesc_dynar(subtype,NULL); /* redeclaration are ignored */ + ref.type_name = (char*)strdup(ref.type->name); + ref.name = former.name; + + free(former.type_name); + + xbt_dynar_push(dynar,&ref); + XBT_OUT; +} + +static void change_to_matrix_of(xbt_dynar_t dynar,gras_datadesc_type_t subtype) { + s_identifier_t former,ref; + memset(&ref,0,sizeof(ref)); + + XBT_IN; + xbt_dynar_pop(dynar,&former); + ref.type = gras_datadesc_matrix(subtype,NULL); /* redeclaration are ignored */ + ref.type_name = (char*)strdup(ref.type->name); + ref.name = former.name; + + free(former.type_name); + + xbt_dynar_push(dynar,&ref); + XBT_OUT; +} + +static void add_free_f(xbt_dynar_t dynar,void_f_pvoid_t free_f) { + s_identifier_t former,ref; + memset(&ref,0,sizeof(ref)); + + XBT_IN; + xbt_dynar_pop(dynar,&former); + memcpy(former.type->extra,&free_f, sizeof(free_f)); + xbt_dynar_push(dynar,&former); + XBT_OUT; +} + static void parse_statement(char *definition, xbt_dynar_t identifiers, xbt_dynar_t fields_to_push) { @@ -181,7 +227,7 @@ static void parse_statement(char *definition, THROW0(mismatch_error,0,"End of the englobing structure or union"); } - if (XBT_LOG_ISENABLED(ddt_parse,xbt_log_priority_debug)) { + if (XBT_LOG_ISENABLED(gras_ddt_parse,xbt_log_priority_debug)) { int colon_pos; for (colon_pos = gras_ddt_parse_col_pos; definition[colon_pos] != ';'; @@ -283,14 +329,23 @@ static void parse_statement(char *definition, } else { DEBUG1("Base type is a constructed one (%s)",identifier.type_name); - identifier.type = gras_datadesc_by_name(identifier.type_name); - if (!identifier.type) - PARSE_ERROR1("Unknown base type '%s'",identifier.type_name); + if (!strcmp(identifier.type_name,"xbt_matrix_t")) { + identifier.tm.is_matrix = 1; + } else if (!strcmp(identifier.type_name,"xbt_dynar_t")) { + identifier.tm.is_dynar = 1; + } else { + identifier.type = gras_datadesc_by_name(identifier.type_name); + if (!identifier.type) + PARSE_ERROR1("Unknown base type '%s'",identifier.type_name); + } } } /* Now identifier.type and identifier.name speak about the base type. Stars are not eaten unless 'int' was omitted. - We will have to enhance it if we are in fact asked for array or reference */ + We will have to enhance it if we are in fact asked for array or reference. + + Dynars and matrices also need some extra love (prodiged as annotations) + */ /**** look for the symbols of this type ****/ for(expect_id_separator = 0; @@ -315,8 +370,16 @@ static void parse_statement(char *definition, char *end; long int size=strtol(gras_ddt_parse_text, &end, 10); - if (end == gras_ddt_parse_text || *end != '\0') - PARSE_ERROR1("Unparsable size of array (found '%c', expected number)",*end); + if (end == gras_ddt_parse_text || *end != '\0') { + /* Not a number. Get the constant value, if any */ + int *storage=xbt_dict_get_or_null(gras_dd_constants,gras_ddt_parse_text); + if (storage) { + size = *storage; + } else { + PARSE_ERROR1("Unparsable size of array. Found '%s', expected number or known constant. Need to use gras_datadesc_set_const(), huh?", + gras_ddt_parse_text); + } + } /* replace the previously pushed type to an array of it */ change_to_fixed_array(identifiers,size); @@ -358,15 +421,14 @@ static void parse_statement(char *definition, while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) == GRAS_DDT_PARSE_TOKEN_EMPTY ); + /* get the value */ + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_WORD) PARSE_ERROR1("Unparsable annotation: Expected key value, got '%s'",gras_ddt_parse_text); keyval = (char*)strdup(gras_ddt_parse_text); while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) == GRAS_DDT_PARSE_TOKEN_EMPTY ); - if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_RP) - PARSE_ERROR1("Unparsable annotation: Expected parenthesis, got '%s'",gras_ddt_parse_text); - /* Done with parsing the annotation. Now deal with it by replacing previously pushed type with the right one */ DEBUG2("Anotation: %s=%s",keyname,keyval); @@ -379,7 +441,6 @@ static void parse_statement(char *definition, if (!strcmp(keyval,"1")) { change_to_ref(identifiers); free(keyval); - continue; } else { char *p; int fixed = 1; @@ -390,19 +451,64 @@ static void parse_statement(char *definition, change_to_fixed_array(identifiers,atoi(keyval)); change_to_ref(identifiers); free(keyval); - continue; } else { change_to_ref_pop_array(identifiers); xbt_dynar_push(fields_to_push,&keyval); - continue; } } - THROW_IMPOSSIBLE; - + } else if (!strcmp(keyname,"subtype")) { + gras_datadesc_type_t subtype = gras_datadesc_by_name(keyval); + if (identifier.tm.is_matrix) { + change_to_matrix_of(identifiers,subtype); + identifier.tm.is_matrix = -1; + } else if (identifier.tm.is_dynar) { + change_to_dynar_of(identifiers,subtype); + identifier.tm.is_dynar = -1; + } else { + PARSE_ERROR1("subtype annotation only accepted for dynars and matrices, but passed to '%s'",identifier.type_name); + } + } else if (!strcmp(keyname,"free_f")) { + int *storage=xbt_dict_get_or_null(gras_dd_constants,keyval); + if (!storage) + PARSE_ERROR1("value for free_f annotation of field %s is not a known constant",identifier.name); + if (identifier.tm.is_matrix == -1) { + add_free_f(identifiers,*(void_f_pvoid_t**)storage); + identifier.tm.is_matrix = 0; + } else if (identifier.tm.is_dynar == -1) { + add_free_f(identifiers,*(void_f_pvoid_t**)storage); + identifier.tm.is_dynar = 0; + } else { + PARSE_ERROR1("free_f annotation only accepted for dynars and matrices which subtype is already declared (field %s)", + identifier.name); + } } else { PARSE_ERROR1("Unknown annotation type: '%s'",keyname); } + + /* Get all the multipliers */ + while (gras_ddt_parse_tok_num == GRAS_DDT_PARSE_TOKEN_STAR) { + + gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump(); + + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_WORD) + PARSE_ERROR1("Unparsable annotation: Expected field name after '*', got '%s'",gras_ddt_parse_text); + + keyval = xbt_malloc(strlen(gras_ddt_parse_text)+2); + sprintf(keyval,"*%s",gras_ddt_parse_text); + + /* ask caller to push field as a multiplier */ + xbt_dynar_push(fields_to_push,&keyval); + + /* skip blanks after this block*/ + while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) + == GRAS_DDT_PARSE_TOKEN_EMPTY ); + } + + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_RP) + PARSE_ERROR1("Unparsable annotation: Expected parenthesis, got '%s'", + gras_ddt_parse_text); + continue; /* End of annotation handling */ @@ -433,6 +539,11 @@ static void parse_statement(char *definition, PARSE_ERROR0("Unparasable symbol (maybe a def struct in a def struct or a parser bug ;)"); } + if (identifier.tm.is_matrix>0) + PARSE_ERROR0("xbt_matrix_t field without 'subtype' annotation"); + if (identifier.tm.is_dynar>0) + PARSE_ERROR0("xbt_dynar_t field without 'subtype' annotation"); + XBT_OUT; } @@ -503,8 +614,15 @@ static gras_datadesc_type_t parse_struct(char *definition) { /* Make sure that all fields declaring a size push it into the cbps */ xbt_dynar_foreach(fields_to_push,i, name) { DEBUG1("struct_type=%p",(void*)struct_type); - VERB2("Push field '%s' into size stack of %p", name, (void*)struct_type); - gras_datadesc_cb_field_push(struct_type, name); + if (name[0] == '*') { + VERB2("Push field '%s' as a multiplier into size stack of %p", + name+1, (void*)struct_type); + gras_datadesc_cb_field_push_multiplier(struct_type, name+1); + } else { + VERB2("Push field '%s' into size stack of %p", + name, (void*)struct_type); + gras_datadesc_cb_field_push(struct_type, name); + } free(name); } xbt_dynar_reset(fields_to_push); @@ -620,3 +738,12 @@ gras_datadesc_parse(const char *name, XBT_OUT; return res; } + +xbt_dict_t gras_dd_constants; +/** \brief Declare a constant to the parsing mecanism. See the "\#define and fixed size array" section */ +void gras_datadesc_set_const(const char*name, int value) { + int *stored = xbt_new(int, 1); + *stored=value; + + xbt_dict_set(gras_dd_constants,name, stored, free); +}