Changeset e1e8408

Timestamp:

Oct 31, 2017, 11:17:46 AM (7 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, with_gc

Children:

0dc954b, 4cedd9f

Parents:

5434d04

Message:

Updated concurrency tests with bounded rand48

Location:

src

Files:

• libcfa/bits/algorithms.h (modified) (1 diff)
• libcfa/stdlib (modified) (1 diff)
• tests/sched-ext-barge.c (modified) (3 diffs)
• tests/sched-ext-dtor.c (modified) (2 diffs)
• tests/sched-ext-recurse.c (modified) (2 diffs)
• tests/sched-ext-when.c (modified) (1 diff)
• tests/sched-ext.c (modified) (2 diffs)
• tests/sched-int-barge.c (modified) (1 diff)
• tests/sched-int-block.c (modified) (4 diffs)
• tests/sched-int-disjoint.c (modified) (1 diff)
• tests/sched-int-wait.c (modified) (1 diff)

src/libcfa/bits/algorithms.h

@@ -112 +112 @@
 static inline void __libcfa_small_sortN( void* * arr, size_t dim );
 
-forall( otype T | {  int ?<?( T, T ); int ?>?( T, T ); } )
-static inline void __libcfa_small_sort( T * arr, size_t dim ) {
+forall( dtype T )
+static inline void __libcfa_small_sort( T* * arr, size_t dim ) {
         switch( dim ) {
                 case 1 : return;

src/libcfa/stdlib

@@ -215 +215 @@
 void rand48seed( long int s );
 char rand48( void );
-char rand48( char l, char u );
+char rand48( char lower_bound, char upper_bound );
 int rand48( void );
 unsigned int rand48( void );
-unsigned int rand48( unsigned int u );
-unsigned int rand48( unsigned int l, unsigned int u );
+unsigned int rand48( unsigned int upper_bound );
+unsigned int rand48( unsigned int lower_bound, unsigned int upper_bound );
 long int rand48( void );
 unsigned long int rand48( void );
-unsigned long int rand48( unsigned long int u );
-unsigned long int rand48( unsigned long int l, unsigned long int u );
+unsigned long int rand48( unsigned long int upper_bound );
+unsigned long int rand48( unsigned long int lower_bound, unsigned long int upper_bound );
 float rand48( void );
 double rand48( void );

src/tests/sched-ext-barge.c

@@ -42 +42 @@
 void main( barger_t & this ) {
         yield();
-        while( barge( global ) ) { yield(((unsigned)rand48()) % 10); }
+        while( barge( global ) ) { yield( rand48(10) ); }
 }
 
 bool do_call( global_t & mutex this ) {
-        yield(((unsigned)rand48()) % 10);
+        yield(rand48(10));
         if( this.state != WAITFOR && !this.done && this.started ) {
                 serr | "Barging before caller detected" | endl;
@@ -57 +57 @@
 thread caller_t {};
 void main( caller_t & this ) {
-        while( do_call(global) ) { yield(((unsigned)rand48()) % 10); }
+        while( do_call(global) ) { yield(rand48(10)); }
 }
 
@@ -63 +63 @@
         this.started = true;
         for( int i = 0; i < N; i++) {
-                yield(((unsigned)rand48()) % 10);
+                yield(rand48(10));
                 this.state = WAITFOR;
                 waitfor(do_call, this) {

src/tests/sched-ext-dtor.c

@@ -45 +45 @@
 
 void main( dummy_t & this ) {
-        yield(((unsigned)rand48()) % 10);
+        yield(rand48(10));
         set_state( this, MAIN );
         waitfor( ^?{}, this ) {
@@ -58 +58 @@
         for( int i = 0; i < N; i++ ){
                 dummy_t dummy[4];
-                yield( ((unsigned)rand48()) % 100 );
+                yield( rand48(100) );
         }
         sout | "Stopping" | endl;

src/tests/sched-ext-recurse.c

@@ -15 +15 @@
 static const unsigned long N = 5_000ul;
 
-static inline void rand_yield() { yield(((unsigned)rand48()) % 10); }
+static inline void rand_yield() { yield(rand48(10)); }
 
 enum state_t { FIRST, SECOND, THIRD, LAST, STOP };
@@ -23 +23 @@
         for (i = 0; i < 4; i++)
         {
-                int j = ((unsigned)rand48()) % 4;
+                int j = rand48(4);
                 enum state_t t = array[j];
                 array[j] = array[i];

src/tests/sched-ext-when.c

@@ -15 +15 @@
 static const unsigned long N = 4_998ul;
 
-static inline void rand_yield() { yield(((unsigned)rand48()) % 10); }
+static inline void rand_yield() { yield(rand48(10)); }
 
 monitor global_t {

src/tests/sched-ext.c

@@ -26 +26 @@
 volatile bool done;
 
-unsigned rand10() {
-        return (unsigned)rand48() % 10;
-}
-
 //----------------------------------------------------------------------------------------------------
 // Acceptor
@@ -36 +32 @@
 void do_wait( global_t * mutex a ) {
         sout | "Waiting to accept" | endl;
-        yield( rand10() );
+        yield( rand48(10) );
 
         sout | "Accepting" | endl;

src/tests/sched-int-barge.c

@@ -64 +64 @@
 
         if( action == 0 ) {
-                c.do_signal = max( ((unsigned)rand48()) % 10, 1);
-                c.do_wait1 = ((unsigned)rand48()) % (c.do_signal);
-                c.do_wait2 = ((unsigned)rand48()) % (c.do_signal);
+                c.do_signal = max( rand48(10), 1);
+                c.do_wait1 = rand48(c.do_signal);
+                c.do_wait2 = rand48(c.do_signal);
 
                 if(c.do_wait1 == c.do_wait2) sout | "Same" | endl;

src/tests/sched-int-block.c

@@ -49 +49 @@
         wait( &cond, (uintptr_t)this_thread );
 
-        yield( ((unsigned)rand48()) % 10 );
+        yield( rand48(10) );
 
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
@@ -58 +58 @@
         a.last_thread = b.last_thread = this_thread;
 
-        yield( ((unsigned)rand48()) % 10 );
+        yield( rand48(10) );
 }
 
@@ -70 +70 @@
 //------------------------------------------------------------------------------
 void signal_op( global_data_t & mutex a, global_data_t & mutex b ) {
-        yield( ((unsigned)rand48()) % 10 );
+        yield( rand48(10) );
 
         [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
@@ -83 +83 @@
                 }
 
-                yield( ((unsigned)rand48()) % 10 );
+                yield( rand48(10) );
 
                 if(a.last_thread != next || b.last_thread != next) {

src/tests/sched-int-disjoint.c

@@ -88 +88 @@
         signal( &cond, a, data );
 
-        yield( (unsigned)rand48() % 10 );
+        yield( rand48(10) );
 
         //This is technically a mutual exclusion violation but the mutex monitor protects us

src/tests/sched-int-wait.c

@@ -62 +62 @@
 
         while( waiter_left != 0 ) {
-                unsigned action = (unsigned)rand48() % 4;
+                unsigned action = rand48(4);
                 switch( action ) {
                         case 0: