X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13fb4af932a02ea0bd4293d1e55ac071de326f80..68573f41da7750f37ddef384d5231370a6542998:/src/xbt/automaton/automaton.c diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c index 008ead8886..708b5e1abf 100644 --- a/src/xbt/automaton/automaton.c +++ b/src/xbt/automaton/automaton.c @@ -1,13 +1,13 @@ /* automaton - representation of büchi automaton */ -/* Copyright (c) 2011-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2011-2019. The SimGrid Team. 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. */ #include "xbt/automaton.h" #include /* printf */ +#include struct xbt_automaton_propositional_symbol{ char* pred; @@ -21,8 +21,7 @@ struct xbt_automaton_propositional_symbol{ }; xbt_automaton_t xbt_automaton_new(void){ - xbt_automaton_t automaton = NULL; - automaton = xbt_new0(struct xbt_automaton, 1); + xbt_automaton_t automaton = xbt_new0(struct xbt_automaton, 1); automaton->states = xbt_dynar_new(sizeof(xbt_automaton_state_t), xbt_automaton_state_free_voidp); automaton->transitions = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp); automaton->propositional_symbols = xbt_dynar_new(sizeof(xbt_automaton_propositional_symbol_t), xbt_automaton_propositional_symbol_free_voidp); @@ -30,8 +29,7 @@ xbt_automaton_t xbt_automaton_new(void){ } xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* id){ - xbt_automaton_state_t state = NULL; - state = xbt_new0(struct xbt_automaton_state, 1); + xbt_automaton_state_t state = xbt_new0(struct xbt_automaton_state, 1); state->type = type; state->id = xbt_strdup(id); state->in = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp); @@ -41,8 +39,7 @@ xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* } xbt_automaton_transition_t xbt_automaton_transition_new(xbt_automaton_t a, xbt_automaton_state_t src, xbt_automaton_state_t dst, xbt_automaton_exp_label_t label){ - xbt_automaton_transition_t transition = NULL; - transition = xbt_new0(struct xbt_automaton_transition, 1); + xbt_automaton_transition_t transition = xbt_new0(struct xbt_automaton_transition, 1); if(src != NULL){ xbt_dynar_push(src->out, &transition); transition->src = src; @@ -56,38 +53,46 @@ xbt_automaton_transition_t xbt_automaton_transition_new(xbt_automaton_t a, xbt_a return transition; } -xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){ +xbt_automaton_exp_label_t xbt_automaton_exp_label_new_or(xbt_automaton_exp_label_t left, + xbt_automaton_exp_label_t right) +{ xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1); - label->type = type; - xbt_automaton_exp_label_t left; - xbt_automaton_exp_label_t right; - xbt_automaton_exp_label_t exp_not; - char *p; - va_list ap; - va_start(ap, type); - switch(type){ - case 0 : - left = va_arg(ap, xbt_automaton_exp_label_t); - right = va_arg(ap, xbt_automaton_exp_label_t); - label->u.or_and.left_exp = left; - label->u.or_and.right_exp = right; - break; - case 1 : - left = va_arg(ap, xbt_automaton_exp_label_t); - right = va_arg(ap, xbt_automaton_exp_label_t); - label->u.or_and.left_exp = left; - label->u.or_and.right_exp = right; - break; - case 2 : - exp_not = va_arg(ap, xbt_automaton_exp_label_t); - label->u.exp_not = exp_not; - break; - case 3 : - p = va_arg(ap, char*); - label->u.predicat = xbt_strdup(p); - break; - } - va_end(ap); + label->type = AUT_OR; + label->u.or_and.left_exp = left; + label->u.or_and.right_exp = right; + return label; +} + +xbt_automaton_exp_label_t xbt_automaton_exp_label_new_and(xbt_automaton_exp_label_t left, + xbt_automaton_exp_label_t right) +{ + xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1); + label->type = AUT_AND; + label->u.or_and.left_exp = left; + label->u.or_and.right_exp = right; + return label; +} + +xbt_automaton_exp_label_t xbt_automaton_exp_label_new_not(xbt_automaton_exp_label_t exp_not) +{ + xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1); + label->type = AUT_NOT; + label->u.exp_not = exp_not; + return label; +} + +xbt_automaton_exp_label_t xbt_automaton_exp_label_new_predicat(char* p) +{ + xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1); + label->type = AUT_PREDICAT; + label->u.predicat = xbt_strdup(p); + return label; +} + +xbt_automaton_exp_label_t xbt_automaton_exp_label_new_one(void) +{ + xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1); + label->type = AUT_ONE; return label; } @@ -99,7 +104,9 @@ xbt_dynar_t xbt_automaton_get_transitions(xbt_automaton_t a){ return a->transitions; } -xbt_automaton_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_automaton_state_t src, xbt_automaton_state_t dst){ +xbt_automaton_transition_t xbt_automaton_get_transition(XBT_ATTRIB_UNUSED xbt_automaton_t a, xbt_automaton_state_t src, + xbt_automaton_state_t dst) +{ xbt_automaton_transition_t transition; unsigned int cursor; xbt_dynar_foreach(src->out, cursor, transition){ @@ -199,26 +206,28 @@ xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){ return a->current_state; } -static int call_simple_function(void* function) +static int call_simple_function(int function(void) ) { - return ((int (*)(void)) function)(); + return function(); } -xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, int(*fct)(void)){ - xbt_automaton_propositional_symbol_t prop_symb = NULL; - prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); +xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, + int (*fct)(void)) +{ + xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); prop_symb->pred = xbt_strdup(id); - prop_symb->callback = &call_simple_function; - prop_symb->data = fct; + prop_symb->callback = ((int (*)(void *))&call_simple_function); + prop_symb->data = (void*)&fct; prop_symb->free_function = NULL; xbt_dynar_push(a->propositional_symbols, &prop_symb); return prop_symb; } -XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new_pointer(xbt_automaton_t a, const char* id, int* value) +XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new_pointer(xbt_automaton_t a, + const char* id, + int* value) { - xbt_automaton_propositional_symbol_t prop_symb = NULL; - prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); + xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); prop_symb->pred = xbt_strdup(id); prop_symb->callback = NULL; prop_symb->data = value; @@ -227,13 +236,11 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym return prop_symb; } -XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new_callback( - xbt_automaton_t a, const char* id, - xbt_automaton_propositional_symbol_callback_type callback, - void* data, xbt_automaton_propositional_symbol_free_function_type free_function) +XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new_callback( + xbt_automaton_t a, const char* id, xbt_automaton_propositional_symbol_callback_type callback, void* data, + xbt_automaton_propositional_symbol_free_function_type free_function) { - xbt_automaton_propositional_symbol_t prop_symb = NULL; - prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); + xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1); prop_symb->pred = xbt_strdup(id); prop_symb->callback = callback; prop_symb->data = data; @@ -242,7 +249,7 @@ XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_sym return prop_symb; } -XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol) +XBT_PUBLIC int xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol) { if (symbol->callback) return (symbol->callback)(symbol->data); @@ -250,48 +257,31 @@ XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propos return *(int*) symbol->data; } -XBT_PUBLIC(xbt_automaton_propositional_symbol_callback_type) xbt_automaton_propositional_symbol_get_callback(xbt_automaton_propositional_symbol_t symbol) +XBT_PUBLIC xbt_automaton_propositional_symbol_callback_type +xbt_automaton_propositional_symbol_get_callback(xbt_automaton_propositional_symbol_t symbol) { return symbol->callback; } -XBT_PUBLIC(void*) xbt_automaton_propositional_symbol_get_data(xbt_automaton_propositional_symbol_t symbol) +XBT_PUBLIC void* xbt_automaton_propositional_symbol_get_data(xbt_automaton_propositional_symbol_t symbol) { return symbol->data; } -XBT_PUBLIC(const char*) xbt_automaton_propositional_symbol_get_name(xbt_automaton_propositional_symbol_t symbol) +XBT_PUBLIC const char* xbt_automaton_propositional_symbol_get_name(xbt_automaton_propositional_symbol_t symbol) { return symbol->pred; } int xbt_automaton_state_compare(xbt_automaton_state_t s1, xbt_automaton_state_t s2){ - /* single id for each state, id and type sufficient for comparison*/ - - if(strcmp(s1->id, s2->id)) - return 1; - - if(s1->type != s2->type) - return 1; - - return 0; - + return (strcmp(s1->id, s2->id) != 0) || (s1->type != s2->type); } -int xbt_automaton_transition_compare(const void *t1, const void *t2){ - - if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->src, ((xbt_automaton_transition_t)t2)->src)) - return 1; - - if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->dst, ((xbt_automaton_transition_t)t2)->dst)) - return 1; - - if(xbt_automaton_exp_label_compare(((xbt_automaton_transition_t)t1)->label,((xbt_automaton_transition_t)t2)->label)) - return 1; - - return 0; - +int xbt_automaton_transition_compare(xbt_automaton_transition_t t1, xbt_automaton_transition_t t2) +{ + return xbt_automaton_state_compare(t1->src, t2->src) || xbt_automaton_state_compare(t1->dst, t2->dst) || + xbt_automaton_exp_label_compare(t1->label, t2->label); } int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_exp_label_t l2){ @@ -299,27 +289,27 @@ int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_ if(l1->type != l2->type) return 1; + int res; switch(l1->type){ case 0 : // OR case 1 : // AND - if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp)) - return 1; - else - return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp); + res = xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp) || + xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp); break; case 2 : // NOT - return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not); + res = xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not); break; case 3 : // predicat - return (strcmp(l1->u.predicat, l2->u.predicat)); + res = strcmp(l1->u.predicat, l2->u.predicat) != 0; break; case 4 : // 1 - return 0; + res = 0; break; default : - return -1; + res = -1; break; } + return res; } int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){ @@ -402,7 +392,6 @@ void xbt_automaton_propositional_symbol_free_voidp(void *ps){ xbt_automaton_propositional_symbol_t symbol = (xbt_automaton_propositional_symbol_t) * (void **) ps; if (symbol->free_function) symbol->free_function(symbol->data); - xbt_free(symbol->pred); xbt_automaton_propositional_symbol_free(symbol); }