Changeset d964c39 for libcfa/src/concurrency

Timestamp:

Feb 25, 2023, 6:45:44 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

601bd9e

Parents:

ce44c5f (diff), 2d028003 (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

Location:

libcfa/src/concurrency

Files:

• clib/cfathread.cfa (modified) (3 diffs)
• clib/cfathread.h (modified) (1 diff)
• io/call.cfa.in (modified) (1 diff)
• iofwd.hfa (modified) (1 diff)
• kernel/cluster.hfa (modified) (1 diff)
• mutex_stmt.hfa (modified) (1 diff)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -16 +16 @@
 // #define EPOLL_FOR_SOCKETS
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
+#include <sys/socket.h>
 
 #include "fstream.hfa"
@@ -27 +28 @@
 #include "time.hfa"
 #include "stdlib.hfa"
-
+#include "iofwd.hfa"
 #include "cfathread.h"
 
@@ -470 +471 @@
 }
 
-#include <unistd.h>
-
-#include <iofwd.hfa>
-
 extern "C" {
         //--------------------

libcfa/src/concurrency/clib/cfathread.h

@@ -10 +10 @@
 // Created On       : Tue Sep 22 15:31:20 2020
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 16 12:00:32 2023
-// Update Count     : 5
+// Last Modified On : Sat Feb 25 17:39:20 2023
+// Update Count     : 6
 //
 
 #if defined(__cforall) || defined(__cplusplus)
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
 #include <errno.h>
+#include <sys/socket.h>
 
 extern "C" {

libcfa/src/concurrency/io/call.cfa.in

@@ -31 +31 @@
 Prelude = """#define __cforall_thread__
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <time.hfa>
 

libcfa/src/concurrency/iofwd.hfa

@@ -16 +16 @@
 #pragma once
 
-#include <sys/socket.h> // first include because of anonymous types __SOCKADDR_ARG, __CONST_SOCKADDR_ARG
 #include <unistd.h>
+#include <sys/socket.h>
 
 extern "C" {

libcfa/src/concurrency/kernel/cluster.hfa

@@ -146 +146 @@
 }
 
-static struct {
-        const unsigned readyq;
-        const unsigned io;
+const static struct {
+        unsigned readyq;
+        unsigned io;
 } __shard_factor = { 2, 1 };
 

libcfa/src/concurrency/mutex_stmt.hfa

@@ -4 +4 @@
 //-----------------------------------------------------------------------------
 // is_lock
-trait is_lock(L & | sized(L)) {
+forall(L & | sized(L))
+trait is_lock {
         // For acquiring a lock
         void lock( L & );