Changes in / [4f102fa:116a2ea]

Files:

• libcfa/src/concurrency/io.cfa (modified) (4 diffs)
• libcfa/src/concurrency/io/types.hfa (modified) (1 diff)
• libcfa/src/concurrency/kernel/cluster.hfa (modified) (3 diffs)
• libcfa/src/parseargs.cfa (modified) (6 diffs)
• tests/configs/.expect/parsebools.txt (deleted)
• tests/configs/.expect/parsenums.x64.txt (deleted)
• tests/configs/.expect/parsenums.x86.txt (deleted)
• tests/configs/parsebools.cfa (deleted)
• tests/configs/parsenums.cfa (deleted)
• tests/meta/fork+exec.cfa (modified) (2 diffs)
• tests/meta/fork+exec.hfa (deleted)

libcfa/src/concurrency/io.cfa

@@ -551 +551 @@
                 enqueue(this.pending, (__outstanding_io&)pa);
 
-                wait( pa.waitctx );
+                wait( pa.sem );
 
                 return pa.ctx;
@@ -578 +578 @@
                                 pa.ctx = ctx;
 
-                                post( pa.waitctx );
+                                post( pa.sem );
                         }
 
@@ -613 +613 @@
                 }
 
-                wait( ei.waitctx );
+                wait( ei.sem );
 
                 __cfadbg_print_safe(io, "Kernel I/O : %u submitted from arbiter\n", have);
@@ -631 +631 @@
                                         __submit_only(&ctx, ei.idxs, ei.have);
 
-                                        post( ei.waitctx );
+                                        post( ei.sem );
                                 }
 

libcfa/src/concurrency/io/types.hfa

@@ -107 +107 @@
         struct __outstanding_io {
                 inline Colable;
-                oneshot waitctx;
+                single_sem sem;
         };
         static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }

libcfa/src/concurrency/kernel/cluster.hfa

@@ -21 +21 @@
 
 #include <limits.h>
-#include <inttypes.h>
 
 #include "clock.hfa"
@@ -31 +30 @@
 
 // warn normally all ints
-#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'" PRId64 "ms \n", old_avg, old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'" PRId64 "ms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
+#define warn_large_before warnf( !strict || old_avg < 33_000_000_000, "Suspiciously large previous average: %'llu (%llx), %'ldms \n", old_avg, old_avg, program()`ms )
+#define warn_large_after warnf( !strict || ret < 33_000_000_000, "Suspiciously large new average after %'ldms cputime: %'llu (%llx) from %'llu-%'llu (%'llu, %'llu) and %'llu\n", program()`ms, ret, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg )
 
 // 8X linear factor is just 8 * x
@@ -42 +41 @@
 static inline __readyQ_avg_t __to_readyQ_avg(unsigned long long intsc) { if(unlikely(0 == intsc)) return 0.0; else return log2(intsc); }
 
-#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'" PRId64 "ms \n", old_avg, program()`ms )
-#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'" PRId64 "ms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
+#define warn_large_before warnf( !strict || old_avg < 35.0, "Suspiciously large previous average: %'lf, %'ldms \n", old_avg, program()`ms )
+#define warn_large_after warnf( !strict || ret < 35.3, "Suspiciously large new average after %'ldms cputime: %'lf from %'llu-%'llu (%'llu, %'llu) and %'lf\n", program()`ms, ret, currtsc, intsc, new_val, new_val / 1000000, old_avg ); \
 verify(ret >= 0)
 

libcfa/src/parseargs.cfa

@@ -1 +1 @@
 #include "parseargs.hfa"
 
