Changeset 80c72a7 for src

Timestamp:

Aug 22, 2017, 1:48:07 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:

3eab0ef6

Parents:

90c4df0

Message:

Remove the pre_accept stuff in external scheduling which was a doomed attempt and handling destructors

Location:

src

Files:

• libcfa/concurrency/invoke.h (modified) (1 diff)
• libcfa/concurrency/monitor (modified) (2 diffs)
• libcfa/concurrency/monitor.c (modified) (1 diff)
• tests/sched-ext.c (modified) (1 diff)

src/libcfa/concurrency/invoke.h

@@ -94 +94 @@
             unsigned short acceptable_count;          // number of acceptable functions
             short accepted_index;                     // the index of the accepted function, -1 if none
-            fptr_t pre_accept;                        // function to run before an accept
        };
 

src/libcfa/concurrency/monitor

@@ -31 +31 @@
         this->acceptable_count = 0;
         this->accepted_index = -1;
-        this->pre_accept = 0;
 }
 
@@ -104 +103 @@
         unsigned short count;
         monitor_desc ** monitors;
-        bool run_preaccept;
 };
 

src/libcfa/concurrency/monitor.c

@@ -182 +182 @@
                 __enter_monitor_desc( monitors[i], monitors, count, func );
         }
-
-        int acc_idx = monitors[0]->accepted_index;
-        if( acc_idx >= 0 && monitors[0]->acceptables[ acc_idx ].run_preaccept ) {
-                assert( monitors[0]->pre_accept );
-                monitors[0]->pre_accept();
-        }
 }
 

src/tests/sched-ext.c

@@ -44 +44 @@
         acceptable.count         = 1;
         acceptable.monitors      = &a;
-        acceptable.run_preaccept = false;
 
         __accept_internal( 1, &acceptable );