Ignore:
Timestamp:
Aug 25, 2017, 12:11:53 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
bf7b9da7
Parents:
135b431 (diff), f676b84 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/concurrency/monitor

    r135b431 r6b224a5  
    2222#include "stdlib"
    2323
    24 static inline void ?{}(monitor_desc * this) {
    25         (&this->lock){};
    26         this->owner = NULL;
    27         (&this->entry_queue){};
    28         (&this->signal_stack){};
    29         this->recursion = 0;
    30         this->acceptables = NULL;
    31         this->acceptable_count = 0;
    32         this->accepted_index = -1;
     24static inline void ?{}(monitor_desc & this) {
     25        (this.lock){};
     26        this.owner = NULL;
     27        (this.entry_queue){};
     28        (this.signal_stack){};
     29        this.recursion = 0;
     30        this.acceptables = NULL;
     31        this.acceptable_count = 0;
     32        this.accepted_index = -1;
    3333}
    3434
     
    4545}
    4646
    47 void ?{}( monitor_guard_t * this, monitor_desc ** m, int count, void (*func)() );
    48 void ^?{}( monitor_guard_t * this );
     47void ?{}( monitor_guard_t & this, monitor_desc ** m, int count );
     48void ^?{}( monitor_guard_t & this );
    4949
    5050//-----------------------------------------------------------------------------
     
    7171};
    7272
    73 void ?{}( __condition_blocked_queue_t * );
     73void ?{}( __condition_blocked_queue_t & );
    7474void append( __condition_blocked_queue_t *, __condition_node_t * );
    7575__condition_node_t * pop_head( __condition_blocked_queue_t * );
     
    8181};
    8282
    83 static inline void ?{}( condition * this ) {
    84         this->monitors = NULL;
    85         this->monitor_count = 0;
     83static inline void ?{}( condition & this ) {
     84        this.monitors = NULL;
     85        this.monitor_count = 0;
    8686}
    8787
    88 static inline void ^?{}( condition * this ) {
    89         free( this->monitors );
     88static inline void ^?{}( condition & this ) {
     89        free( this.monitors );
    9090}
    9191
Note: See TracChangeset for help on using the changeset viewer.