Changeset 0322865c

Timestamp:

Jul 11, 2017, 3:11:42 PM (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:

f2b12406

Parents:

67f2170

Message:

Cleaned long tests to be more consistent and offer more debug information

Location:

src/tests

Files:

• preempt.c (modified) (2 diffs)
• preempt_longrun/create.c (modified) (1 diff)
• preempt_longrun/enter.c (modified) (1 diff)
• preempt_longrun/enter3.c (modified) (1 diff)
• preempt_longrun/processor.c (modified) (1 diff)
• preempt_longrun/stack.c (modified) (2 diffs)
• preempt_longrun/yield.c (modified) (2 diffs)
• sched-int-disjoint.c (modified) (6 diffs)

src/tests/preempt.c

@@ -12 +12 @@
 static volatile int counter = 0;
 
-thread Worker {
+thread worker_t {
         int value;
 };
 
-void ?{}( Worker * this, int value ) {
+void ?{}( worker_t * this, int value ) {
         this->value = value;
 }
 
-void main(Worker * this) {
+void main(worker_t * this) {
         while(counter < 1000) {
                 if( (counter % 7) == this->value ) {
@@ -32 +32 @@
         processor p;
         {
-                Worker w0 = 0;
-                Worker w1 = 1;
-                Worker w2 = 2;
-                Worker w3 = 3;
-                Worker w4 = 4;
-                Worker w5 = 5;
-                Worker w6 = 6;
+                worker_t w0 = 0;
+                worker_t w1 = 1;
+                worker_t w2 = 2;
+                worker_t w3 = 3;
+                worker_t w4 = 4;
+                worker_t w5 = 5;
+                worker_t w6 = 6;
         }
 }

src/tests/preempt_longrun/create.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {}
+void main(worker_t * this) {}
 
 int main(int argc, char* argv[]) {
-        for(int i = 0; i < 250_000ul; i++) {
-                Worker w;
+        for(int i = 0; i < 10_000ul; i++) {
+                worker_t w[7];
         }
 }

src/tests/preempt_longrun/enter.c

@@ -28 +28 @@
 }
 
+extern "C" {
+static worker_t * workers;
+}
+
 int main(int argc, char * argv[] ) {
         processor p;
         {
                 worker_t w[7];
+                workers = w;
         }
 }

src/tests/preempt_longrun/enter3.c

@@ -28 +28 @@
 }
 
+extern "C" {
+static worker_t * workers;
+}
+
 int main(int argc, char * argv[] ) {
         processor p;
         {
                 worker_t w[7];
+                workers = w;
         }
 }

src/tests/preempt_longrun/processor.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {}
+void main(worker_t * this) {}
 
 int main(int argc, char* argv[]) {

src/tests/preempt_longrun/stack.c

@@ -12 +12 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {
+void main(worker_t * this) {
         volatile long p = 5_021_609ul;
         volatile long a = 326_417ul;
         volatile long n = 1l;
-        for (volatile long i = 0; i < p; i++) { 
-                n *= a; 
-                n %= p; 
+        for (volatile long i = 0; i < p; i++) {
+                n *= a;
+                n %= p;
         }
-                
+
         if( n != a ) {
                 abort();
@@ -28 +28 @@
 }
 
+extern "C" {
+static worker_t * workers;
+}
+
 int main(int argc, char* argv[]) {
         processor p;
         {
-                Worker w[7];
+                worker_t w[7];
+                workers = w;
         }
 }

src/tests/preempt_longrun/yield.c

@@ -10 +10 @@
 }
 
-thread Worker {};
+thread worker_t {};
 
-void main(Worker * this) {
+void main(worker_t * this) {
         for(int i = 0; i < 325_000ul; i++) {
                 yield();
@@ -18 +18 @@
 }
 
+extern "C" {
+static worker_t * workers;
+}
+
 int main(int argc, char* argv[]) {
         processor p;
         {
-                Worker w[7];
+                worker_t w[7];
+                workers = w;
         }
 }

src/tests/sched-int-disjoint.c

@@ -5 +5 @@
 
 #ifndef N
-#define N 100_000
+#define N 10_000
 #endif
 
@@ -42 +42 @@
 
 void main( Barger * this ) {
-        while( !all_done ) { 
+        while( !all_done ) {
                 barge( &data );
-                yield(); 
+                yield();
         }
 }
@@ -53 +53 @@
         wait( &cond );
         if( d->state != SIGNAL ) {
-                sout | "ERROR barging!" | endl; 
+                sout | "ERROR barging!" | endl;
         }
 
@@ -85 +85 @@
         bool running = data.counter < N && data.counter > 0;
         if( data.state != SIGNAL && running ) {
-                sout | "ERROR Eager signal" | data.state | endl; 
+                sout | "ERROR Eager signal" | data.state | endl;
         }
 }
@@ -92 +92 @@
 
 void main( Signaller * this ) {
-        while( !all_done ) { 
+        while( !all_done ) {
                 logic( &mut );
-                yield(); 
+                yield();
         }
 }
@@ -111 +111 @@
                 sout | "All waiter done" | endl;
                 all_done = true;
-        }       
+        }
 }