Changeset e706bfd for src/libcfa

Timestamp:

Nov 2, 2017, 3:48:22 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, stuck-waitfor-destruct, with_gc

Children:

bbeb908

Parents:

64b272a (diff), 0dc954b (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/libcfa

Files:

• bits/algorithms.h (added)
• concurrency/monitor.c (modified) (6 diffs)
• stdlib (modified) (3 diffs)
• stdlib.c (modified) (2 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;
 }

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 23 20:29:47 2017
-// Update Count     : 224
+// Last Modified On : Tue Oct 31 13:47:24 2017
+// Update Count     : 245
 //
 
@@ -27 +27 @@
 // allocation, non-array types
 static inline forall( dtype T | sized(T) ) T * malloc( void ) {
-        //printf( "X1\n" );
+        // printf( "* malloc\n" );
         return (T *)(void *)malloc( (size_t)sizeof(T) );        // C malloc
 } // malloc
+
+// static inline forall( dtype T | sized(T) ) T & malloc( void ) {
+//      int & p = *(T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
+//      printf( "& malloc %p\n", &p );
+//      return p;
+// //   return (T &)*(T *)(void *)malloc( (size_t)sizeof(T) ); // C malloc
+// } // malloc
 
 extern "C" { void * calloc( size_t dim, size_t size ); } // default C routine
@@ -206 +213 @@
 //---------------------------------------
 
-void rand48seed( long int s );
-char rand48( void );
-int rand48( void );
-unsigned int rand48( void );
-long int rand48( void );
-unsigned long int rand48( void );
-float rand48( void );
-double rand48( void );
-float _Complex rand48( void );
-double _Complex rand48( void );
-long double _Complex rand48( void );
+void random_seed( long int s );
+char random( void );
+char random( char l, char u );
+int random( void );
+unsigned int random( void );
+unsigned int random( unsigned int u );
+unsigned int random( unsigned int l, unsigned int u );
+//long int random( void );
+unsigned long int random( void );
+unsigned long int random( unsigned long int u );
+unsigned long int random( unsigned long int l, unsigned long int u );
+float random( void );
+double random( void );
+float _Complex random( void );
+double _Complex random( void );
+long double _Complex random( void );
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 23 20:30:44 2017
-// Update Count     : 292
+// Last Modified On : Mon Oct 30 22:43:02 2017
+// Update Count     : 297
 //
 
@@ -275 +275 @@
 //---------------------------------------
 
-void rand48seed( long int s ) { srand48( s ); }
-char rand48( void ) { return mrand48(); }
-int rand48( void ) { return mrand48(); }
-unsigned int rand48( void ) { return lrand48(); }
-long int rand48( void ) { return mrand48(); }
-unsigned long int rand48( void ) { return lrand48(); }
-float rand48( void ) { return (float)drand48(); }               // otherwise float uses lrand48
-double rand48( void ) { return drand48(); }
-float _Complex rand48( void ) { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
-double _Complex rand48( void ) { return drand48() + (double _Complex)(drand48() * _Complex_I); }
-long double _Complex rand48( void) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
+void random_seed( long int s ) { srand48( s ); }
+char random( void ) { return mrand48(); }
+char random( char l, char u ) { return lrand48() % (u - l) + l; }
+int random( void ) { return mrand48(); }
+unsigned int random( void ) { return lrand48(); }
+unsigned int random( unsigned int u ) { return lrand48() % u; }
+unsigned int random( unsigned int l, unsigned int u ) { return lrand48() % (u - l) + l; }
+//long int random( void ) { return mrand48(); }
+unsigned long int random( void ) { return lrand48(); }
+unsigned long int random( unsigned long int u ) { return lrand48() % u; }
+unsigned long int random( unsigned long int l, unsigned long int u ) { return lrand48() % (u - l) + l; }
+float random( void ) { return (float)drand48(); }               // otherwise float uses lrand48
+double random( void ) { return drand48(); }
+float _Complex random( void ) { return (float)drand48() + (float _Complex)(drand48() * _Complex_I); }
+double _Complex random( void ) { return drand48() + (double _Complex)(drand48() * _Complex_I); }
+long double _Complex random( void) { return (long double)drand48() + (long double _Complex)(drand48() * _Complex_I); }
 
 //---------------------------------------