Changes in src/libcfa/concurrency/monitor.c [a933dcf4:9c59cd4]

File:

• src/libcfa/concurrency/monitor.c (modified) (4 diffs)

src/libcfa/concurrency/monitor.c

@@ -17 +17 @@
 #include "monitor"
 
-#include <stdlib>
-
 #include "kernel_private.h"
 #include "libhdr.h"
@@ -132 +130 @@
         this_thread()->current_monitors      = this->prev_mntrs;
         this_thread()->current_monitor_count = this->prev_count;
-}
-
-void debug_break() __attribute__(( noinline ))
-{
-        
 }
 
@@ -178 +171 @@
 
         //Find the next thread(s) to run
-        unsigned short thread_count = 0;
+        unsigned short thread_count = count;
         thread_desc * threads[ count ];
-        for(int i = 0; i < count; i++) {
-                threads[i] = 0;
-        }
-
-        debug_break();
 
         for( int i = 0; i < count; i++) {
                 thread_desc * new_owner = next_thread( this->monitors[i] );
-                thread_count = insert_unique( threads, thread_count, new_owner );
-        }
-
-        debug_break();
+                thread_count = insert_unique( threads, i, new_owner );
+        }
 
         LIB_DEBUG_PRINT_SAFE("Will unblock: ");
@@ -353 +339 @@
                 LIB_DEBUG_PRINT_SAFE("Branding\n");
                 assertf( thrd->current_monitors != NULL, "No current monitor to brand condition", thrd->current_monitors );
+                this->monitors = thrd->current_monitors;
                 this->monitor_count = thrd->current_monitor_count;
-
-                this->monitors = malloc( this->monitor_count * sizeof( *this->monitors ) );
-                for( int i = 0; i < this->monitor_count; i++ ) {
-                        this->monitors[i] = thrd->current_monitors[i];
-                }
         }
 }
 
 static inline unsigned short insert_unique( thread_desc ** thrds, unsigned short end, thread_desc * val ) {
-        if( !val ) return end;
-
-        for(int i = 0; i <= end; i++) {
+        for(int i = 0; i < end; i++) {
                 if( thrds[i] == val ) return end;
         }