Changeset f07e037 for src

Timestamp:

Feb 23, 2017, 4:24:35 PM (8 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:

3bb51e1

Parents:

485fdcf

Message:

Basic monitor implementation

Location:

src/libcfa/concurrency

Files:

• kernel.c (modified) (2 diffs)
• monitor (modified) (1 diff)
• monitor.c (modified) (1 diff)
• threads (modified) (1 diff)
• threads.c (modified) (1 diff)

src/libcfa/concurrency/kernel.c

@@ -457 +457 @@
 void append( simple_thread_list * this, thread * t ) {
         assert( t->next == NULL );
+        assert(this->tail != NULL);
         *this->tail = t;
         this->tail = &t->next;
+        assert(this->tail != NULL);
 }
 
 thread * pop_head( simple_thread_list * this ) {
+        assert(this->tail != NULL);
         thread * head = this->head;
         if( head ) {
@@ -470 +473 @@
                 head->next = NULL;
         }       
-        
+        assert(this->tail != NULL);
         return head;
 }

src/libcfa/concurrency/monitor

@@ +1 @@
+//                              -*- Mode: CFA -*-
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// monitor --
+//
+// Author           : Thierry Delisle
+// Created On       : Thd Feb 23 12:27:26 2017
+// Last Modified By : Thierry Delisle
+// Last Modified On : --
+// Update Count     : 0
+//
+
+#ifndef MONITOR_H
+#define MONITOR_H
+
+#include "assert"
+#include "invoke.h"
+
+struct monitor {
+        spinlock lock;
+        thread * holder;
+        simple_thread_list entry_queue;
+};
+
+void enter(monitor *);
+void leave(monitor *);
+
+#endif //MONITOR_H

src/libcfa/concurrency/monitor.c

@@ +1 @@
+//                              -*- Mode: CFA -*-
+//
+// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// monitor.c --
+//
+// Author           : Thierry Delisle
+// Created On       : Thd Feb 23 12:27:26 2017
+// Last Modified By : Thierry Delisle
+// Last Modified On : --
+// Update Count     : 0
+//
+
+#include "monitor"
+
+#include "kernel_private.h"
+
+void enter(monitor * this) {
+        lock( &this->lock );
+        thread * thrd = this_thread();
+
+        assert( this->entry_queue.tail != NULL );
+
+        if( this->holder ) {
+                append( &this->entry_queue, thrd );
+                ScheduleInternal( &this->lock );
+                return;
+        }
+        else {
+                this->holder = thrd;
+        }
+
+        assert( this->entry_queue.tail != NULL );       
+
+        unlock( &this->lock );
+}
+
+void leave(monitor * this) {
+        lock( &this->lock );
+
+        assert( this->entry_queue.tail != NULL );       
+
+        thread * thrd = this_thread();
+        assert( thrd == this->holder );
+
+        this->holder = pop_head( &this->entry_queue );
+
+        assert( this->entry_queue.tail != NULL );       
+
+        unlock( &this->lock );
+        if( this->holder ) ScheduleThread( this->holder );
+}

src/libcfa/concurrency/threads

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Thierry Delisle
 // Last Modified On : --

src/libcfa/concurrency/threads.c

@@ -9 +9 @@
 //
 // Author           : Thierry Delisle
-// Created On       : Tue Jan 17 12:27:26 2016
+// Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Thierry Delisle
 // Last Modified On : --