Changeset 24d6572 for libcfa/src/concurrency/clib/cfathread.cfa

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

File:

• libcfa/src/concurrency/clib/cfathread.cfa (modified) (8 diffs)

libcfa/src/concurrency/clib/cfathread.cfa

@@ -16 +16 @@
 // #define EPOLL_FOR_SOCKETS
 
+#include <string.h>
+
 #include "fstream.hfa"
 #include "locks.hfa"
@@ -23 +25 @@
 #include "time.hfa"
 #include "stdlib.hfa"
-
+#include "iofwd.hfa"
 #include "cfathread.h"
-
-extern "C" {
-                #include <string.h>
-                #include <errno.h>
-}
 
 extern void ?{}(processor &, const char[], cluster &, thread$ *);
 extern "C" {
-      extern void __cfactx_invoke_thread(void (*main)(void *), void * this);
-        extern int accept4(int sockfd, struct sockaddr *addr, socklen_t *addrlen, int flags);
+        extern void __cfactx_invoke_thread(void (*main)(void *), void * this);
 }
 
@@ -439 +435 @@
         // Mutex
         struct cfathread_mutex {
-                linear_backoff_then_block_lock impl;
+                exp_backoff_then_block_lock impl;
         };
         int cfathread_mutex_init(cfathread_mutex_t *restrict mut, const cfathread_mutexattr_t *restrict) __attribute__((nonnull (1))) { *mut = new(); return 0; }
@@ -454 +450 @@
         // Condition
         struct cfathread_condition {
-                condition_variable(linear_backoff_then_block_lock) impl;
+                condition_variable(exp_backoff_then_block_lock) impl;
         };
         int cfathread_cond_init(cfathread_cond_t *restrict cond, const cfathread_condattr_t *restrict) __attribute__((nonnull (1))) { *cond = new(); return 0; }
@@ -472 +468 @@
 }
 
-#include <iofwd.hfa>
-
 extern "C" {
-        #include <unistd.h>
-        #include <sys/types.h>
-        #include <sys/socket.h>
-
         //--------------------
         // IO operations
@@ -488 +478 @@
                 , protocol);
         }
-        int cfathread_bind(int socket, const struct sockaddr *address, socklen_t address_len) {
+        int cfathread_bind(int socket, __CONST_SOCKADDR_ARG address, socklen_t address_len) {
                 return bind(socket, address, address_len);
         }
@@ -496 +486 @@
         }
 
-        int cfathread_accept(int socket, struct sockaddr *restrict address, socklen_t *restrict address_len) {
+        int cfathread_accept(int socket, __SOCKADDR_ARG address, socklen_t *restrict address_len) {
                 #if defined(EPOLL_FOR_SOCKETS)
                         int ret;
@@ -513 +503 @@
         }
 
-        int cfathread_connect(int socket, const struct sockaddr *address, socklen_t address_len) {
+        int cfathread_connect(int socket, __CONST_SOCKADDR_ARG address, socklen_t address_len) {
                 #if defined(EPOLL_FOR_SOCKETS)
                         int ret;