Changeset 629c95a for libcfa/src/concurrency

Timestamp:

May 15, 2023, 1:15:12 PM (18 months ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

c0ec8b6

Parents:

5a05946

Message:

fixed bug in special OR case for channels and waituntil

File:

• libcfa/src/concurrency/channel.hfa (modified) (6 diffs)

libcfa/src/concurrency/channel.hfa

@@ +1 @@
+//
+// Cforall Version 1.0.0 Copyright (C) 2021 University of Waterloo
+//
+// The contents of this file are covered under the licence agreement in the
+// file "LICENCE" distributed with Cforall.
+//
+// channel.hfa -- LIBCFATHREAD
+// Runtime locks that used with the runtime thread system.
+//
+// Author           : Colby Alexander Parsons
+// Created On       : Thu Jan 21 19:46:50 2022
+// Last Modified By :
+// Last Modified On :
+// Update Count     :
+//
+
 #pragma once
 
 #include <locks.hfa>
 #include <list.hfa>
-#include <mutex_stmt.hfa>
 #include "select.hfa"
 
@@ -44 +59 @@
     T * buffer;
     dlist( select_node ) prods, cons; // lists of blocked threads
-    go_mutex mutex_lock;            // MX lock
-    bool closed;                    // indicates channel close/open
+    go_mutex mutex_lock;              // MX lock
+    bool closed;                      // indicates channel close/open
     #ifdef CHAN_STATS
     size_t blocks, operations;      // counts total ops and ops resulting in a blocked thd
@@ -308 +323 @@
 ///////////////////////////////////////////////////////////////////////////////////////////
 static inline bool unregister_chan( channel(T) & chan, select_node & node ) with(chan) {
-    // if ( !node`isListed && !node.park_counter ) return false; // handle special OR case
+    // if ( !node`isListed && !node.park_counter ) return false; // handle special OR case C_TODO: try adding this back
     lock( mutex_lock );
     if ( node`isListed ) { // op wasn't performed
@@ -360 +375 @@
             if ( __handle_waituntil_OR( prods ) ) {
                 __prods_handoff( chan, ret );
+                __make_select_node_sat( node ); // need to to mark SAT now that we know operation is done or else threads could get stuck in __mark_select_node
                 unlock( mutex_lock );
                 return true;
@@ -449 +465 @@
             if ( __handle_waituntil_OR( cons ) ) {
                 __cons_handoff( chan, elem );
+                __make_select_node_sat( node ); // need to to mark SAT now that we know operation is done or else threads could get stuck in __mark_select_node
                 unlock( mutex_lock );
                 return true;
@@ -504 +521 @@
 }
 
-
 } // forall( T )
 
 
-