Changeset 5434d04 for src/libcfa

Timestamp:

Oct 30, 2017, 6:24:31 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e1e8408, fa477f7

Parents:

2ba0bc7 (diff), 8a48f4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• bits/algorithms.h (added)
• concurrency/monitor.c (modified) (6 diffs)

src/libcfa/concurrency/monitor.c

@@ -21 +21 @@
 #include "kernel_private.h"
 
+#include "bits/algorithms.h"
+
 //-----------------------------------------------------------------------------
 // Forward declarations
@@ -291 +293 @@
 
         // Sort monitors based on address -> TODO use a sort specialized for small numbers
-        qsort(this.m, count);
+        __libcfa_small_sort(this.m, count);
 
         // Save previous thread context
@@ -492 +494 @@
         set_owner( monitors, count, signallee );
 
+        LIB_DEBUG_PRINT_BUFFER_DECL( "Kernel : signal_block condition %p (s: %p)\n", this, signallee );
+
         //Everything is ready to go to sleep
         BlockInternal( locks, count, &signallee, 1 );
@@ -498 +502 @@
         // WE WOKE UP
 
+
+        LIB_DEBUG_PRINT_BUFFER_LOCAL( "Kernel :   signal_block returned\n" );
 
         //We are back, restore the masks and recursions
@@ -869 +875 @@
         short size = 0;
         for( int i = 0; i < mask.size; i++ ) {
-                qsort( mask.clauses[i].list, mask.clauses[i].size );
+                __libcfa_small_sort( mask.clauses[i].list, mask.clauses[i].size );
                 for( int j = 0; j < mask.clauses[i].size; j++) {
                         insert_unique( storage, size, mask.clauses[i].list[j] );
@@ -875 +881 @@
         }
         // TODO insertion sort instead of this
-        qsort( storage, size );
+        __libcfa_small_sort( storage, size );
         return size;
 }