added id's and request failing flag

Author: Matthew Stern

Makefile

@@ -63,10 +63,11 @@ $(BISON_CPP): $(BISONPP)
 	$(CXX) -fPIC -g -c $(BISON_CPP) -o $(BISON_OBJ_PP)
 
 all:$(BIN)
-.PHONY : clean cpp python python2 rust csharp
+.PHONY : clean cpp
 
 clean:
 	rm -f libtopologic.a
+	rm -f $(TEST_OBJ) $(TESTS)
 	rm -f $(FLEX_C) $(FLEX_OBJ)
 	rm -f $(BISON_C) $(BISON_OBJ) $(BISON_H)
 	rm -f $(FLEX_CPP) $(FLEX_OBJ_PP)

include/edge.h

@@ -25,7 +25,7 @@ struct edge
             //will compare with other Edges in graph
             //Also unique, a la vertex
             //Perhaps @nanosecond level
-    int (*f)(void *, void *, const void *const a_vars, const void *const b_vars);
+    int (*f)(int, void *, void *, const void *const a_vars, const void *const b_vars);
     void *glbl;
     const void *const *a_vars; //To be shared among vertex a and shared edge
     const void *const *b_vars; //To be shared among vertex b. Will be NULL for context=SWITCH
@@ -40,7 +40,7 @@ struct edge_request
 {
     struct vertex *a;
     struct vertex *b;
-    int (*f)(void *, void *, const void *const, const void *const);
+    int (*f)(int, void *, void *, const void *const, const void *const);
     void *glbl;
 };
 

include/graph.h

@@ -12,6 +12,7 @@
 
 #include <signal.h>
 #include "./context.h"
+#include "./request.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -81,6 +82,7 @@ struct graph
 {
         enum CONTEXT context;
         enum MEM_OPTION mem_option;
+        enum REQUEST_FLAG request_flag;
         struct AVLTree *vertices;
         struct stack *start;
         struct stack *modify;

include/request.h

@@ -32,6 +32,17 @@ enum REQUESTS
         GENERIC = 12
 };
 
