Changeset 84c52a8

Timestamp:

Mar 15, 2017, 4:14:31 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:

348006f

Parents:

c3acb841

Message:

Renamed monitor_t to monitor_desc

Location:

src

Files:

• libcfa/concurrency/monitor (modified) (4 diffs)
• libcfa/concurrency/monitor.c (modified) (5 diffs)
• tests/monitor.c (modified) (2 diffs)
• tests/multi-monitor.c (modified) (1 diff)

src/libcfa/concurrency/monitor

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

src/libcfa/concurrency/monitor.c

@@ -6 +6 @@
 // file "LICENCE" distributed with Cforall.
 //
-// __monitor_t.c --
+// monitor_desc.c --
 //
 // Author           : Thierry Delisle
@@ -19 +19 @@
 #include "kernel_private.h"
 
-void enter(__monitor_t * this) {
+void enter(monitor_desc * this) {
         lock( &this->lock );
         thread * thrd = this_thread();
@@ -45 +45 @@
 }
 
-void leave(__monitor_t * this) {
+void leave(monitor_desc * this) {
         lock( &this->lock );
 
@@ -72 +72 @@
 }
 
-void enter(__monitor_t ** monitors, int count) {
+void enter(monitor_desc ** monitors, int count) {
         for(int i = 0; i < count; i++) {
                 // printf("%d\n", i);
@@ -79 +79 @@
 }
 
-void leave(__monitor_t ** monitors, int count) {
+void leave(monitor_desc ** monitors, int count) {
         for(int i = count - 1; i >= 0; i--) {
                 // printf("%d\n", i);

src/tests/monitor.c

@@ -6 +6 @@
 struct global_t {
         int value;
-        __monitor_t m;
+        monitor_desc m;
 };
 
@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        __monitor_t * mon = &this->m;
+        monitor_desc * mon = &this->m;
         monitor_guard_t g1 = { &mon };
         {

src/tests/multi-monitor.c

@@ -6 +6 @@
 static int global12, global23, global13;
 
-static __monitor_t m1, m2, m3;
+static monitor_desc m1, m2, m3;
 
-void increment( /*mutex*/ __monitor_t * p1, /*mutex*/ __monitor_t * p2, int * value ) {
-        __monitor_t * mons[] = { p1, p2 };
+void increment( /*mutex*/ monitor_desc * p1, /*mutex*/ monitor_desc * p2, int * value ) {
+        monitor_desc * mons[] = { p1, p2 };
         monitor_guard_t g = { mons, 2 };
         *value += 1;