Changeset 4d8fbf4 for libcfa

Timestamp:

Sep 16, 2021, 2:22:01 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

432bffe, 7e7a076

Parents:

a8367eb (diff), 140eb16 (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:

• Makefile.am (modified) (2 diffs)
• concurrency/kernel.cfa (modified) (3 diffs)
• containers/string.cfa (added)
• containers/string.hfa (added)
• containers/string_res.cfa (added)
• containers/string_res.hfa (added)
• device/cpu.cfa (modified) (1 diff)
• device/cpu.hfa (modified) (1 diff)
• fstream.cfa (modified) (2 diffs)
• memory.cfa (modified) (1 diff)
• memory.hfa (modified) (1 diff)

libcfa/src/Makefile.am

@@ -87 +87 @@
         containers/pair.hfa \
         containers/result.hfa \
+        containers/string.hfa \
+        containers/string_res.hfa \
         containers/vector.hfa \
         device/cpu.hfa
@@ -194 +196 @@
         $(CFACOMPILE) -quiet -XCFA,-l ${<} -c -o ${@}
 
+concurrency/io/call.cfa: $(srcdir)/concurrency/io/call.cfa.in
+        ${AM_V_GEN}python3 $< > $@
+
 #----------------------------------------------------------------------------------------------------------------
 libcfa_la_SOURCES = ${libsrc}

libcfa/src/concurrency/kernel.cfa

@@ -22 +22 @@
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <signal.h>
 #include <unistd.h>
@@ -31 +32 @@
 #include "kernel_private.hfa"
 #include "preemption.hfa"
+#include "strstream.hfa"
+#include "device/cpu.hfa"
 
 //Private includes
@@ -231 +234 @@
                                 __cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle);
 
-                                __disable_interrupts_hard();
-                                eventfd_t val;
-                                eventfd_read( this->idle, &val );
-                                __enable_interrupts_hard();
+                                {
+                                        eventfd_t val;
+                                        ssize_t ret = read( this->idle, &val, sizeof(val) );
+                                        if(ret < 0) {
+                                                switch((int)errno) {
+                                                case EAGAIN:
+                                                #if EAGAIN != EWOULDBLOCK
+                                                        case EWOULDBLOCK:
+                                                #endif
+                                                case EINTR:
+                                                        // No need to do anything special here, just assume it's a legitimate wake-up
+                                                        break;
+                                                default:
+                                                        abort( "KERNEL : internal error, read failure on idle eventfd, error(%d) %s.", (int)errno, strerror( (int)errno ) );
+                                                }
+                                        }
+                                }
 
                                 #if !defined(__CFA_NO_STATISTICS__)

libcfa/src/device/cpu.cfa

@@ -422 +422 @@
         }
 }
+
+cpu_info_t cpu_info;

libcfa/src/device/cpu.hfa

@@ -30 +30 @@
 };
 
-cpu_info_t cpu_info;
+extern cpu_info_t cpu_info;

libcfa/src/fstream.cfa

@@ -124 +124 @@
 void open( ofstream & os, const char name[], const char mode[] ) {
         FILE * file = fopen( name, mode );
-        #ifdef __CFA_DEBUG__
+        // #ifdef __CFA_DEBUG__
         if ( file == 0p ) {
                 throw (Open_Failure){ os };
                 // abort | IO_MSG "open output file \"" | name | "\"" | nl | strerror( errno );
         } // if
-        #endif // __CFA_DEBUG__
+        // #endif // __CFA_DEBUG__
         (os){ file };
 } // open
@@ -262 +262 @@
 void open( ifstream & is, const char name[], const char mode[] ) {
         FILE * file = fopen( name, mode );
-        #ifdef __CFA_DEBUG__
+        // #ifdef __CFA_DEBUG__
         if ( file == 0p ) {
                 throw (Open_Failure){ is };
                 // abort | IO_MSG "open input file \"" | name | "\"" | nl | strerror( errno );
         } // if
-        #endif // __CFA_DEBUG__
+        // #endif // __CFA_DEBUG__
         is.file$ = file;
 } // open

libcfa/src/memory.cfa

@@ -155 +155 @@
 
 forall(T &)
+T * release(unique_ptr(T) & this) {
+        T * data = this.data;
+        this.data = 0p;
+        return data;
+}
+
+forall(T &)
 int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that) {
         return this.data == that.data;

libcfa/src/memory.hfa

@@ -94 +94 @@
 
 forall(T &)
+T * release(unique_ptr(T) & this);
+
+forall(T &)
 int ?==?(unique_ptr(T) const & this, unique_ptr(T) const & that);
 forall(T &)