Changeset 80c72a7


Ignore:
Timestamp:
Aug 22, 2017, 1:48:07 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, 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:
4 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/invoke.h

    r90c4df0 r80c72a7  
    9494            unsigned short acceptable_count;          // number of acceptable functions
    9595            short accepted_index;                     // the index of the accepted function, -1 if none
    96             fptr_t pre_accept;                        // function to run before an accept
    9796       };
    9897
  • src/libcfa/concurrency/monitor

    r90c4df0 r80c72a7  
    3131        this->acceptable_count = 0;
    3232        this->accepted_index = -1;
    33         this->pre_accept = 0;
    3433}
    3534
     
    104103        unsigned short count;
    105104        monitor_desc ** monitors;
    106         bool run_preaccept;
    107105};
    108106
  • src/libcfa/concurrency/monitor.c

    r90c4df0 r80c72a7  
    182182                __enter_monitor_desc( monitors[i], monitors, count, func );
    183183        }
    184 
    185         int acc_idx = monitors[0]->accepted_index;
    186         if( acc_idx >= 0 && monitors[0]->acceptables[ acc_idx ].run_preaccept ) {
    187                 assert( monitors[0]->pre_accept );
    188                 monitors[0]->pre_accept();
    189         }
    190184}
    191185
  • src/tests/sched-ext.c

    r90c4df0 r80c72a7  
    4444        acceptable.count         = 1;
    4545        acceptable.monitors      = &a;
    46         acceptable.run_preaccept = false;
    4746
    4847        __accept_internal( 1, &acceptable );
Note: See TracChangeset for help on using the changeset viewer.