Changeset 7b28e4a for src/tests

Timestamp:

Jun 8, 2018, 1:40:52 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

332d3c2, 9c32e21

Parents:

90cedbdd (diff), beefc34c (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 plg2:software/cfa/cfa-cc

Location:

src/tests/preempt_longrun

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• enter.c (modified) (2 diffs)
• processor.c (modified) (2 diffs)

src/tests/preempt_longrun/Makefile.am

@@ -34 +34 @@
 
 clean-local:
-        rm -f ${TESTS}
+        rm -f ${TESTS} core* out.log
 
 % : %.c ${CC}

src/tests/preempt_longrun/Makefile.in

@@ -878 +878 @@
 
 clean-local:
-        rm -f ${TESTS}
+        rm -f ${TESTS} core* out.log
 
 % : %.c ${CC}

src/tests/preempt_longrun/enter.c

@@ -15 +15 @@
 
 monitor mon_t {};
+void foo( mon_t & mutex this ) {}
 
 mon_t mon;
-
-void foo( mon_t & mutex this ) {}
-
 thread worker_t {};
-
 void main( worker_t & this ) {
         for( unsigned long i = 0; i < N; i++ ) {
@@ -28 +25 @@
 }
 
-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

@@ -13 +13 @@
 }
 
-static const unsigned long N = 5_000ul;
+static const unsigned long N = 50_000ul;
 
 int main(int argc, char* argv[]) {
         processor * p[15];
-        write(STDERR_FILENO, "Preparing\n", sizeof("Preparing\n"));
+        write(STDOUT_FILENO, "Preparing\n", sizeof("Preparing\n"));
         for ( int pi = 0; pi < 15; pi++ ) {
                 p[pi] = new();
         }
-        write(STDERR_FILENO, "Starting\n", sizeof("Starting\n"));
+        write(STDOUT_FILENO, "Starting\n", sizeof("Starting\n"));
         for ( int i = 0; i < N; i++) {
                 int pi = i % 15;
@@ -27 +27 @@
                 p[pi] = new();
         }
-        write(STDERR_FILENO, "Stopping\n", sizeof("Stopping\n"));
+        write(STDOUT_FILENO, "Stopping\n", sizeof("Stopping\n"));
         for ( int pi = 0; pi < 15; pi++ ) {
                 delete( p[pi] );
         }
-        write(STDERR_FILENO, "Done\n", sizeof("Done\n"));
+        write(STDOUT_FILENO, "Done\n", sizeof("Done\n"));
 }