Changeset 2a01c9b

Timestamp:

Apr 23, 2020, 5:53:21 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

9edf835, cefc59f

Parents:

40b5417 (diff), 8962722 (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

Files:

• benchmark/io/readv.cfa (modified) (8 diffs)
• libcfa/src/concurrency/io.cfa (modified) (5 diffs)
• libcfa/src/concurrency/preemption.cfa (modified) (2 diffs)
• tests/vector.cfa (modified) (2 diffs)

benchmark/io/readv.cfa ¶

@@ -17 +17 @@
 #include <time.hfa>
 
+extern bool traceHeapOn();
 extern ssize_t async_preadv2(int fd, const struct iovec *iov, int iovcnt, off_t offset, int flags);
 
@@ -38 +39 @@
 }
 
-Time now(void);
-
 int main(int argc, char * argv[]) {
         double duration   = 5.0;
@@ -45 +44 @@
         unsigned long int nprocs   = 1;
 
+        printf("Setting local\n");
         setlocale(LC_NUMERIC, "");
+
 
         arg_loop:
@@ -76 +77 @@
                         case 't':
                                 nthreads = strtoul(arg, &end, 10);
-                                if(*end != '\0') {
+                                if(*end != '\0' || nthreads < 1) {
                                         fprintf(stderr, "Number of threads must be a positive integer, was %s\n", arg);
                                         goto usage;
@@ -83 +84 @@
                         case 'p':
                                 nprocs = strtoul(arg, &end, 10);
-                                if(*end != '\0') {
+                                if(*end != '\0' || nprocs < 1) {
                                         fprintf(stderr, "Number of processors must be a positive integer, was %s\n", arg);
                                         goto usage;
@@ -119 +120 @@
         Time start, end;
         {
-                processor procs[nprocs];
+                processor procs[nprocs - 1];
                 {
                         Reader threads[nthreads];
@@ -134 +135 @@
                 }
         }
-        printf("Done\n");
         printf("Took %ld ms\n", (end - start)`ms);
         printf("Total reads:      %'zu\n", count);
@@ -140 +140 @@
 
         close(fd);
+        printf("Done\n");
 }

libcfa/src/concurrency/io.cfa ¶

@@ -36 +36 @@
 
         static void * __io_poller( void * arg );
+
+       // Weirdly, some systems that do support io_uring don't actually define these
+       #ifdef __alpha__
+       /*
+       * alpha is the only exception, all other architectures
+       * have common numbers for new system calls.
+       */
+       # ifndef __NR_io_uring_setup
+       #  define __NR_io_uring_setup           535
+       # endif
+       # ifndef __NR_io_uring_enter
+       #  define __NR_io_uring_enter           536
+       # endif
+       # ifndef __NR_io_uring_register
+       #  define __NR_io_uring_register        537
+       # endif
+       #else /* !__alpha__ */
+       # ifndef __NR_io_uring_setup
+       #  define __NR_io_uring_setup           425
+       # endif
+       # ifndef __NR_io_uring_enter
+       #  define __NR_io_uring_enter           426
+       # endif
+       # ifndef __NR_io_uring_register
+       #  define __NR_io_uring_register        427
+       # endif
+       #endif
+
 
 //=============================================================================================
@@ -188 +216 @@
 
                 struct io_user_data * data = (struct io_user_data *)cqe.user_data;
-                __cfaabi_bits_print_safe( STDERR_FILENO, "Performed reading io cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
+                // __cfaabi_bits_print_safe( STDERR_FILENO, "Performed reading io cqe %p, result %d for %p\n", data, cqe.res, data->thrd );
 
                 data->result = cqe.res;
@@ -296 +324 @@
         // Submit however, many entries need to be submitted
         int ret = syscall( __NR_io_uring_enter, ring.fd, 1, 0, 0, 0p, 0);
-        __cfaabi_bits_print_safe( STDERR_FILENO, "Performed io_submit, returned %d\n", ret );
+        // __cfaabi_bits_print_safe( STDERR_FILENO, "Performed io_submit, returned %d\n", ret );
         if( ret < 0 ) {
                 switch((int)errno) {
@@ -352 +380 @@
         #define __submit_wait \
                 io_user_data data = { 0, active_thread() }; \
-                __cfaabi_bits_print_safe( STDERR_FILENO, "Preparing user data %p for %p\n", &data, data.thrd ); \
+                /*__cfaabi_bits_print_safe( STDERR_FILENO, "Preparing user data %p for %p\n", &data, data.thrd );*/ \
                 sqe->user_data = (uint64_t)&data; \
                 __submit( ring, idx ); \
@@ -575 +603 @@
         int async_statx(int dirfd, const char *pathname, int flags, unsigned int mask, struct statx *statxbuf) {
                 #if !defined(IORING_OP_STATX)
-                        return statx( dirfd, pathname, flags, mask, statxbuf );
+                        //return statx( dirfd, pathname, flags, mask, statxbuf );
+                        return syscall( __NR_io_uring_setup, dirfd, pathname, flags, mask, statxbuf );
                 #else
                         __submit_prelude

libcfa/src/concurrency/preemption.cfa ¶

@@ -97 +97 @@
         while( node = get_expired( alarms, currtime ) ) {
                 // __cfaabi_dbg_print_buffer_decl( " KERNEL: preemption tick.\n" );
+                Duration period = node->period;
+                if( period == 0) {
+                        node->set = false;                  // Node is one-shot, just mark it as not pending
+                }
 
                 // Check if this is a kernel
@@ -107 +111 @@
 
                 // Check if this is a periodic alarm
-                Duration period = node->period;
                 if( period > 0 ) {
                         // __cfaabi_dbg_print_buffer_local( " KERNEL: alarm period is %lu.\n", period.tv );
                         node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
                         insert( alarms, node );             // Reinsert the node for the next time it triggers
-                }
-                else {
-                        node->set = false;                  // Node is one-shot, just mark it as not pending
                 }
         }

tests/vector.cfa ¶

@@ -14 +14 @@
 //
 
+#include <vector.hfa>
 #include <fstream.hfa>
-#include <vector.hfa>
 
 #undef assert
@@ -28 +28 @@
 int main() {
         vector( int ) iv;
+
+        assert( ((uintptr_t)&iv.storage.storage ) == (((uintptr_t)&iv)) );
+        assert( ((uintptr_t)&iv.storage.capacity) == (((uintptr_t)&iv) + sizeof(void *)) );
+        assert( ((uintptr_t)&iv.size            ) == (((uintptr_t)&iv) + sizeof(void *) + sizeof(size_t)) );
 
         assert( empty( &iv ) );