free bug

cezarybednarz · Jan 31, 2021 · 08578c0 · 08578c0
1 parent 9b6ba2a
commit 08578c0
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 15 deletions.
diff --git a/actor.c b/actor.c
@@ -52,6 +52,7 @@ int actor_push_message(actor_t* actor, message_t* message) {
   }
 
   if (queue_push(actor->message_queue, message) != 0) {
+    free(message);
     if (pthread_mutex_unlock(&(actor->lock)) != 0) {
       syserr("mutex unlock");
     }
@@ -69,7 +70,7 @@ int actor_push_message(actor_t* actor, message_t* message) {
   }
 
   if (pthread_mutex_unlock(&(actor->lock))) {
-    return -1;
+    syserr("mutex unlock");
   }
   return 0;
 }
@@ -83,7 +84,9 @@ void handle_spawn(actor_t* actor, message_t* message) {
     return;
   }
 
-  actor_system_insert(actor->a_system, new_actor);
+  if (actor_system_insert(actor->a_system, new_actor) == -1) {
+    return;
+  }
 
   message_t hello_message = {
     .message_type = MSG_HELLO,

diff --git a/actor_system.c b/actor_system.c
@@ -67,6 +67,7 @@ int actor_system_insert(actor_system_t* a_system, actor_t* actor) {
   if (pthread_mutex_lock(&(a_system->lock)) != 0) {
     return -1;
   }
+
   if (queue_push(a_system->actors, actor) != 0) {
     pthread_mutex_unlock(&(a_system->lock)); 
     return -1;

diff --git a/cacti.c b/cacti.c
@@ -73,9 +73,6 @@ void actor_system_join(actor_id_t actor) {
 int send_message(actor_id_t actor_id, message_t message) {
   actor_t* actor = actor_system_find(&a_system, actor_id);
 
-  if (rand() % 300000 == 1)
-    printf("send_message: from actor %lu message = %lu actor_id = %lu\n", actor_id_self(), message.message_type, actor_id);
-
   // no actor with that id in system
   if (actor == NULL) {
     return -2; 
@@ -92,6 +89,7 @@ int send_message(actor_id_t actor_id, message_t message) {
   message_copy->nbytes = message.nbytes;
 
   if (actor_push_message(actor, message_copy) != 0) {
+    free(message_copy);
     fprintf(stderr, "send_message: error while pushing message, queue full\n");
     return -3;
   }

diff --git a/cacti.h b/cacti.h
@@ -13,12 +13,12 @@ typedef long message_type_t;
 #define MSG_HELLO (message_type_t)0x0
 
 #ifndef ACTOR_QUEUE_LIMIT
-#define ACTOR_QUEUE_LIMIT 1024
+#define ACTOR_QUEUE_LIMIT 1000024
 #endif
 
 #ifndef CAST_LIMIT
 //#define CAST_LIMIT 1048576
-#define CAST_LIMIT 100
+#define CAST_LIMIT 10
 #endif
 
 #ifndef POOL_SIZE

diff --git a/cmake-build-debug/CMakeFiles/cacti.dir/C.includecache b/cmake-build-debug/CMakeFiles/cacti.dir/C.includecache
@@ -24,10 +24,6 @@ actor_system.h
 cacti.h
 /home/cezary/Studia/PW/pw2-C/cacti.h
 
-/home/cezary/Studia/PW/pw2-C/cacti.c
-cacti.h
-/home/cezary/Studia/PW/pw2-C/cacti.h
-
 /home/cezary/Studia/PW/pw2-C/cacti.h
 stddef.h
 -

diff --git a/cmake-build-debug/CMakeFiles/cacti.dir/actor.c.o b/cmake-build-debug/CMakeFiles/cacti.dir/actor.c.o
diff --git a/cmake-build-debug/CMakeFiles/cacti.dir/actor_system.c.o b/cmake-build-debug/CMakeFiles/cacti.dir/actor_system.c.o
diff --git a/cmake-build-debug/CMakeFiles/cacti.dir/cacti.c.o b/cmake-build-debug/CMakeFiles/cacti.dir/cacti.c.o
diff --git a/cmake-build-debug/CMakeFiles/chaos.dir/test/chaos.cpp.o b/cmake-build-debug/CMakeFiles/chaos.dir/test/chaos.cpp.o
diff --git a/cmake-build-debug/CMakeFiles/macierz.dir/macierz.c.o b/cmake-build-debug/CMakeFiles/macierz.dir/macierz.c.o
diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log
@@ -1,3 +1,3 @@
-Start testing: Jan 31 21:12 CET
+Start testing: Jan 31 22:39 CET
 ----------------------------------------------------------
-End testing: Jan 31 21:12 CET
+End testing: Jan 31 22:39 CET
diff --git a/cmake-build-debug/chaos b/cmake-build-debug/chaos
diff --git a/cmake-build-debug/libcacti.a b/cmake-build-debug/libcacti.a
diff --git a/cmake-build-debug/macierz b/cmake-build-debug/macierz
diff --git a/cmake-build-debug/silnia b/cmake-build-debug/silnia
diff --git a/test/chaos.cpp b/test/chaos.cpp
@@ -59,7 +59,7 @@ static void do_chaos(void**, size_t, void*) {
 
 int main() {
   actor_id_t initial;
-  for (long int i = 0; i < 1000000; i++) {
+  for (long int i = 0; i < 1; i++) {
     printf("Loop #%li\n", i);
 
     max_actor_id = 0;
@@ -70,7 +70,6 @@ int main() {
     printf("initial: %d\n", ret);
     if (ret < 0)
       abort();
-    printf("JOINING!\n");
     actor_system_join(initial);
 
     printf("-> Complete! Max actor id: %li\n", max_actor_id.load());