+/**
+Enum for handling failed requests
+NO_FAIL_REQUEST: All request must succeed else end the graph
+IGNORE_FAIL_REQUEST: Ignore a request if it fails
+**/
+enum REQUEST_FLAG
+{
+    NO_FAIL_REQUEST = 0,
+    IGNORE_FAIL_REQUEST = 1
+};
+
 /** Request **/
 struct request
 {

include/topologic.h

@@ -34,7 +34,20 @@
 extern "C" {
 #endif
 
+/**
+@PARAM graph: the graph
+@PARAM vertex: a vertex in the graph
+@PARAM vertex_result: the vertex_results to copy
+@PARAM color: next vertices color
+@PARAM iloop: the count of the number of times the vertex has been called
+Create a fireable structure
+**/
 struct fireable *create_fireable(struct graph *graph, struct vertex *vertex, struct vertex_result *args, enum STATES color, int iloop);
+
+/**
+@PARAM fireable: the fireable to destroy
+Frees the fireable struct
+**/
 int destroy_fireable(struct fireable *fireable);
 
 /**
@@ -57,9 +70,10 @@ struct graph *graph_init(int max_state_changes,
                          int max_loop,
                          unsigned int lvl_verbose,
                          enum CONTEXT context,
-                         enum MEM_OPTION mem_option);
+                         enum MEM_OPTION mem_option,
+                         enum REQUEST_FLAG request_flag);
 #define MAX_LOOPS 100
-#define GRAPH_INIT() graph_init(-1, START_STOP, MAX_LOOPS, VERTICES | EDGES | FUNCTIONS | GLOBALS, SINGLE, CONTINUE)
+#define GRAPH_INIT() graph_init(-1, START_STOP, MAX_LOOPS, VERTICES | EDGES | FUNCTIONS | GLOBALS, SINGLE, CONTINUE, IGNORE_FAIL_REQUEST)
 
 /**
 @PARAM graph: the graph
@@ -73,7 +87,7 @@ NOTE: NULL glbl will mean no global variables.
       f cannot be NULL.
 **/
 struct vertex *create_vertex(struct graph *graph,
-                             void (*f)(struct graph *, struct vertex_result *, void *, void *),
+                             void (*f)(int, struct graph *, struct vertex_result *, void *, void *),
                              int id,
                              void *glbl);
 #define CREATE_VERTEX(graph, f, id) create_vertex(graph, f, id, NULL, PROTECT_B_VARS)
@@ -91,7 +105,7 @@ NOTE: NULL glbl will mean no global variables. f cannot be NULL.
 **/
 struct edge *create_edge(struct vertex *a,
                          struct vertex *b,
-                         int (*f)(void *, void *, const void *const, const void *const),
+                         int (*f)(int, void *, void *, const void *const, const void *const),
                          void *glbl);
 #define CREATE_EDGE(a, b, f) create_edge(a, b, f, NULL)
 
@@ -106,7 +120,7 @@ If edge_a_to_b or edge_b_to_a is NULL it will not.
 **/
 int create_bi_edge(struct vertex *a,
                    struct vertex *b,
-                   int (*f)(void *, void *, const void *const, const void *const),
+                   int (*f)(int, void *, void *, const void *const, const void *const),
                    void *glbl,
                    struct edge **edge_a_to_b,
                    struct edge **edge_b_to_a);
@@ -174,7 +188,7 @@ NOTE: NULL f, or glbl will mean no change.
 Modifies the vertices function
 **/
 int modify_vertex(struct vertex *vertex,
-                  void (*f)(struct graph *, struct vertex_result *, void *, void *),
+                  void (*f)(int, struct graph *, struct vertex_result *, void *, void *),
                   void *glbl);
 #define MODIFY_VERTEX(vertex, f) modify_vertex(vertex, f, NULL)
 #define MODIFY_VERTEX_GLOBALS(vertex, glbl) modify_vertex(vertex, NULL, glbl)
@@ -201,7 +215,7 @@ NOTE: NULL f, or glbl will mean no change.
 **/
 int modify_edge(struct vertex *a,
                 struct vertex *b,
-                int (*f)(void *, void *, const void *const, const void *const),
+                int (*f)(int, void *, void *, const void *const, const void *const),
                 void *glbl);
 
 #define MODIFY_EDGE(a, b, f) modify_edge(a, b, f, NULL)
@@ -222,7 +236,7 @@ NOTE: NULL f, or glbl will mean no change.
 **/
 int modify_bi_edge(struct vertex *a,
                    struct vertex *b,
-                   int (*f)(void *, void *, const void *const, const void *const),
+                   int (*f)(int, void *, void *, const void *const, const void *const),
                    void *glbl);
 #define MODIFY_BI_EDGE(a, b, f) modify_bi_edge(a, b, f, NULL)
 #define MODIFY_BI_EDGE_GLOBALS(a, b, glbl) modify_bi_edge(a, b, NULL, glbl)

include/vertex.h

@@ -36,7 +36,7 @@ struct vertex
             //will compare with other vertices in graph
             //Must be unique. If non-unique ID, error
     int is_active;
-    void (*f)(struct graph *, struct vertex_result *, void *, void *);
+    void (*f)(int, struct graph *, struct vertex_result *, void *, void *);
     void *glbl;
     union shared_edge *shared;
     pthread_mutex_t lock;
@@ -51,14 +51,14 @@ struct vertex_request
     int id; //Hash for number passed in,
             //will compare with other vertices in graph
             //Must be unique. If non-unique ID, error
-    void (*f)(struct graph *, struct vertex_result *, void *, void *);
+    void (*f)(int, struct graph *, struct vertex_result *, void *, void *);
     void *glbl;
 };
 
 struct mod_vertex_request
 {
     struct vertex *vertex;
-    void (*f)(struct graph *, struct vertex_result *, void *, void *);
+    void (*f)(int, struct graph *, struct vertex_result *, void *, void *);
     void *glbl;
 };
 

parse/topologic_parser.y

@@ -3,8 +3,8 @@
 
 %{
 #include "../include/topologic.h"
-void f(struct graph *graph, struct vertex_result *args, void *glbl, void *edge_vars) {}
-int edge_f(void *args, void *glbl, const void *const edge_vars_a, const void *const edge_vars_b) {return 0;}
+void f(int id, struct graph *graph, struct vertex_result *args, void *glbl, void *edge_vars) {}
+int edge_f(int id, void *args, void *glbl, const void *const edge_vars_a, const void *const edge_vars_b) {return 0;}
 void yyerror(struct graph** graph, const char *s);
 extern FILE *yyin;
 int yylex(void);

src/edge.c

@@ -3,7 +3,7 @@
 
 #include "../include/topologic.h"
 
-struct edge *create_edge(struct vertex *a, struct vertex *b, int (*f)(void *, void *, const void *const, const void *const), void *glbl)
+struct edge *create_edge(struct vertex *a, struct vertex *b, int (*f)(int, void *, void *, const void *const, const void *const), void *glbl)
 {
     topologic_debug("%s;a %p;b %p;f %p;glbl %p", "create_edge", a, b, f, glbl);
     if (!a || !b)
@@ -102,7 +102,7 @@ struct edge *create_edge(struct vertex *a, struct vertex *b, int (*f)(void *, vo
     return NULL;
 }
 
-int create_bi_edge(struct vertex *a, struct vertex *b, int (*f)(void *, void *, const void *const, const void *const), void *glbl, struct edge **edge_a_to_b, struct edge **edge_b_to_a)
+int create_bi_edge(struct vertex *a, struct vertex *b, int (*f)(int, void *, void *, const void *const, const void *const), void *glbl, struct edge **edge_a_to_b, struct edge **edge_b_to_a)
 {
     topologic_debug("%s;a %p;b %p;f %p;glbl %p", "create_edge", a, b, f, glbl);
     if (!a || !b || !f || a == b)
@@ -293,7 +293,7 @@ int remove_bi_edge(struct vertex *a, struct vertex *b)
     return ret;
 }
 
-int modify_edge(struct vertex *a, struct vertex *b, int (*f)(void *, void *, const void *const, const void *const), void *glbl)
+int modify_edge(struct vertex *a, struct vertex *b, int (*f)(int, void *, void *, const void *const, const void *const), void *glbl)
 {
     topologic_debug("%s;a %p;b %p;f %p;glbl %p", "modify_edge", a, b, f, glbl);
     if (!a || !b)
@@ -333,7 +333,7 @@ int modify_edge(struct vertex *a, struct vertex *b, int (*f)(void *, void *, con
     return 0;
 }
 
-int modify_bi_edge(struct vertex *a, struct vertex *b, int (*f)(void *, void *, const void *const, const void *const), void *glbl)
+int modify_bi_edge(struct vertex *a, struct vertex *b, int (*f)(int, void *, void *, const void *const, const void *const), void *glbl)
 {
     topologic_debug("%s;a %p;b %p;f %p;glbl %p", "modify_bi_edge", a, b, f, glbl);
     if (!a || !b || a == b)

src/graph.c

@@ -3,7 +3,7 @@
 
 #include "../include/topologic.h"
 
-struct graph *graph_init(int max_state_changes, int snapshot_timestamp, int max_loop, unsigned int lvl_verbose, enum CONTEXT context, enum MEM_OPTION mem_option)
+struct graph *graph_init(int max_state_changes, int snapshot_timestamp, int max_loop, unsigned int lvl_verbose, enum CONTEXT context, enum MEM_OPTION mem_option, enum REQUEST_FLAG request_flag)
 {
 	topologic_debug("%s;max_state_chages %d;snapshot_timestamp %d;max_loop %d;lvl_verbose %d;context %d;mem_option %d", "graph_init", max_state_changes, snapshot_timestamp, max_loop, lvl_verbose, context, mem_option);
 	struct graph *graph = (struct graph *)malloc(sizeof(struct graph));
@@ -15,6 +15,7 @@ struct graph *graph_init(int max_state_changes, int snapshot_timestamp, int max_
 	graph->max_state_changes = max_state_changes;
 	graph->max_loop = max_loop;
 	graph->snapshot_timestamp = snapshot_timestamp;
+    graph->request_flag = request_flag;
 	graph->lvl_verbose = lvl_verbose;
 	graph->context = context;
 	graph->state_count = 0;

src/request.c

@@ -270,7 +270,7 @@ int process_requests(struct graph *graph)
     {
         if (graph->context != SINGLE)
             pthread_mutex_unlock(&graph->lock);
-        if (procces_request(req) < 0)
+        if (procces_request(req) < 0 && graph->request_flag == NO_FAIL_REQUEST)
         {
             topologic_debug("%s;%s;%d", "process_requests", "failed to process general requests", -1);
             return -1;
@@ -282,7 +282,7 @@ int process_requests(struct graph *graph)
     {
         if (graph->context != SINGLE)
             pthread_mutex_unlock(&graph->lock);
-        if (procces_request(req) < 0)
+        if (procces_request(req) < 0 && graph->request_flag == NO_FAIL_REQUEST)
         {
             topologic_debug("%s;%s;%d", "process_requests", "failed to remove edges", -1);
             return -1;
@@ -294,7 +294,7 @@ int process_requests(struct graph *graph)
     {
         if (graph->context != SINGLE)
             pthread_mutex_unlock(&graph->lock);
-        if (procces_request(req) < 0)
+        if (procces_request(req) < 0 && graph->request_flag == NO_FAIL_REQUEST)
         {
             topologic_debug("%s;%s;%d", "process_requests", "failed to remove vertices", -1);
             return -1;