Changeset d964c39 for libcfa/src

Timestamp:

Feb 25, 2023, 6:45:44 PM (22 months 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

Files:

• concurrency/clib/cfathread.cfa (modified) (3 diffs)
• concurrency/clib/cfathread.h (modified) (1 diff)
• concurrency/io/call.cfa.in (modified) (1 diff)
• concurrency/iofwd.hfa (modified) (1 diff)
• concurrency/kernel/cluster.hfa (modified) (1 diff)
• concurrency/mutex_stmt.hfa (modified) (1 diff)
• interpose.cfa (modified) (3 diffs)
• limits.cfa (modified) (1 diff)
• vec/vec.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 & );

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Feb 19 17:09:16 2023
-// Update Count     : 183
+// Last Modified On : Fri Feb 24 15:31:03 2023
+// Update Count     : 185
 //
 
@@ -101 +101 @@
                 preload_libgcc();
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
+                #pragma GCC diagnostic push
+                #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
                 INTERPOSE_LIBC( abort, version );
                 INTERPOSE_LIBC( exit , version );
-#pragma GCC diagnostic pop
+                #pragma GCC diagnostic pop
 
                 if(__cfathreadabi_interpose_startup) __cfathreadabi_interpose_startup( do_interpose_symbol );
@@ -273 +273 @@
         va_start( args, fmt );
         __abort( false, fmt, args );
-    // CONTROL NEVER REACHES HERE!
+        // CONTROL NEVER REACHES HERE!
         va_end( args );
 }
 
 void abort( bool signalAbort, const char fmt[], ... ) {
-    va_list args;
-    va_start( args, fmt );
-    __abort( signalAbort, fmt, args );
-    // CONTROL NEVER REACHES HERE!
-    va_end( args );
+        va_list args;
+        va_start( args, fmt );
+        __abort( signalAbort, fmt, args );
+        // CONTROL NEVER REACHES HERE!
+        va_end( args );
 }
 

libcfa/src/limits.cfa

@@ -10 +10 @@
 // Created On       : Wed Apr  6 18:06:52 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan  8 18:53:17 2023
-// Update Count     : 86
+// Last Modified On : Fri Feb 17 12:25:39 2023
+// Update Count     : 87
 //
 
-// need _GNU_SOURCE to access long double M_*l in math.h
 #include <limits.h>
 #include <float.h>

libcfa/src/vec/vec.hfa

@@ -18 +18 @@
 #include <math.hfa>
 
-trait fromint(T) {
+forall(T)
+trait fromint {
     void ?{}(T&, int);
 };
-trait zeroinit(T) {
+forall(T)
+trait zeroinit {
     void ?{}(T&, zero_t);
 };
-trait zero_assign(T) {
+forall(T)
+trait zero_assign {
     T ?=?(T&, zero_t);
 };
-trait subtract(T) {
+forall(T)
+trait subtract {
     T ?-?(T, T);
 };
-trait negate(T) {
+forall(T)
+trait negate {
     T -?(T);
 };
-trait add(T) {
+forall(T)
+trait add {
     T ?+?(T, T);
 };
-trait multiply(T) {
+forall(T)
+trait multiply {
     T ?*?(T, T);
 };
-trait divide(T) {
+forall(T)
+trait divide {
     T ?/?(T, T);
 };
-trait lessthan(T) {
+forall(T)
+trait lessthan {
     int ?<?(T, T);
 };
-trait equality(T) {
+forall(T)
+trait equality {
     int ?==?(T, T);
 };
-trait sqrt(T) {
+forall(T)
+trait sqrt {
     T sqrt(T);
 };