Changeset 6a490b2 for tests/concurrent

Timestamp:

May 11, 2020, 1:53:29 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

504a7dc

Parents:

b7d6a36 (diff), a7b486b (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' into relaxed_ready

Location:

tests/concurrent

Files:

• .expect/monitor.txt (modified) (1 diff)
• .expect/suspend_then.txt (added)
• coroutineYield.cfa (modified) (1 diff)
• monitor.cfa (modified) (1 diff)
• multi-monitor.cfa (modified) (1 diff)
• park/.expect/contention.txt (added)
• park/.expect/force_preempt.txt (added)
• park/contention.cfa (added)
• park/force_preempt.cfa (added)
• signal/block.cfa (modified) (2 diffs)
• suspend_then.cfa (moved) (moved from tests/concurrent/coroutineThen.cfa) (6 diffs)

tests/concurrent/.expect/monitor.txt

@@ -1 @@
-4000000
+3000000

tests/concurrent/coroutineYield.cfa

@@ -33 +33 @@
                         sout | "Coroutine 2";
                 #endif
-                suspend();
+                suspend;
         }
 }

tests/concurrent/monitor.cfa

@@ -29 +29 @@
 
 void main( MyThread & this ) {
-        for(int i = 0; i < 1_000_000; i++) {
+        for(int i = 0; i < 750_000; i++) {
                 increment( global );
         }

tests/concurrent/multi-monitor.cfa

@@ -11 +11 @@
 
 void increment( monitor_t & mutex p1, monitor_t & mutex p2, int & value ) {
+        assert(active_thread() == get_monitor(p1)->owner);
+        assert(active_thread() == get_monitor(p2)->owner);
         value += 1;
+        assert(active_thread() == get_monitor(p1)->owner);
+        assert(active_thread() == get_monitor(p2)->owner);
 }
 

tests/concurrent/signal/block.cfa

@@ -33 +33 @@
 
 monitor global_data_t {
-        thread_desc * last_thread;
-        thread_desc * last_signaller;
+        $thread * last_thread;
+        $thread * last_signaller;
 };
 
@@ -82 +82 @@
         if( !is_empty( cond ) ) {
 
-                thread_desc * next = front( cond );
+                $thread * next = front( cond );
 
                 if( ! signal_block( cond ) ) {

tests/concurrent/suspend_then.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 #include <kernel.hfa>
-#include <monitor.hfa>
 #include <thread.hfa>
 #include <time.hfa>
@@ -10 +9 @@
 #include "long_tests.hfa"
 
-#ifndef PREEMPTION_RATE
-#define PREEMPTION_RATE 10`ms
-#endif
-
 Duration default_preemption() {
-        return PREEMPTION_RATE;
+        return 0;
 }
 
@@ -26 +21 @@
 #if !defined(TEST_FOREVER)
         static inline void print(const char * const text ) {
-                write( STDERR_FILENO, text, strlen(text) );
+                write( STDOUT_FILENO, text, strlen(text) );
         }
 #else
@@ -32 +27 @@
 #endif
 
-coroutine Coroutine {};
+generator Coroutine { int i; };
 
 volatile bool done = false;
@@ -49 +44 @@
 
 void main(Coroutine& this) {
-        suspend();
-        for(int i = 0; TEST(i < N); i++) {
+        this.i = 0;
+        suspend;
+        for(;TEST(this.i < N); this.i++) {
 
-                print("C - Suspending");
-                void publish() {
-                        print("C - Publishing");
+                print("C - Suspending\n");
+                suspend{
+                        print("C - Publishing\n");
                         assert(!the_cor);
                         store( this );
                 }
-                suspend_then(publish);
                 assert(!the_cor);
-                print("Coroutine 2");
+                print("C - Back\n");
                 KICK_WATCHDOG;
                 yield();
         }
         done = true;
-        suspend();
+        suspend;
 }
 
@@ -77 +72 @@
                 if(!mine) continue;
 
-                print("T - took");
+                print("T - took\n");
                 resume(*mine);
-                print("T - back");
         }
 }