fixed switch and self edge

Author: Matthew Stern

Makefile

@@ -6,7 +6,7 @@ CXX=g++
 MCS=$(MCS)
 
 LDFLAGS= -lm -lpthread -L. -ltopologic -pthread #-lfl
-CFLAGS=-Wall	-Werror	-g	-fPIC #-O2
+CFLAGS=-Wall	-Werror	-g	-fPIC -O2 #-fsanitize=thread 
 OBJ=$(SRC:.c=.o)
 AR=ar
 

include/header.h

@@ -19,7 +19,8 @@
 #else
 #include <pthread.h>
 #include <unistd.h>
+#include <time.h>
 #endif
 
 
-#endif
+#endif

include/topologic.h

@@ -12,6 +12,7 @@
 #include "./request.h"
 #include "./graph.h"
 
+#define PTHREAD_SLEEP_TIME 50 //milliseconds
 
 #ifndef SWIGPYTHON
 #ifndef _GNU_SOURCE

src/graph.c

@@ -208,15 +208,13 @@ int destroy_graph(struct graph *graph)
 		return -1;
 	}
 	graph->state = TERMINATE;
-
 	if (graph->red_vertex_count >= 0)
 	{
 		if (graph->context != SINGLE)
 		{
 			graph->red_locked = 0;
-			while (graph->red_vertex_count > 0)
-			{
-			}
+            if (graph->red_vertex_count > 0)
+                pthread_cond_wait(&graph->red_fire, &graph->color_lock);
 		}
 	}
 
@@ -225,9 +223,8 @@ int destroy_graph(struct graph *graph)
 		if (graph->context != SINGLE)
 		{
 			graph->black_locked = 0;
-			while (graph->black_vertex_count > 0)
-			{
-			}
+            if (graph->black_vertex_count > 0)
+                pthread_cond_wait(&graph->black_fire, &graph->color_lock);
 		}
 	}
 
@@ -241,7 +238,6 @@ int destroy_graph(struct graph *graph)
 	graph->remove_edges = NULL;
 	destroy_graph_stack(graph->remove_vertices);
 	graph->remove_vertices = NULL;
-
 	pthread_mutex_destroy(&graph->lock);
 	pthread_cond_destroy(&graph->pause_cond);
 	graph->red_locked = 0;

src/topologic.c

@@ -3,6 +3,18 @@
 
 #include "../include/topologic.h"
 
+void sleep_ms(int milliseconds)
+{
+#ifdef WIN32
+    Sleep(milliseconds);
+#else
+    struct timespec ts;
+    ts.tv_sec = milliseconds / 1000;
+    ts.tv_nsec = (milliseconds % 1000) * 1000000;
+    nanosleep(&ts, NULL);
+#endif
+}
+
 int start_set(struct graph *graph, int id[], int num_vertices)
 {
     topologic_debug("%s;id: %p;num_vertices: %d", "start_set", id, num_vertices);
@@ -409,45 +421,7 @@ int fire(struct graph *graph, struct vertex *vertex, struct vertex_result *args,
         }
         return -1;
     }
-
-    if (graph->max_loop != -1 && iloop >= graph->max_loop)
-    {
-        topologic_debug("%s;%s;%d", "fire", "max loop hit", 0);
-        if (args->edge_argv)
-        {
-            free(args->edge_argv);
-            args->edge_argv = NULL;
-        }
-        if (args->vertex_argv)
-        {
-            free(args->vertex_argv);
-            args->vertex_argv = NULL;
-        }
-        if (args)
-        {
-            free(args);
-            args = NULL;
-        }
-        pthread_mutex_lock(&graph->lock);
-        if (color == RED)
-        {
-            --(graph->red_vertex_count);
-            --(graph->num_vertices);
-            if (graph->red_vertex_count <= 0)
-                pthread_cond_signal(&graph->red_fire);
-        }
-        else if (color == BLACK)
-        {
-            --(graph->black_vertex_count);
-            --(graph->num_vertices);
-            if (graph->black_vertex_count <= 0)
-                pthread_cond_signal(&graph->black_fire);
-        }
-        pthread_mutex_unlock(&graph->lock);
-        pthread_mutex_unlock(&vertex->lock);
-        return 0;
-    }
-
+    
     if (graph->state == TERMINATE)
     {
         topologic_debug("%s;%s;%d", "fire", "terminate", -1);
@@ -488,6 +462,44 @@ int fire(struct graph *graph, struct vertex *vertex, struct vertex_result *args,
         return -1;
     }
 
+    if (graph->max_loop != -1 && iloop >= graph->max_loop)
+    {
+        topologic_debug("%s;%s;%d", "fire", "max loop hit", 0);
+        if (args->edge_argv)
+        {
+            free(args->edge_argv);
+            args->edge_argv = NULL;
+        }
+        if (args->vertex_argv)
+        {
+            free(args->vertex_argv);
+            args->vertex_argv = NULL;
+        }
+        if (args)
+        {
+            free(args);
+            args = NULL;
+        }
+        pthread_mutex_lock(&graph->lock);
+        if (color == RED)
+        {
+            --(graph->red_vertex_count);
+            --(graph->num_vertices);
+            if (graph->red_vertex_count <= 0)
+                pthread_cond_signal(&graph->red_fire);
+        }
+        else if (color == BLACK)
+        {
+            --(graph->black_vertex_count);
+            --(graph->num_vertices);
+            if (graph->black_vertex_count <= 0)
+                pthread_cond_signal(&graph->black_fire);
+        }
+        pthread_mutex_unlock(&graph->lock);
+        pthread_mutex_unlock(&vertex->lock);
+        return 0;
+    }
+
     (vertex->f)(graph, args, vertex->glbl, vertex->shared->vertex_data);
 
     struct vertex *next_vertex = NULL;
@@ -604,6 +616,7 @@ int fire(struct graph *graph, struct vertex *vertex, struct vertex_result *args,
             ++(graph->black_vertex_count);
         pthread_mutex_unlock(&graph->lock);
         topologic_debug("%s;%s;%p", "fire", "firing next vertex", next_vertex);
+        sleep_ms(PTHREAD_SLEEP_TIME);
         return fire(graph, next_vertex, args, flip_color, iloop_b);
     }
     else
@@ -645,6 +658,7 @@ void *fire_pthread(void *vargp)
     int iloop = fireable->iloop;
 
     free(vargp);
+    sleep_ms(PTHREAD_SLEEP_TIME);
     int ret_val = fire(graph, v, args, color, iloop);
     topologic_debug("%s;%s;%d", "fire_pthread", "finished", ret_val);
     pthread_exit((void *)(intptr_t)ret_val);

testing/generate_graph_json_test.c

@@ -21,4 +21,4 @@ int main() {
     assert(graph == NULL);
     fprintf(stderr, "JSON PARSING WORKS\n");
     return 0;
-}
+}

testing/switch_context_test.c

@@ -53,7 +53,7 @@ int main()
 void cleanup(struct graph *graph)
 {
 	assert(graph != NULL);
-	int i = 0;
+	/*int i = 0;
 
 	for (i = 0; i < MAXIMUM; i++)
 	{
@@ -81,7 +81,7 @@ void cleanup(struct graph *graph)
 			v->glbl = NULL;
 		}
 		remove_vertex(graph, v);
-	}
+	}*/
 	destroy_graph(graph);
 	graph = NULL;
 }