-#include <ctype.h>
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <assert.h>
 
 extern "C" {
@@ -74 +74 @@
 
         int maxv = 'h';
-        char optstring[(opt_count * 3) + 2] = { '\0' };
+        assert( opt_count > 0 );
+        char optstring[opt_count * 3] = { '\0' };
         {
                 int idx = 0;
@@ -271 +272 @@
 bool parse(const char * arg, int & value) {
         char * end;
-
-        errno = 0;
-        long long int r = strtoll(arg, &end, 0);
-        if(errno) return false;
+        int r = strtoll(arg, &end, 10);
         if(*end != '\0') return false;
-        if(r > (int)MAX) return false;
-        if(r < (int)MIN) return false;
 
         value = r;
@@ -283 +279 @@
 }
 
-static unsigned long long int strict_strtoull( const char * arg, int base) {
-        errno = 0;
-        {
-                const char * in = arg;
-                for() {
-                        if('\0' == *in) {
-                                errno = EINVAL;
-                                return 0;
-                        }
-                        if(!isspace(*in)) break;
-                        in++;
-                }
-                if(!isdigit(*in)) {
-                        errno = EINVAL;
-                        return 0;
-                }
-        }
-
-        *char end;
-        unsigned long long int r = strtoull(arg, &end, base);
-        if(*end != '\0') errno = EINVAL;
-        if(errno) return 0;
-        return r;
-}
-
 bool parse(const char * arg, unsigned & value) {
-        unsigned long long int r = strict_strtoull(arg, 0);
-        if(errno) return false;
+        char * end;
+        unsigned long long int r = strtoull(arg, &end, 10);
+        if(*end != '\0') return false;
         if(r > (unsigned)MAX) return false;
 
@@ -318 +290 @@
 
 bool parse(const char * arg, unsigned long & value) {
-        unsigned long long int r = strict_strtoull(arg, 0);
-        if(errno) return false;
+        char * end;
+        unsigned long long int r = strtoull(arg, &end, 10);
+        if(*end != '\0') return false;
         if(r > (unsigned long)MAX) return false;
 
@@ -327 +300 @@
 
 bool parse(const char * arg, unsigned long long & value) {
-        unsigned long long int r = strict_strtoull(arg, 0);
-        if(errno) return false;
-        if(r > (unsigned long long)MAX) return false;
-
-        value = r;
-        return true;
+        char * end;
+        unsigned long long int r = strtoull(arg, &end, 10);
+        if(*end != '\0') return false;
+        if(r > (unsigned long long)MAX) return false;
+
+        value = r;
+        return true;
 }
 

tests/meta/fork+exec.cfa

@@ -13 +13 @@
 // Update Count     :
 //
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
-#include "fork+exec.hfa"
+#include <errno.h>
+#include <signal.h>
+
+extern "C" {
+        #include <sys/types.h>
+        #include <sys/wait.h>
+        #include <unistd.h>
+}
+
+int true_main(const char * exec);
 
 int main(int argc, char * argv[]) {
-        check_main(argv[0]);
+        if(!getenv("CFATEST_FORK_EXEC_TEXT")) return true_main(argv[0]);
 
         printf("arguments are:\n");
@@ -30 +42 @@
 }
 
+int do_wait(pid_t pid) {
+        int wstatus;
+        int options = 0;
+        pid_t ret = waitpid(pid, &wstatus, options);
+        fflush(stdout);
+        if(ret < 0) {
+                fprintf(stderr, "Fork returned with error: %d '%s'\n", errno, strerror(errno));
+                exit(1);
+        }
+        return wstatus;
+}
 
+pid_t strict_fork(void) {
+        fflush(stdout);
+        pid_t ret = fork();
+        if(ret < 0) {
+                fprintf(stderr, "Fork returned with error: %d '%s'\n", errno, strerror(errno));
+                exit(1);
+        }
+        return ret;
+}
 
-int true_main(const char * path, char * env[]) {
+void print_status(int wstatus) {
+        printf("Child status:\n");
+        printf("    WIFEXITED   : %d\n", WIFEXITED(wstatus));
+        printf("    WEXITSTATUS : %d\n", WEXITSTATUS(wstatus));
+        printf("    WIFSIGNALED : %d\n", WIFSIGNALED(wstatus));
+        printf("    WTERMSIG    : %d\n", WTERMSIG(wstatus));
+        printf("    WCOREDUMP   : %d\n", WCOREDUMP(wstatus));
+        printf("    WIFSTOPPED  : %d\n", WIFSTOPPED(wstatus));
+        printf("    WSTOPSIG    : %d\n", WSTOPSIG(wstatus));
+        printf("    WIFCONTINUED: %d\n", WIFCONTINUED(wstatus));
+}
+
+int true_main(const char * path) {
+        char * env[] = { "CFATEST_FORK_EXEC_TEXT=1", 0p };
+
         printf("no arg:\n");
         if(pid_t child = strict_fork(); child == 0) {