Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fix some dead assignments reported by clang scan-build
[simgrid.git] / src / xbt / automaton / automaton.c
index dffad32..35a829f 100644 (file)
@@ -1,36 +1,48 @@
 /* automaton - representation of büchi automaton */
 
-/* Copyright (c) 2011. The SimGrid Team.
+/* Copyright (c) 2011-2015. 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"
-
-xbt_automaton_t xbt_automaton_new_automaton(){
+#include <stdio.h> /* printf */
+
+struct xbt_automaton_propositional_symbol{
+  char* pred;
+  /** Callback used to evaluate the value of the symbol */
+  int (*callback)(void*);
+  /** Additional data for the callback.
+      Alternatively it can be used as a pointer to the data. */
+  void* data;
+  //** Optional callback used to free the data field */
+  void (*free_function)(void*);
+};
+
+xbt_automaton_t xbt_automaton_new(){
   xbt_automaton_t automaton = NULL;
   automaton = xbt_new0(struct xbt_automaton, 1);
-  automaton->states = xbt_dynar_new(sizeof(xbt_state_t), NULL);
-  automaton->transitions = xbt_dynar_new(sizeof(xbt_transition_t), NULL);
-  automaton->propositional_symbols = xbt_dynar_new(sizeof(xbt_propositional_symbol_t), NULL);
+  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);
   return automaton;
 }
 
-xbt_state_t xbt_automaton_new_state(xbt_automaton_t a, int type, char* id){
-  xbt_state_t state = NULL;
-  state = xbt_new0(struct xbt_state, 1);
+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);
   state->type = type;
-  state->id = strdup(id);
-  state->in = xbt_dynar_new(sizeof(xbt_transition_t), NULL);
-  state->out = xbt_dynar_new(sizeof(xbt_transition_t), NULL); 
+  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); 
   xbt_dynar_push(a->states, &state);
   return state;
 }
 
