Changeset dbae916 for libcfa

Timestamp:

Mar 14, 2023, 4:21:05 PM (2 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

1afd9ccb, 360bfe41, 6e6989c

Parents:

5217569 (diff), c19ca4b (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:

• algorithms/range_iterator.hfa (modified) (1 diff)
• concurrency/channel.hfa (modified) (1 diff)
• concurrency/clib/cfathread.cfa (modified) (1 diff)
• concurrency/clib/cfathread.h (modified) (1 diff)
• concurrency/future.hfa (modified) (1 diff)
• concurrency/invoke.h (modified) (1 diff)
• concurrency/iofwd.hfa (modified) (4 diffs)
• concurrency/kernel/startup.cfa (modified) (1 diff)
• concurrency/mutex_stmt.hfa (modified) (1 diff)
• concurrency/pthread.cfa (modified) (1 diff)
• concurrency/select.hfa (modified) (1 diff)
• containers/vector2.hfa (modified) (1 diff)
• interpose.cfa (modified) (4 diffs)
• interpose_thread.cfa (modified) (3 diffs)

libcfa/src/algorithms/range_iterator.hfa ¶

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Tue Nov 30 13:06:22 2021
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 13 23:10:35 2023
+// Update Count     : 1
 //
+
+#pragma once
 
 generator RangeIter {

libcfa/src/concurrency/channel.hfa ¶

@@ +1 @@
+#pragma once
+
 #include <locks.hfa>
 

libcfa/src/concurrency/clib/cfathread.cfa ¶

@@ -17 +17 @@
 
 #include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/socket.h>
 
 #include "fstream.hfa"

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 : Sat Feb 25 17:39:20 2023
-// Update Count     : 6
+// Last Modified On : Mon Mar 13 23:48:40 2023
+// Update Count     : 7
 //
+
+#pragma once
 
 #if defined(__cforall) || defined(__cplusplus)

libcfa/src/concurrency/future.hfa ¶

@@ -14 +14 @@
 //
 
-// #pragma once
+#pragma once
 
 #include "bits/locks.hfa"

libcfa/src/concurrency/invoke.h ¶

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov 29 20:42:21 2022
-// Update Count     : 56
-//
+// Last Modified On : Tue Mar 14 13:39:31 2023
+// Update Count     : 59
+//
+
+// No not use #pragma once was this file is included twice in some places. It has its own guard system.
 
 #include "bits/containers.hfa"

libcfa/src/concurrency/iofwd.hfa ¶

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Apr 23 17:31:00 2020
-// Last Modified By :
-// Last Modified On :
-// Update Count     :
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Mar 13 23:54:57 2023
+// Update Count     : 1
 //
 
@@ -50 +50 @@
 typedef __off64_t off64_t;
 
-struct cluster;
-struct io_context$;
-
-struct iovec;
-struct msghdr;
-struct statx;
 struct epoll_event;
-
-struct io_uring_sqe;
 
 //-----------------------------------------------------------------------
@@ -89 +81 @@
 // synchronous calls
 #if defined(CFA_HAVE_PREADV2)
-        extern ssize_t cfa_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+        extern ssize_t cfa_preadv2(int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 #if defined(CFA_HAVE_PWRITEV2)
-        extern ssize_t cfa_pwritev2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+        extern ssize_t cfa_pwritev2(int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 extern int cfa_fsync(int fd, __u64 submit_flags);
-extern int cfa_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event, __u64 submit_flags);
+extern int cfa_epoll_ctl(int epfd, int op, int fd, struct epoll_event * event, __u64 submit_flags);
 extern int cfa_sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags, __u64 submit_flags);
-extern  ssize_t cfa_sendmsg(int sockfd, const struct msghdr *msg, int flags, __u64 submit_flags);
-extern ssize_t cfa_recvmsg(int sockfd, struct msghdr *msg, int flags, __u64 submit_flags);
-extern ssize_t cfa_send(int sockfd, const void *buf, size_t len, int flags, __u64 submit_flags);
-extern ssize_t cfa_recv(int sockfd, void *buf, size_t len, int flags, __u64 submit_flags);
+extern  ssize_t cfa_sendmsg(int sockfd, const struct msghdr * msg, int flags, __u64 submit_flags);
+extern ssize_t cfa_recvmsg(int sockfd, struct msghdr * msg, int flags, __u64 submit_flags);
+extern ssize_t cfa_send(int sockfd, const void * buf, size_t len, int flags, __u64 submit_flags);
+extern ssize_t cfa_recv(int sockfd, void * buf, size_t len, int flags, __u64 submit_flags);
 extern int cfa_accept4(int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags, __u64 submit_flags);
 extern int cfa_connect(int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen, __u64 submit_flags);
 extern int cfa_fallocate(int fd, int mode, off_t offset, off_t len, __u64 submit_flags);
 extern int cfa_posix_fadvise(int fd, off_t offset, off_t len, int advice, __u64 submit_flags);
-extern int cfa_madvise(void *addr, size_t length, int advice, __u64 submit_flags);
-extern int cfa_openat(int dirfd, const char *pathname, int flags, mode_t mode, __u64 submit_flags);
+extern int cfa_madvise(void * addr, size_t length, int advice, __u64 submit_flags);
+extern int cfa_openat(int dirfd, const char * pathname, int flags, mode_t mode, __u64 submit_flags);
 #if defined(CFA_HAVE_OPENAT2)
-        extern int cfa_openat2(int dirfd, const char *pathname, struct open_how * how, size_t size, __u64 submit_flags);
+        extern int cfa_openat2(int dirfd, const char * pathname, struct open_how * how, size_t size, __u64 submit_flags);
 #endif
 extern int cfa_close(int fd, __u64 submit_flags);
 #if defined(CFA_HAVE_STATX)
-        extern int cfa_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf, __u64 submit_flags);
+        extern int cfa_statx(int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf, __u64 submit_flags);
 #endif
 extern ssize_t cfa_read(int fd, void * buf, size_t count, __u64 submit_flags);
 extern ssize_t cfa_write(int fd, void * buf, size_t count, __u64 submit_flags);
-extern ssize_t cfa_splice(int fd_in, __off64_t *off_in, int fd_out, __off64_t *off_out, size_t len, unsigned int flags, __u64 submit_flags);
+extern ssize_t cfa_splice(int fd_in, __off64_t * off_in, int fd_out, __off64_t * off_out, size_t len, unsigned int flags, __u64 submit_flags);
 extern ssize_t cfa_tee(int fd_in, int fd_out, size_t len, unsigned int flags, __u64 submit_flags);
 
@@ -122 +114 @@
 // asynchronous calls
 #if defined(CFA_HAVE_PREADV2)
-        extern void async_preadv2(io_future_t & future, int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+        extern void async_preadv2(io_future_t & future, int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 #if defined(CFA_HAVE_PWRITEV2)
-        extern void async_pwritev2(io_future_t & future, int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
+        extern void async_pwritev2(io_future_t & future, int fd, const struct iovec * iov, int iovcnt, off_t offset, int flags, __u64 submit_flags);
 #endif
 extern void async_fsync(io_future_t & future, int fd, __u64 submit_flags);
-extern void async_epoll_ctl(io_future_t & future, int epfd, int op, int fd, struct epoll_event *event, __u64 submit_flags);
+extern void async_epoll_ctl(io_future_t & future, int epfd, int op, int fd, struct epoll_event * event, __u64 submit_flags);
 extern void async_sync_file_range(io_future_t & future, int fd, off64_t offset, off64_t nbytes, unsigned int flags, __u64 submit_flags);
-extern void async_sendmsg(io_future_t & future, int sockfd, const struct msghdr *msg, int flags, __u64 submit_flags);
-extern void async_recvmsg(io_future_t & future, int sockfd, struct msghdr *msg, int flags, __u64 submit_flags);
-extern void async_send(io_future_t & future, int sockfd, const void *buf, size_t len, int flags, __u64 submit_flags);
-extern void async_recv(io_future_t & future, int sockfd, void *buf, size_t len, int flags, __u64 submit_flags);
+extern void async_sendmsg(io_future_t & future, int sockfd, const struct msghdr * msg, int flags, __u64 submit_flags);
+extern void async_recvmsg(io_future_t & future, int sockfd, struct msghdr * msg, int flags, __u64 submit_flags);
+extern void async_send(io_future_t & future, int sockfd, const void * buf, size_t len, int flags, __u64 submit_flags);
+extern void async_recv(io_future_t & future, int sockfd, void * buf, size_t len, int flags, __u64 submit_flags);
 extern void async_accept4(io_future_t & future, int sockfd, __SOCKADDR_ARG addr, socklen_t * restrict addrlen, int flags, __u64 submit_flags);
 extern void async_connect(io_future_t & future, int sockfd, __CONST_SOCKADDR_ARG addr, socklen_t addrlen, __u64 submit_flags);
 extern void async_fallocate(io_future_t & future, int fd, int mode, off_t offset, off_t len, __u64 submit_flags);
 extern void async_posix_fadvise(io_future_t & future, int fd, off_t offset, off_t len, int advice, __u64 submit_flags);
-extern void async_madvise(io_future_t & future, void *addr, size_t length, int advice, __u64 submit_flags);
-extern void async_openat(io_future_t & future, int dirfd, const char *pathname, int flags, mode_t mode, __u64 submit_flags);
+extern void async_madvise(io_future_t & future, void * addr, size_t length, int advice, __u64 submit_flags);
+extern void async_openat(io_future_t & future, int dirfd, const char * pathname, int flags, mode_t mode, __u64 submit_flags);
 #if defined(CFA_HAVE_OPENAT2)
-        extern void async_openat2(io_future_t & future, int dirfd, const char *pathname, struct open_how * how, size_t size, __u64 submit_flags);
+        extern void async_openat2(io_future_t & future, int dirfd, const char * pathname, struct open_how * how, size_t size, __u64 submit_flags);
 #endif
 extern void async_close(io_future_t & future, int fd, __u64 submit_flags);
 #if defined(CFA_HAVE_STATX)
-        extern void async_statx(io_future_t & future, int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf, __u64 submit_flags);
+        extern void async_statx(io_future_t & future, int dirfd, const char * pathname, int flags, unsigned int mask, struct statx * statxbuf, __u64 submit_flags);
 #endif
 void async_read(io_future_t & future, int fd, void * buf, size_t count, __u64 submit_flags);
 extern void async_write(io_future_t & future, int fd, void * buf, size_t count, __u64 submit_flags);
-extern void async_splice(io_future_t & future, int fd_in, __off64_t *off_in, int fd_out, __off64_t *off_out, size_t len, unsigned int flags, __u64 submit_flags);
+extern void async_splice(io_future_t & future, int fd_in, __off64_t * off_in, int fd_out, __off64_t * off_out, size_t len, unsigned int flags, __u64 submit_flags);
 extern void async_tee(io_future_t & future, int fd_in, int fd_out, size_t len, unsigned int flags, __u64 submit_flags);
 

libcfa/src/concurrency/kernel/startup.cfa ¶

@@ -33 +33 @@
 #include "kernel/private.hfa"
 #include "iofwd.hfa"
-#include "startup.hfa"                                  // STARTUP_PRIORITY_XXX
+#include "startup.hfa"                                                                  // STARTUP_PRIORITY_XXX
 #include "limits.hfa"
 #include "math.hfa"

libcfa/src/concurrency/mutex_stmt.hfa ¶

@@ +1 @@
+#pragma once
+
 #include "bits/algorithm.hfa"
 #include "bits/defs.hfa"

libcfa/src/concurrency/pthread.cfa ¶

@@ -598 +598 @@
                 if (t->pthreadData == NULL) return NULL;
                 lock(key_lock);
-                pthread_values &entry = ((pthread_values *)t->pthreadData)[key];
+                pthread_values & entry = ((pthread_values *)t->pthreadData)[key];
                 if ( ! entry.in_use ) {
                         unlock( key_lock );

libcfa/src/concurrency/select.hfa ¶

@@ +1 @@
+#pragma once
+
 #include "containers/list.hfa"
 #include <stdint.h>

libcfa/src/containers/vector2.hfa ¶

@@ -9 +9 @@
 // Author           : Michael Brooks
 // Created On       : Thu Jun 23 22:00:00 2021
-// Last Modified By : Michael Brooks
-// Last Modified On : Thu Jun 23 22:00:00 2021
-// Update Count     : 1
-//
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Mar 14 08:40:53 2023
+// Update Count     : 2
+//
+
+#pragma once
 
 #include <stdlib.hfa>

libcfa/src/interpose.cfa ¶

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar  2 13:56:26 2023
-// Update Count     : 191
-//
-
-#include <stdarg.h>                                                                             // va_start, va_end
+// Last Modified On : Mon Mar 13 22:39:12 2023
+// Update Count     : 193
+//
+
 #include <stdio.h>
-#include <string.h>                                                                             // strlen
 #include <unistd.h>                                                                             // _exit, getpid
-#include <signal.h>
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym
@@ -24 +21 @@
 }
 
-#include "bits/debug.hfa"
 #include "bits/defs.hfa"
 #include "bits/signal.hfa"                                                              // sigHandler_?
@@ -40 +36 @@
 
 typedef void (* generic_fptr_t)(void);
+
 static generic_fptr_t do_interpose_symbol( void * library, const char symbol[], const char version[] ) {
-        const char * error;
-
         union { generic_fptr_t fptr; void * ptr; } originalFunc;
 
         originalFunc.ptr = dlsym( library, symbol );
-        error = dlerror();
-        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
-
+        if ( ! originalFunc.ptr ) {                                                             // == nullptr
+                abort( "interpose_symbol : internal error, %s\n", dlerror() );
+        } // if
         return originalFunc.fptr;
 }
@@ -57 +52 @@
         library = RTLD_NEXT;
         #else
+        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
         library = dlopen( "libc.so.6", RTLD_LAZY );
-        if ( ! library ) {
-                const char * error = dlerror();
-                if ( error ) {
-                        abort( "interpose_symbol : failed to open libc, %s\n", error );
-                } // if
+        if ( ! library ) {                                                                      // == nullptr
+                abort( "interpose_symbol : failed to open libc, %s\n", dlerror() );
         } // if
-        #endif
-
-        return do_interpose_symbol(library, symbol, version);
+        #endif // RTLD_NEXT
+
+        return do_interpose_symbol( library, symbol, version );
 }
 

libcfa/src/interpose_thread.cfa ¶

@@ -14 +14 @@
 //
 
-#include <stdarg.h>                                                                             // va_start, va_end
-#include <stdio.h>
-#include <string.h>                                                                             // strlen
+#ifdef __i386__                                                                                 // 32-bit architecture
+#undef _GNU_SOURCE
+#endif // __i386__
+
 #include <signal.h>
 #include <pthread.h>
+#include <signal.h>
 extern "C" {
 #include <dlfcn.h>                                                                              // dlopen, dlsym
-#include <execinfo.h>                                                                   // backtrace, messages
 }
 
-#include "bits/debug.hfa"
 #include "bits/defs.hfa"
-#include <assert.h>
 
 //=============================================================================================
@@ -40 +39 @@
 ) libcfa_public {
         void * library;
+
         #if defined( RTLD_NEXT )
         library = RTLD_NEXT;
         #else
         // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-        library = dlopen( "libthread_db.so", RTLD_LAZY );
-        if ( ! library ) {
-                const char * error = dlerror();
-                if ( error ) {
-                        abort( "interpose_symbol : failed to open libpthread, %s\n", error );
-                }
+        library = dlopen( "libpthread.so", RTLD_LAZY );
+        if ( ! library ) {                                                                      // == nullptr
+                abort( "interpose_symbol : failed to open libpthread, %s\n", dlerror() );
         } // if
         #endif // RTLD_NEXT
 
-        return do_interpose_symbol(library, symbol, version);
+        return do_interpose_symbol( library, symbol, version );
 }
 
@@ -81 +78 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
-                INTERPOSE( pthread_create , version );
-                INTERPOSE( pthread_join , version );
-                INTERPOSE( pthread_self , version );
-                INTERPOSE( pthread_attr_init , version );
-                INTERPOSE( pthread_attr_destroy , version );
-                INTERPOSE( pthread_attr_setstack , version );
-                INTERPOSE( pthread_attr_getstacksize , version );
-                INTERPOSE( pthread_sigmask , version );
-                INTERPOSE( pthread_sigqueue , version );
-                INTERPOSE( pthread_once , version );
+                INTERPOSE( pthread_create, version );
+                INTERPOSE( pthread_join, version );
+                INTERPOSE( pthread_self, version );
+                INTERPOSE( pthread_attr_init, version );
+                INTERPOSE( pthread_attr_destroy, version );
+                INTERPOSE( pthread_attr_setstack, version );
+                INTERPOSE( pthread_attr_getstacksize, version );
+                INTERPOSE( pthread_sigmask, version );
+                INTERPOSE( pthread_sigqueue, version );
+                INTERPOSE( pthread_once, version );
 #pragma GCC diagnostic pop
         }