Changes in / [c16cc99:ffac259]


Ignore:
Files:
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/bits/weakso_locks.cfa

    rc16cc99 rffac259  
    3030bool register_select( blocking_lock & this, select_node & node ) { return false; }
    3131bool unregister_select( blocking_lock & this, select_node & node ) { return false; }
    32 bool on_selected( blocking_lock & this, select_node & node ) { return true; }
     32void on_selected( blocking_lock & this, select_node & node ) {}
    3333

  • libcfa/src/bits/weakso_locks.hfa

    rc16cc99 rffac259  
    6262bool register_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
    6363bool unregister_select( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
    64 bool on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
     64void on_selected( blocking_lock & this, select_node & node ) OPTIONAL_THREAD;
    6565
    6666//----------
    … …  
    8080static inline bool   register_select( multiple_acquisition_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
    8181static inline bool   unregister_select( multiple_acquisition_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
    82 static inline bool   on_selected( multiple_acquisition_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }
     82static inline void   on_selected( multiple_acquisition_lock & this, select_node & node ) { on_selected( (blocking_lock &)this, node ); }

  • libcfa/src/concurrency/channel.hfa

    rc16cc99 rffac259  
    444444}
    445445static inline bool unregister_select( chan_read(T) & this, select_node & node ) { return unregister_chan( this.chan, node ); }
    446 static inline bool on_selected( chan_read(T) & this, select_node & node ) with(this) {
    447     if ( unlikely(node.extra == 0p) ) {
    448         if ( !exception_in_flight() ) __closed_remove( chan, ret ); // check if woken up due to closed channel
    449         else return false;
    450     }
     446static inline void on_selected( chan_read(T) & this, select_node & node ) with(this) {
     447    if ( node.extra == 0p ) // check if woken up due to closed channel
     448        __closed_remove( chan, ret );
    451449    // This is only reachable if not closed or closed exception was handled
    452     return true;
    453450}
    454451
    … …  
    539536static inline bool unregister_select( chan_write(T) & this, select_node & node ) { return unregister_chan( this.chan, node ); }
    540537
    541 static inline bool on_selected( chan_write(T) & this, select_node & node ) with(this) {
    542     if ( unlikely(node.extra == 0p) ) {
    543         if ( !exception_in_flight() ) __closed_insert( chan, elem ); // check if woken up due to closed channel
    544         else return false;
    545     }
     538static inline void on_selected( chan_write(T) & this, select_node & node ) with(this) {
     539    if ( node.extra == 0p ) // check if woken up due to closed channel
     540        __closed_insert( chan, elem );
     541
    546542    // This is only reachable if not closed or closed exception was handled
    547     return true;
    548543}
    549544

  • libcfa/src/concurrency/future.hfa

    rc16cc99 rffac259  
    180180        }
    181181               
    182         bool on_selected( future(T) & this, select_node & node ) { return true; }
     182        void on_selected( future(T) & this, select_node & node ) {}
    183183        }
    184184}

  • libcfa/src/concurrency/invoke.h

    rc16cc99 rffac259  
    255255        #ifdef __cforall
    256256        extern "Cforall" {
    257         static inline bool exception_in_flight() {
    258             return __get_stack( &active_thread()->self_cor )->exception_context.current_exception != 0p;
    259         }
    260 
    261257                static inline thread$ * volatile & ?`next ( thread$ * this ) {
    262258                        return this->user_link.next;

  • libcfa/src/concurrency/kernel.cfa

    rc16cc99 rffac259  
    569569                returnToKernel();
    570570        __enable_interrupts_checked();
     571
    571572}
    572573

  • libcfa/src/concurrency/locks.cfa

    rc16cc99 rffac259  
    239239}
    240240
    241 bool on_selected( blocking_lock & this, select_node & node ) { return true; }
     241void on_selected( blocking_lock & this, select_node & node ) {}
    242242
    243243//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/locks.hfa

    rc16cc99 rffac259  
    112112static inline bool   register_select( single_acquisition_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
    113113static inline bool   unregister_select( single_acquisition_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
    114 static inline bool   on_selected( single_acquisition_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }
     114static inline void   on_selected( single_acquisition_lock & this, select_node & node ) { on_selected( (blocking_lock &)this, node ); }
    115115
    116116//----------
    … …  
    129129static inline bool   register_select( owner_lock & this, select_node & node ) { return register_select( (blocking_lock &)this, node ); }
    130130static inline bool   unregister_select( owner_lock & this, select_node & node ) { return unregister_select( (blocking_lock &)this, node ); }
    131 static inline bool   on_selected( owner_lock & this, select_node & node ) { return on_selected( (blocking_lock &)this, node ); }
     131static inline void   on_selected( owner_lock & this, select_node & node ) { on_selected( (blocking_lock &)this, node ); }
    132132
    133133//-----------------------------------------------------------------------------
    … …  
    619619}
    620620
    621 static inline bool on_selected( simple_owner_lock & this, select_node & node ) { return true; }
     621static inline void on_selected( simple_owner_lock & this, select_node & node ) {}
    622622
    623623

  • libcfa/src/concurrency/select.cfa

    rc16cc99 rffac259  
    4949    return false;
    5050}
    51 bool on_selected( select_timeout_node & this, select_node & node ) { return true; }
     51void on_selected( select_timeout_node & this, select_node & node ) {}
    5252
    5353// Gateway routine to wait on duration

  • libcfa/src/concurrency/select.hfa

    rc16cc99 rffac259  
    9696    //    passed as an arg to this routine
    9797    // If on_selected returns false, the statement is not run, if it returns true it is run.
    98     bool on_selected( T &, select_node & );
     98    void on_selected( T &, select_node & );
    9999};
    100100
    … …  
    208208bool register_select( select_timeout_node & this, select_node & node );
    209209bool unregister_select( select_timeout_node & this, select_node & node );
    210 bool on_selected( select_timeout_node & this, select_node & node );
     210void on_selected( select_timeout_node & this, select_node & node );
    211211
    212212// Gateway routines to waituntil on duration

  • src/Concurrency/Waituntil.cpp

    rc16cc99 rffac259  
    12901290    // Collection of unregister calls on resources to be put in finally clause
    12911291    // for each clause:
    1292     // if ( !__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei ) ) { ... clausei stmt ... }
     1292    // when_cond_i = (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
    12931293    // OR if when( ... ) defined on resource
    1294     // if ( when_cond_i && (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei ) ) { ... clausei stmt ... }
     1294    // if ( when_cond_i )
     1295    //   when_cond_i =  (!__CFA_has_clause_run( clause_statuses[i] )) && unregister_select( ... , clausei );
    12951296    CompoundStmt * unregisters = new CompoundStmt( loc );
     1297
    12961298
    12971299    Expr * statusExpr; // !__CFA_has_clause_run( clause_statuses[i] )
    … …  
    13461348            new IfStmt( cLoc,
    13471349                statusExpr,
    1348                 new CompoundStmt( cLoc,
    1349                     {
    1350                         new IfStmt( cLoc,
    1351                             genSelectTraitCall( stmt->clauses.at(i), clauseData.at(i), "on_selected" ),
    1352                             ast::deepCopy( stmt->clauses.at(i)->stmt )
    1353                         )
    1354                     }
    1355                 )
    1356             )
    1357         );
    1358 
    1359         // // generates:
    1360         // // if ( statusExpr ) { ... clausei stmt ... }
    1361         // unregisters->push_back(
    1362         //     new IfStmt( cLoc,
    1363         //         statusExpr,
    1364         //         genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
    1365         //     )
    1366         // );
     1350                genStmtBlock( stmt->clauses.at(i), clauseData.at(i) )
     1351            )
     1352        );
    13671353    }
    13681354

  • tests/concurrency/waituntil/channel_close.cfa

    rc16cc99 rffac259  
    3131            }
    3232            waituntil( (in << A) ) { assert( A_removes == in ); A_removes++; removes++; }
    33             or waituntil( (in << B) ) { assert( B_removes == in ); B_removes++; removes++; }
     33            or waituntil( (in2 << B) ) { assert( B_removes == in2 ); B_removes++; removes++; }
    3434        }
    3535    } catchResume ( channel_closed * e ) {} // continue to remove until would block
    … …  
    7474    ^B{};
    7575
    76     useAnd = true;
    77 
    7876    inserts = 0;
    7977    removes = 0;
Note: See TracChangeset for help on using the changeset viewer.