chainsend: change tesh to test with 8192 pieces

[simgrid.git] / include / xbt / automaton.h

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index a91f8ab..9f57747 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -3,8 +3,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "xbt/dynar.h"
-#include "xbt/sysdep.h"
+#include <xbt/dynar.h>
+#include <xbt/sysdep.h>
+#include <xbt/graph.h>
 
 SG_BEGIN_DECL()
 
@@ -13,7 +14,6 @@ typedef struct xbt_state {
   int type; /* -1 = init, 0 = inter, 1 = final */
   xbt_dynar_t in;
   xbt_dynar_t out;
-  int visited;
 } s_xbt_state;
 
 typedef struct xbt_state* xbt_state_t;
@@ -41,15 +41,16 @@ typedef struct xbt_exp_label{
 
 typedef struct xbt_exp_label* xbt_exp_label_t;
 
+
 typedef struct xbt_transition {
   xbt_state_t src;
   xbt_state_t dst;
   xbt_exp_label_t label;
 } s_xbt_transition;
 
-
 typedef struct xbt_transition* xbt_transition_t;
 
+
 typedef struct xbt_propositional_symbol{
   char* pred;
   void* function;
@@ -58,7 +59,9 @@ typedef struct xbt_propositional_symbol{
 typedef struct xbt_propositional_symbol* xbt_propositional_symbol_t;
 
 
-XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new_automaton();
+XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new(void);
+
+XBT_PUBLIC(void) xbt_automaton_load(xbt_automaton_t automaton, const char *file);
 
 XBT_PUBLIC(xbt_state_t) xbt_automaton_new_state(xbt_automaton_t a, int type, char* id);
 
@@ -72,12 +75,6 @@ XBT_PUBLIC(xbt_dynar_t) xbt_automaton_get_transitions(xbt_automaton_t a);
 
 XBT_PUBLIC(xbt_transition_t) xbt_automaton_get_transition(xbt_automaton_t a, xbt_state_t src, xbt_state_t dst);
 
-XBT_PUBLIC(void) xbt_automaton_free_automaton(xbt_automaton_t a, void_f_pvoid_t transition_free_function);
-
-XBT_PUBLIC(void) xbt_automaton_free_state(xbt_automaton_t a, xbt_state_t s, void_f_pvoid_t transition_free_function);
-
-XBT_PUBLIC(void) xbt_automaton_free_transition(xbt_automaton_t a, xbt_transition_t t, void_f_pvoid_t transition_free_function);
-
 XBT_PUBLIC(xbt_state_t) xbt_automaton_transition_get_source(xbt_transition_t t);
 
 XBT_PUBLIC(xbt_state_t) xbt_automaton_transition_get_destination(xbt_transition_t t);
@@ -96,7 +93,29 @@ XBT_PUBLIC(void) xbt_automaton_display(xbt_automaton_t a);
 
 XBT_PUBLIC(void) xbt_automaton_display_exp(xbt_exp_label_t l);
 
-XBT_PUBLIC(xbt_propositional_symbol_t) xbt_new_propositional_symbol(xbt_automaton_t a, char* id, void* fct);
+XBT_PUBLIC(xbt_propositional_symbol_t) xbt_new_propositional_symbol(xbt_automaton_t a, const char* id, void* fct);
+
+XBT_PUBLIC(xbt_state_t) xbt_automaton_get_current_state(xbt_automaton_t a);
+
+XBT_PUBLIC(int) automaton_state_compare(xbt_state_t s1, xbt_state_t s2);
+
+XBT_PUBLIC(int) propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2);
+
+XBT_PUBLIC(int) automaton_transition_compare(const void *t1, const void *t2);
+
+XBT_PUBLIC(int) automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2);
+
+XBT_PUBLIC(void) xbt_state_free_voidp(void *s);
+
+XBT_PUBLIC(void) xbt_state_free(xbt_state_t s);
+
+XBT_PUBLIC(void) xbt_transition_free_voidp(void *t);
+
+XBT_PUBLIC(void) xbt_exp_label_free_voidp(void *e);
+
+XBT_PUBLIC(void) xbt_propositional_symbol_free_voidp(void *ps);
+
+XBT_PUBLIC(void) xbt_automaton_free(xbt_automaton_t a);
 
 SG_END_DECL()