X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64cfda658ffbc436445589f1a7a9afce2e41fb5a..149bb47d6678075c2372dd823d19f16d4a2ec562:/src/xbt/automaton/automaton.c diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c index a60182779e..3d393193e3 100644 --- a/src/xbt/automaton/automaton.c +++ b/src/xbt/automaton/automaton.c @@ -1,17 +1,14 @@ /* automaton - representation of büchi automaton */ -/* Copyright (c) 2011-2018. 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 #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_automaton, xbt, "Automaton"); - struct xbt_automaton_propositional_symbol{ char* pred; /** Callback used to evaluate the value of the symbol */ @@ -31,7 +28,8 @@ xbt_automaton_t xbt_automaton_new(void){ return automaton; } -xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* id){ +xbt_automaton_state_t xbt_automaton_state_new(const_xbt_automaton_t a, int type, const char* id) +{ xbt_automaton_state_t state = xbt_new0(struct xbt_automaton_state, 1); state->type = type; state->id = xbt_strdup(id); @@ -41,7 +39,9 @@ xbt_automaton_state_t xbt_automaton_state_new(xbt_automaton_t a, int type, char* return state; } -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 xbt_automaton_transition_new(const_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 = xbt_new0(struct xbt_automaton_transition, 1); if(src != NULL){ xbt_dynar_push(src->out, &transition); @@ -56,58 +56,62 @@ 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; - case 4: - break; - default: - XBT_DEBUG("Invalid type: %d", type); - xbt_free(label); - label = NULL; - 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_dynar_t xbt_automaton_get_states(xbt_automaton_t a){ +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(const 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; +} + +xbt_dynar_t xbt_automaton_get_states(const_xbt_automaton_t a) +{ return a->states; } -xbt_dynar_t xbt_automaton_get_transitions(xbt_automaton_t a){ +xbt_dynar_t xbt_automaton_get_transitions(const_xbt_automaton_t a) +{ return a->transitions; } -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 xbt_automaton_get_transition(XBT_ATTRIB_UNUSED const_xbt_automaton_t a, + const_xbt_automaton_state_t src, + const_xbt_automaton_state_t dst) { xbt_automaton_transition_t transition; unsigned int cursor; @@ -118,11 +122,13 @@ xbt_automaton_transition_t xbt_automaton_get_transition(XBT_ATTRIB_UNUSED xbt_au return NULL; } -xbt_automaton_state_t xbt_automaton_transition_get_source(xbt_automaton_transition_t t){ +xbt_automaton_state_t xbt_automaton_transition_get_source(const_xbt_automaton_transition_t t) +{ return t->src; } -xbt_automaton_state_t xbt_automaton_transition_get_destination(xbt_automaton_transition_t t){ +xbt_automaton_state_t xbt_automaton_transition_get_destination(const_xbt_automaton_transition_t t) +{ return t->dst; } @@ -136,15 +142,18 @@ void xbt_automaton_transition_set_destination(xbt_automaton_transition_t t, xbt_ xbt_dynar_push(dst->in,&t); } -xbt_dynar_t xbt_automaton_state_get_out_transitions(xbt_automaton_state_t s){ +xbt_dynar_t xbt_automaton_state_get_out_transitions(const_xbt_automaton_state_t s) +{ return s->out; } -xbt_dynar_t xbt_automaton_state_get_in_transitions(xbt_automaton_state_t s){ +xbt_dynar_t xbt_automaton_state_get_in_transitions(const_xbt_automaton_state_t s) +{ return s->in; } -xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){ +xbt_automaton_state_t xbt_automaton_state_exists(const_xbt_automaton_t a, const char* id) +{ xbt_automaton_state_t state = NULL; unsigned int cursor = 0; xbt_dynar_foreach(a->states, cursor, state){ @@ -154,7 +163,8 @@ xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){ return NULL; } -void xbt_automaton_display(xbt_automaton_t a){ +void xbt_automaton_display(const_xbt_automaton_t a) +{ unsigned int cursor; xbt_automaton_state_t state = NULL; @@ -175,7 +185,8 @@ void xbt_automaton_display(xbt_automaton_t a){ } } -void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){ +void xbt_automaton_exp_label_display(const_xbt_automaton_exp_label_t label) +{ printf("("); switch(label->type){ case 0: @@ -204,28 +215,29 @@ void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){ printf(")"); } -xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){ +xbt_automaton_state_t xbt_automaton_get_current_state(const_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, +xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(const_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, +XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new_pointer(const_xbt_automaton_t a, const char* id, int* value) { @@ -239,7 +251,7 @@ XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_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, + const_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 = xbt_new0(struct xbt_automaton_propositional_symbol, 1); @@ -251,7 +263,7 @@ XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symb 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(const_xbt_automaton_propositional_symbol_t symbol) { if (symbol->callback) return (symbol->callback)(symbol->data); @@ -260,84 +272,67 @@ XBT_PUBLIC int xbt_automaton_propositional_symbol_evaluate(xbt_automaton_proposi } XBT_PUBLIC xbt_automaton_propositional_symbol_callback_type -xbt_automaton_propositional_symbol_get_callback(xbt_automaton_propositional_symbol_t symbol) +xbt_automaton_propositional_symbol_get_callback(const_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(const_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(const_xbt_automaton_propositional_symbol_t symbol) { return symbol->pred; } -int xbt_automaton_state_compare(xbt_automaton_state_t s1, xbt_automaton_state_t s2){ - +int xbt_automaton_state_compare(const_xbt_automaton_state_t s1, const_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(const_xbt_automaton_transition_t t1, const_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){ - +int xbt_automaton_exp_label_compare(const_xbt_automaton_exp_label_t l1, const_xbt_automaton_exp_label_t l2) +{ 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){ unsigned int nb_elem = xbt_dynar_length(s1); for (unsigned int cursor = 0; cursor < nb_elem; cursor++) { - int* iptr1 = xbt_dynar_get_ptr(s1, cursor); - int* iptr2 = xbt_dynar_get_ptr(s2, cursor); + const int* iptr1 = xbt_dynar_get_ptr(s1, cursor); + const int* iptr2 = xbt_dynar_get_ptr(s2, cursor); if(*iptr1 != *iptr2) return 1; }