Changeset 7b28e4a for src/tests/preempt_longrun/enter.c

Timestamp:

Jun 8, 2018, 1:40:52 PM (7 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

File:

• src/tests/preempt_longrun/enter.c (modified) (2 diffs)

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;
         }
 }