-xbt_transition_t xbt_automaton_new_transition(xbt_automaton_t a, xbt_state_t src, xbt_state_t dst, xbt_exp_label_t label){
-  xbt_transition_t transition = NULL;
-  transition = xbt_new0(struct xbt_transition, 1);
+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);
   if(src != NULL){
     xbt_dynar_push(src->out, &transition);
     transition->src = src;
@@ -44,36 +56,36 @@ xbt_transition_t xbt_automaton_new_transition(xbt_automaton_t a, xbt_state_t src
   return transition;
 }
 
-xbt_exp_label_t xbt_automaton_new_label(int type, ...){
-  xbt_exp_label_t label = NULL;
-  label = xbt_new0(struct xbt_exp_label, 1);
+xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){
+  xbt_automaton_exp_label_t label = NULL;
+  label = xbt_new0(struct xbt_automaton_exp_label, 1);
   label->type = type;
 
   va_list ap;
   va_start(ap, type);
   switch(type){
   case 0 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
+    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
+    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 : {
-    xbt_exp_label_t left = va_arg(ap, xbt_exp_label_t);
-    xbt_exp_label_t right = va_arg(ap, xbt_exp_label_t);
+    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
+    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 : {
-    xbt_exp_label_t exp_not = va_arg(ap, xbt_exp_label_t);
+    xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
     label->u.exp_not = exp_not;
     break;
   }
   case 3 :{
     char* p = va_arg(ap, char*);
-    label->u.predicat = strdup(p);
+    label->u.predicat = xbt_strdup(p);
     break;
   }
   }
@@ -90,8 +102,8 @@ xbt_dynar_t xbt_automaton_get_transitions(xbt_automaton_t a){
   return a->transitions;
 }
 
-xbt_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_state_t src, xbt_state_t dst){
-  xbt_transition_t transition;
+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 transition;
   unsigned int cursor;
   xbt_dynar_foreach(src->out, cursor, transition){
     if((transition->src == src) && (transition->dst == dst))
@@ -100,113 +112,34 @@ xbt_transition_t xbt_automaton_get_transition(xbt_automaton_t a, xbt_state_t src
   return NULL;
 }
 
-void xbt_automaton_free_automaton(xbt_automaton_t a, void_f_pvoid_t transition_free_function){
-  unsigned int cursor = 0;
-  xbt_state_t state = NULL;
-  xbt_transition_t transition = NULL;
-
-  xbt_dynar_foreach(a->states, cursor, state){
-    xbt_dynar_free(&(state->out));
-    xbt_dynar_free(&(state->in));
-  }
-
-  xbt_dynar_foreach(a->transitions, cursor, transition){
-    if(transition_free_function) 
-      (*transition_free_function) (transition->label);
-  }
-
-  xbt_dynar_foreach(a->states, cursor, state)
-    free(state);
-  xbt_dynar_free(&(a->states));
-
-  xbt_dynar_foreach(a->transitions, cursor, state)
-    free(transition);
-  xbt_dynar_free(&(a->transitions));
-
-  free(a);
-
-  return;
-}
-
-void xbt_automaton_free_state(xbt_automaton_t a, xbt_state_t s, void_f_pvoid_t transition_free_function){
-  unsigned long nbr;
-  unsigned long i;
-  unsigned int cursor = 0;
-  xbt_state_t state = NULL;
-  xbt_transition_t transition = NULL;
-
-  nbr = xbt_dynar_length(a->transitions);
-  for(i = 0; i <nbr; i++){
-    xbt_dynar_get_cpy(a->transitions, cursor, &transition);
-    if((transition->src == s) || (transition->dst == s)){
-      xbt_automaton_free_transition(a, transition, transition_free_function);
-    }else{
-      cursor++;
-    }
-  }
-
-  cursor = 0;
-  xbt_dynar_foreach(a->states, cursor, state)
-    if(state == s)
-      xbt_dynar_cursor_rm(a->states, &cursor);
-
-  xbt_dynar_free(&(s->in));
-  xbt_dynar_free(&(s->out));
-
-  free(s);
-
-  return;
-}
-
-void xbt_automaton_free_transition(xbt_automaton_t a, xbt_transition_t t, void_f_pvoid_t transition_free_function){
-  int index;
-  unsigned int cursor = 0;
-  xbt_transition_t transition = NULL;
-
-  if((transition_free_function) && (t->label))
-    (*transition_free_function) (t->label);
-
-  xbt_dynar_foreach(a->transitions, cursor, transition) {
-    if(transition == t){
-      index = __xbt_find_in_dynar(transition->dst->in, transition);
-      xbt_dynar_remove_at(transition->dst->in, index, NULL);
-      index = __xbt_find_in_dynar(transition->src->out, transition);
-      xbt_dynar_remove_at(transition->src->out, index, NULL);
-      xbt_dynar_cursor_rm(a->transitions, & cursor);
-      free(transition);
-      break;
-    }  
-  }
-} 
-
-xbt_state_t xbt_automaton_transition_get_source(xbt_transition_t t){
+xbt_automaton_state_t xbt_automaton_transition_get_source(xbt_automaton_transition_t t){
   return t->src;
 }
 
-xbt_state_t xbt_automaton_transition_get_destination(xbt_transition_t t){
+xbt_automaton_state_t xbt_automaton_transition_get_destination(xbt_automaton_transition_t t){
   return t->dst;
 }
 
-void xbt_automaton_transition_set_source(xbt_transition_t t, xbt_state_t src){
+void xbt_automaton_transition_set_source(xbt_automaton_transition_t t, xbt_automaton_state_t src){
   t->src = src;
   xbt_dynar_push(src->out,&t);
 }
 
-void xbt_automaton_transition_set_destination(xbt_transition_t t, xbt_state_t dst){
+void xbt_automaton_transition_set_destination(xbt_automaton_transition_t t, xbt_automaton_state_t dst){
   t->dst = dst;
   xbt_dynar_push(dst->in,&t);
 }
 
-xbt_dynar_t xbt_automaton_state_get_out_transitions(xbt_state_t s){
+xbt_dynar_t xbt_automaton_state_get_out_transitions(xbt_automaton_state_t s){
   return s->out;
 }
 
-xbt_dynar_t xbt_automaton_state_get_in_transitions(xbt_state_t s){
+xbt_dynar_t xbt_automaton_state_get_in_transitions(xbt_automaton_state_t s){
   return s->in;
 }
 
-xbt_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
-  xbt_state_t state = NULL;
+xbt_automaton_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
+  xbt_automaton_state_t state = NULL;
   unsigned int cursor = 0;
   xbt_dynar_foreach(a->states, cursor, state){
    if(strcmp(state->id, id)==0)
@@ -215,50 +148,48 @@ xbt_state_t xbt_automaton_state_exists(xbt_automaton_t a, char *id){
   return NULL;
 }
 
-void  xbt_automaton_display(xbt_automaton_t a){
-  unsigned int cursor = 0;
-  xbt_state_t state = NULL;
+void xbt_automaton_display(xbt_automaton_t a){
+  unsigned int cursor;
+  xbt_automaton_state_t state = NULL;
 
-  printf("\n\nEtat courant : %s\n", a->current_state->id);
+  printf("\n\nCurrent state: %s\n", a->current_state->id);
 
-  printf("\nListe des états : %lu\n\n", xbt_dynar_length(a->states));
+  printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states));
  
   
-  xbt_dynar_foreach(a->states, cursor, state){
-    printf("ID : %s, type : %d\n", state->id, state->type);
-  }
+  xbt_dynar_foreach(a->states, cursor, state)
+    printf("ID: %s, type: %d\n", state->id, state->type);
 
-  cursor=0;
-  xbt_transition_t transition = NULL;
-  printf("\nListe des transitions : %lu\n\n", xbt_dynar_length(a->transitions));
+  xbt_automaton_transition_t transition;
+  printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions));
   
   xbt_dynar_foreach(a->transitions, cursor, transition){
-    printf("label :");
-    xbt_automaton_display_exp(transition->label);
+    printf("label:");
+    xbt_automaton_exp_label_display(transition->label);
     printf(", %s -> %s\n", transition->src->id, transition->dst->id);
   }
 }
 
-void xbt_automaton_display_exp(xbt_exp_label_t label){
+void xbt_automaton_exp_label_display(xbt_automaton_exp_label_t label){
 
   switch(label->type){
   case 0 :
     printf("(");
-    xbt_automaton_display_exp(label->u.or_and.left_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.left_exp);
     printf(" || ");
-    xbt_automaton_display_exp(label->u.or_and.right_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.right_exp);
     printf(")");
     break;
   case 1 : 
     printf("(");
-    xbt_automaton_display_exp(label->u.or_and.left_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.left_exp);
     printf(" && ");
-    xbt_automaton_display_exp(label->u.or_and.right_exp);
+    xbt_automaton_exp_label_display(label->u.or_and.right_exp);
     printf(")");
     break;
   case 2 : 
     printf("(!");
-    xbt_automaton_display_exp(label->u.exp_not);
+    xbt_automaton_exp_label_display(label->u.exp_not);
     printf(")");
     break;
   case 3 :
@@ -271,20 +202,77 @@ void xbt_automaton_display_exp(xbt_exp_label_t label){
 
 }
 
-xbt_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
+xbt_automaton_state_t xbt_automaton_get_current_state(xbt_automaton_t a){
   return a->current_state;
 }
 
-xbt_propositional_symbol_t xbt_new_propositional_symbol(xbt_automaton_t a, const char* id, void* fct){
-  xbt_propositional_symbol_t prop_symb = NULL;
-  prop_symb = xbt_new0(struct xbt_propositional_symbol, 1);
-  prop_symb->pred = strdup(id);
-  prop_symb->function = fct;
+static int call_simple_function(void* function)
+{
+  return ((int (*)(void)) 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);
+  prop_symb->pred = xbt_strdup(id);
+  prop_symb->callback = call_simple_function;
+  prop_symb->data = 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_automaton_propositional_symbol_t prop_symb = NULL;
+  prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
+  prop_symb->pred = xbt_strdup(id);
+  prop_symb->callback = NULL;
+  prop_symb->data = value;
+  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_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);
+  prop_symb->pred = xbt_strdup(id);
+  prop_symb->callback = callback;
+  prop_symb->data = data;
+  prop_symb->free_function = free_function;
   xbt_dynar_push(a->propositional_symbols, &prop_symb);
   return prop_symb;
 }
 
-int automaton_state_compare(xbt_state_t s1, xbt_state_t s2){
+XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol)
+{
+  if (symbol->callback)
+    return (symbol->callback)(symbol->data);
+  else
+    return *(int*) symbol->data;
+}
+
+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)
+{
+  return symbol->data;
+}
+
+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*/
 
@@ -298,22 +286,22 @@ int automaton_state_compare(xbt_state_t s1, xbt_state_t s2){
 
 }
 
-int automaton_transition_compare(const void *t1, const void *t2){
+int xbt_automaton_transition_compare(const void *t1, const void *t2){
 
-  if(automaton_state_compare(((xbt_transition_t)t1)->src, ((xbt_transition_t)t2)->src))
+  if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->src, ((xbt_automaton_transition_t)t2)->src))
     return 1;
   
-  if(automaton_state_compare(((xbt_transition_t)t1)->dst, ((xbt_transition_t)t2)->dst))
+  if(xbt_automaton_state_compare(((xbt_automaton_transition_t)t1)->dst, ((xbt_automaton_transition_t)t2)->dst))
     return 1;
 
-  if(automaton_label_transition_compare(((xbt_transition_t)t1)->label,((xbt_transition_t)t2)->label))
+  if(xbt_automaton_exp_label_compare(((xbt_automaton_transition_t)t1)->label,((xbt_automaton_transition_t)t2)->label))
     return 1;
 
   return 0;
   
 }
 
-int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
+int xbt_automaton_exp_label_compare(xbt_automaton_exp_label_t l1, xbt_automaton_exp_label_t l2){
 
   if(l1->type != l2->type)
     return 1;
@@ -322,14 +310,14 @@ int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
 
   case 0 : // OR 
   case 1 : // AND
-    if(automaton_label_transition_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
+    if(xbt_automaton_exp_label_compare(l1->u.or_and.left_exp, l2->u.or_and.left_exp))
       return 1;
     else
-      return automaton_label_transition_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
+      return xbt_automaton_exp_label_compare(l1->u.or_and.right_exp, l2->u.or_and.right_exp);
     break;
 
   case 2 : // NOT
-    return automaton_label_transition_compare(l1->u.exp_not, l2->u.exp_not);
+    return xbt_automaton_exp_label_compare(l1->u.exp_not, l2->u.exp_not);
     break;
 
   case 3 : // predicat
@@ -349,7 +337,7 @@ int automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2){
 }
 
 
-int propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
+int xbt_automaton_propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
 
   int *iptr1, *iptr2;
   unsigned int cursor;
@@ -364,3 +352,88 @@ int propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2){
 
   return 0;
 }
+
+/************ Free functions ****************/
+
+static void xbt_automaton_transition_free(xbt_automaton_transition_t t);
+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){
+  if(s){
+    xbt_free(s->id);
+    xbt_dynar_free(&(s->in));
+    xbt_dynar_free(&(s->out));
+    xbt_free(s);
+    s = NULL;
+  }
+}
+
+void xbt_automaton_state_free_voidp(void *s){
+  xbt_automaton_state_free((xbt_automaton_state_t) * (void **) s);
+}
+
+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;
+  }
+}
+
+void xbt_automaton_transition_free_voidp(void *t){
+  xbt_automaton_transition_free((xbt_automaton_transition_t) * (void **) t);
+}
+
+static void xbt_automaton_exp_label_free(xbt_automaton_exp_label_t e){
+  if(e){
+    switch(e->type){
+    case 0:
+    case 1:
+      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:
+      xbt_automaton_exp_label_free(e->u.exp_not);
+      break;
+    case 3:
+      xbt_free(e->u.predicat);
+      break;
+    default:
+      break;
+    }
+    xbt_free(e);
+    e = NULL;
+  }
+}
+
+void xbt_automaton_exp_label_free_voidp(void *e){
+  xbt_automaton_exp_label_free((xbt_automaton_exp_label_t) * (void **) e);
+}
+
+static void xbt_automaton_propositional_symbol_free(xbt_automaton_propositional_symbol_t ps){
+  if(ps){
+    xbt_free(ps->pred);
+    xbt_free(ps);
+    ps = NULL;
+  }
+}
+
+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);
+}
+
+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;
+  }
+}