should not have been committed

diff --git a/src/lib/util/machine.c b/src/lib/util/machine.c
deleted file mode 100644 (file)
index 8ded779..0000000
--- a/src/lib/util/machine.c
+++ /dev/null
@@ -1,144 +0,0 @@
-#include <freeradius-devel/rad_assert.h>
-#include "machine.h"
-
-static int _machine_free(fr_machine_t *m)
-{
-       fr_machine_edge_t *edge;
-
-       edge = &m->edge[m->state];
-       if (!edge) return -1;
-
-       if (!edge->exit) return 0;
-
-       /*
-        *      Ensure that we've exited the current state.
-        */
-       return edge->exit(m, ctx);
-}
-
-fr_machine_t *fr_machine_alloc(TALLOC_CTX *ctx, int max_state, int max_signal, fr_machine_edge_t const *edge, void *uctx)
-{
-       fr_machine_t *m;
-
-       m = talloc_zero(ctx, fr_machine_t);
-       if (!m) return NULL;
-
-       m->max_state = max_state;
-       m->max_signal = max_signal;
-       m->edge = edge;
-       m->uctx = uctx;
-
-       /*
-        *      The caller can set m->fail if necessary
-        */
-
-       talloc_set_destructor(m, _machine_free);
-
-       return m;
-}
-
-int fr_machine_run(fr_machine_t *m, void *ctx)
-{
-       int next;
-       fr_machine_edge_t *edge;
-
-       if (!m) return -1;
-
-       edge = &m->edge[m->state];
-       if (!edge) return -1;
-
-       if (!edge->process) return 0; /* we can have states which do nothing */
-
-       /*
-        *      This should return 1..max_state for "next state"
-        */
-       next = edge->process(m, ctx);
-       if (next <= 0) return next;
-
-       /*
-        *      The process function should return "0" for "do
-        *      nothing".
-        */
-       fr_assert(next != m->state);
-
-       return fr_machine_transition(m, ctx, next);
-}
-
-
-int fr_machine_signal(fr_machine_t *m, void *ctx, int signal)
-{
-       fr_machine_edge_t *edge;
-
-       if (!m) return -1;
-       if ((signal <= 0) || (signal > m->max_signal)) return -1;
-
-       edge = &m->edge[m->state];
-       if (!edge) return -1;
-
-       if (!edge->signal) return 0; /* we can ignore signals */
-
-       edge->signal(m, ctx, signal); /* signals have no return code */
-       return 0;
-}
-
-int fr_machine_transition(fr_machine_t *m, void *ctx, int next)
-{
-       int current;
-       fr_machine_edge_t *edge;
-
-       if (!m) return -1;
-       if ((next <= 0) || (next > m->max_state)) return -1;
-
-       current = m->state;
-       edge = &m->edge[current];
-
-       if (!edge) return -1;
-
-       /*
-        *      Exit the current state.  If this function fails, then
-        *      we presume that it has transitioned from current to a
-        *      *different* state than we were passed.  So stop
-        *      running this state machine, and let the called
-        *      transition override us.
-        *
-        *      Note that we ALWAYS exit the current state, even if
-        *      this transition isn't allowed.  Doing so allows us to
-        *      clean up the current state on error conditions.
-        */
-       if (edge->exit && (edge->exit(m, ctx) < 0)) {
-               fr_assert(m->state != current); 
-               return -1;
-       }
-
-       edge = &m->edge[next];
-
-       /*
-        *      The next state doesn't allow transitions from our
-        *      current state.  Die.
-        */
-       if ((edge->allowed & (1 << current)) == 0) {
-               if (!m->fail) return -1;
-               m->state = 0;
-               return m->fail(m, crtx);
-       }
-
-       /*
-        *      Do any special transitions into the current state,
-        *      from the previous one.
-        */
-       if (edge->transition && (edge->transition(m, ctx, current) < 0)) {
-               return -1;
-       }
-
-       /*
-        *      Enter the new state.
-        */
-       if (edge->enter && (edge->enter(m, ctx) < 0)) {
-               fr_assert(m->state != current); 
-               return -1;
-       }
-
-       fr_assert(m->state == current);
-       m->state = next;
-       return 0;
-}

diff --git a/src/lib/util/machine.h b/src/lib/util/machine.h
deleted file mode 100644 (file)
index 8905ee0..0000000
--- a/src/lib/util/machine.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-typedef struct fr_machine_s fr_machine_t;
-
-typedef int (*fr_machine_func_t)(fr_machine_t *m, void *rctx);
-
-typedef int (*fr_machine_transition_t)(fr_machine_t *m, void *rctx, int next);
-
-typedef void (*fr_machine_signal_t)(fr_machine_t *m, void *rctx, int signal);
-
-typedef struct {
-       char const              *name;                  //!< state name
-       uint64_t                allowed;                //!< bit mask of allowed transitions into this state
-       fr_machine_func_t       process;                //!< run this to process the current state
-       fr_machine_func_t       enter;                  //!< run this when entering the state
-       fr_machine_func_t       exit;                   //!< run this when exiting the state
-       fr_machine_transition_t transition;             //!< called when transitioning from one state to another
-       fr_machine_signal_t     signal;                 //!< send a signal to the current state
-} fr_machine_edge_t;
-
-typedef struct fr_machine_s fr_machine_t;
-
-struct fr_machine_s {
-       int                     max_state;              //!< maximum state number
-       int                     max_signal;             //!< maximum signal which is allowed
-
-       fr_machine_fun_t        fail;                   //!< run only when there is an internal failure.
-       fr_machine_edge_t const *edge;                  //!< edges for each state
-};
-
-typedef struct {
-       fr_machine_t            *m;
-
-       // deferred transitions?
-
-       int                     state;                  //!< current state
-       int                     sequence;               //!< for tracking nested state transitions
-       void                    *uctx;                  //!< user context used when running the state machine
-
-       fr_machine_t            *parent;                //!< for running state machines inside of state machines
-       fr_machine_t            *next;                  //!< sibling
-} fr_machine_ctx_t;
-
-fr_machine_t *fr_machine_alloc(TALLOC_CTX *ctx, int max_states, int max_signal, fr_machine_edge_t const *edge, void *uctx);
-
-int fr_machine_run(fr_machine_t *m, void *rctx);
-int fr_machine_signal(fr_machine_t *m, void *rctx, int signal);
-int fr_machine_transition(fr_machine_t *m, void *rctx, int state);
-
-/*
-  init
-
-  thing is in state X
-
-  thing moves to state Y
-    exit state X
-    enter state y
-    run state y
-
-  list of functions to call for state X
-
-  API to add pre/post functions for state X
-  API to delete pre / post functions for state X
-
-*/