A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright lines for 2023.
[simgrid.git]
/
src
/
xbt
/
automaton
/
automaton.c
diff --git
a/src/xbt/automaton/automaton.c
b/src/xbt/automaton/automaton.c
index
708b5e1
..
f44bf6d
100644
(file)
--- a/
src/xbt/automaton/automaton.c
+++ b/
src/xbt/automaton/automaton.c
@@
-1,6
+1,6
@@
/* automaton - representation of büchi automaton */
/* automaton - representation of büchi automaton */
-/* Copyright (c) 2011-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2011-20
23
. 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. */
/* 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. */
@@
-28,17
+28,20
@@
xbt_automaton_t xbt_automaton_new(void){
return automaton;
}
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);
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
);
- state->out
= xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp
);
+ state->in
= xbt_dynar_new(sizeof(xbt_automaton_transition_t), NULL
);
+ state->out
= xbt_dynar_new(sizeof(xbt_automaton_transition_t), NULL
);
xbt_dynar_push(a->states, &state);
return state;
}
xbt_dynar_push(a->states, &state);
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);
xbt_automaton_transition_t transition = xbt_new0(struct xbt_automaton_transition, 1);
if(src != NULL){
xbt_dynar_push(src->out, &transition);
@@
-81,7
+84,7
@@
xbt_automaton_exp_label_t xbt_automaton_exp_label_new_not(xbt_automaton_exp_labe
return label;
}
return label;
}
-xbt_automaton_exp_label_t xbt_automaton_exp_label_new_predicat(char* p)
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new_predicat(c
onst c
har* p)
{
xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
label->type = AUT_PREDICAT;
{
xbt_automaton_exp_label_t label = xbt_new0(struct xbt_automaton_exp_label, 1);
label->type = AUT_PREDICAT;
@@
-96,16
+99,19
@@
xbt_automaton_exp_label_t xbt_automaton_exp_label_new_one(void)
return label;
}
return label;
}
-xbt_dynar_t xbt_automaton_get_states(xbt_automaton_t a){
+xbt_dynar_t xbt_automaton_get_states(const_xbt_automaton_t a)
+{
return a->states;
}
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;
}
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;
{
xbt_automaton_transition_t transition;
unsigned int cursor;
@@
-116,11
+122,13
@@
xbt_automaton_transition_t xbt_automaton_get_transition(XBT_ATTRIB_UNUSED xbt_au
return NULL;
}
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;
}
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;
}
return t->dst;
}
@@
-134,15
+142,18
@@
void xbt_automaton_transition_set_destination(xbt_automaton_transition_t t, xbt_
xbt_dynar_push(dst->in,&t);
}
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;
}
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;
}
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){
xbt_automaton_state_t state = NULL;
unsigned int cursor = 0;
xbt_dynar_foreach(a->states, cursor, state){
@@
-152,7
+163,8
@@
xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
return NULL;
}
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;
unsigned int cursor;
xbt_automaton_state_t state = NULL;
@@
-173,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:
printf("(");
switch(label->type){
case 0:
@@
-202,7
+215,8
@@
void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){
printf(")");
}
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;
}
return a->current_state;
}
@@
-211,7
+225,7
@@
static int call_simple_function(int function(void) )
return 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);
int (*fct)(void))
{
xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
@@
-223,7
+237,7
@@
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_
return 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)
{
const char* id,
int* value)
{
@@
-237,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_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);
xbt_automaton_propositional_symbol_free_function_type free_function)
{
xbt_automaton_propositional_symbol_t prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
@@
-249,7
+263,7
@@
XBT_PUBLIC xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symb
return prop_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);
{
if (symbol->callback)
return (symbol->callback)(symbol->data);
@@
-258,34
+272,35
@@
XBT_PUBLIC int xbt_automaton_propositional_symbol_evaluate(xbt_automaton_proposi
}
XBT_PUBLIC xbt_automaton_propositional_symbol_callback_type
}
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;
}
{
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;
}
{
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;
}
{
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*/
return (strcmp(s1->id, s2->id) != 0) || (s1->type != s2->type);
}
/* single id for each state, id and type sufficient for comparison*/
return (strcmp(s1->id, s2->id) != 0) || (s1->type != s2->type);
}
-int xbt_automaton_transition_compare(
xbt_automaton_transition_t t1,
xbt_automaton_transition_t t2)
+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);
}
{
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;
if(l1->type != l2->type)
return 1;
@@
-312,12
+327,13
@@
int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_
return res;
}
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);
+int xbt_automaton_propositional_symbols_compare_value(const_xbt_dynar_t s1, const_xbt_dynar_t s2)
+{
+ unsigned long 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);
+ for (unsigned
long
cursor = 0; cursor < nb_elem; cursor++) {
+
const
int* iptr1 = xbt_dynar_get_ptr(s1, cursor);
+
const
int* iptr2 = xbt_dynar_get_ptr(s2, cursor);
if(*iptr1 != *iptr2)
return 1;
}
if(*iptr1 != *iptr2)
return 1;
}
@@
-330,12
+346,12
@@
static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e);
static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps);
void xbt_automaton_state_free(xbt_automaton_state_t s){
static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps);
void xbt_automaton_state_free(xbt_automaton_state_t s){
- if (s
!= NULL) {
-
xbt_free(s->id)
;
-
xbt_dynar_free(&(s->in)
);
-
xbt_dynar_free(&(s->out
));
-
xbt_free(s
);
- }
+ if (s
== NULL)
+
return
;
+
xbt_free(s->id
);
+
xbt_dynar_free(&(s->in
));
+
xbt_dynar_free(&(s->out)
);
+ xbt_free(s);
}
void xbt_automaton_state_free_voidp(void *s){
}
void xbt_automaton_state_free_voidp(void *s){
@@
-343,11
+359,10
@@
void xbt_automaton_state_free_voidp(void *s){
}
static void xbt_automaton_transition_free(xbt_automaton_transition_t t){
}
static void xbt_automaton_transition_free(xbt_automaton_transition_t t){
- if(t){
- xbt_automaton_exp_label_free(t->label);
- xbt_free(t);
- t = NULL;
- }
+ if (t == NULL)
+ return;
+ xbt_automaton_exp_label_free(t->label);
+ xbt_free(t);
}
void xbt_automaton_transition_free_voidp(void *t){
}
void xbt_automaton_transition_free_voidp(void *t){
@@
-355,25
+370,24
@@
void xbt_automaton_transition_free_voidp(void *t){
}
static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e){
}
static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e){
- if(e){
- switch(e->type){
- case 0:
- case 1:
+ if (e == NULL)
+ return;
+ switch (e->type) {
+ case AUT_OR:
+ case AUT_AND:
xbt_automaton_exp_label_free(e->u.or_and.left_exp);
xbt_automaton_exp_label_free(e->u.or_and.right_exp);
break;
xbt_automaton_exp_label_free(e->u.or_and.left_exp);
xbt_automaton_exp_label_free(e->u.or_and.right_exp);
break;
- case
2
:
+ case
AUT_NOT
:
xbt_automaton_exp_label_free(e->u.exp_not);
break;
xbt_automaton_exp_label_free(e->u.exp_not);
break;
- case
3
:
+ case
AUT_PREDICAT
:
xbt_free(e->u.predicat);
break;
default:
break;
xbt_free(e->u.predicat);
break;
default:
break;
- }
- xbt_free(e);
- e = NULL;
}
}
+ xbt_free(e);
}
void xbt_automaton_exp_label_free_voidp(void *e){
}
void xbt_automaton_exp_label_free_voidp(void *e){
@@
-381,27
+395,23
@@
void xbt_automaton_exp_label_free_voidp(void *e){
}
static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps){
}
static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps){
- if(ps){
- xbt_free(ps->pred);
- xbt_free(ps);
- ps = NULL;
- }
+ if (ps == NULL)
+ return;
+ if (ps->free_function)
+ ps->free_function(ps->data);
+ xbt_free(ps->pred);
+ xbt_free(ps);
}
void xbt_automaton_propositional_symbol_free_voidp(void *ps){
}
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_automaton_propositional_symbol_free(symbol);
+ xbt_automaton_propositional_symbol_free((xbt_automaton_propositional_symbol_t) * (void**)ps);
}
void xbt_automaton_free(xbt_automaton_t a){
}
void xbt_automaton_free(xbt_automaton_t a){
- if(a){
- xbt_dynar_free(&(a->propositional_symbols));
- xbt_dynar_free(&(a->transitions));
- xbt_dynar_free(&(a->states));
- xbt_automaton_state_free(a->current_state);
- xbt_free(a);
- a = NULL;
- }
+ if (a == NULL)
+ return;
+ xbt_dynar_free(&(a->propositional_symbols));
+ xbt_dynar_free(&(a->transitions));
+ xbt_dynar_free(&(a->states));
+ xbt_free(a);
}
}