Changeset 3f7e12cb for src/tests/sched-int-block.c

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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

File:

• src/tests/sched-int-block.c (modified) (5 diffs)

src/tests/sched-int-block.c

@@ +1 @@
+//---------------------------------------------------------
+// Barging test
+// Ensures that no barging can occur between :
+//   - the frontend of the signal_block and the signaled thread
+//   - the signaled  threadand the backend of the signal_block
+//---------------------------------------------------------
+
+
 #include <fstream>
 #include <kernel>
@@ -39 +47 @@
 //------------------------------------------------------------------------------
 void wait_op( global_data_t & mutex a, global_data_t & mutex b, unsigned i ) {
-        wait( &cond, (uintptr_t)this_thread );
+        wait( cond, (uintptr_t)this_thread );
 
-        yield( ((unsigned)rand48()) % 10 );
+        yield( random( 10 ) );
 
         if(a.last_thread != a.last_signaller || b.last_thread != b.last_signaller ) {
@@ -50 +58 @@
         a.last_thread = b.last_thread = this_thread;
 
-        yield( ((unsigned)rand48()) % 10 );
+        yield( random( 10 ) );
 }
 
@@ -62 +70 @@
 //------------------------------------------------------------------------------
 void signal_op( global_data_t & mutex a, global_data_t & mutex b ) {
-        yield( ((unsigned)rand48()) % 10 );
+        yield( random( 10 ) );
 
         [a.last_thread, b.last_thread, a.last_signaller, b.last_signaller] = this_thread;
 
-        if( !is_empty( &cond ) ) {
+        if( !is_empty( cond ) ) {
 
-                thread_desc * next = front( &cond );
+                thread_desc * next = front( cond );
 
-                if( ! signal_block( &cond ) ) {
+                if( ! signal_block( cond ) ) {
                         sout | "ERROR expected to be able to signal" | endl;
                         abort();
                 }
 
-                yield( ((unsigned)rand48()) % 10 );
+                yield( random( 10 ) );
 
                 if(a.last_thread != next || b.last_thread != next) {
@@ -110 +118 @@
 
 int main(int argc, char* argv[]) {
-        rand48seed( time( NULL ) );
+        random_seed( time( NULL ) );
         done = false;
         processor p;