Changeset 87d13cd for src/libcfa/concurrency/monitor

Timestamp:

Mar 21, 2017, 10:07:52 PM (9 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, resolv-new, with_gc

Children:

cb91437

Parents:

829c907 (diff), a53e10a (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:

fix conflicit in iostream.c

File:

• src/libcfa/concurrency/monitor (modified) (2 diffs)

src/libcfa/concurrency/monitor

@@ -22 +22 @@
 #include "stdlib"
 
-struct monitor_desc {
-        spinlock lock;
-        thread_desc * owner;
-        simple_thread_list entry_queue;
-        unsigned int recursion;
-};
-
 static inline void ?{}(monitor_desc * this) {
         this->owner = 0;
         this->recursion = 0;
 }
-
-//Basic entering routine
-void enter(monitor_desc *);
-void leave(monitor_desc *);
 
 //Array entering routine
@@ -49 +38 @@
 static inline int ?<?(monitor_desc* lhs, monitor_desc* rhs) {
         return ((intptr_t)lhs) < ((intptr_t)rhs);
-}
-
-static inline void ?{}( monitor_guard_t * this, monitor_desc ** m ) {
-        this->m = m;
-        this->count = 1;
-        enter( *this->m );
 }