Changeset a1f3d93

Timestamp:

Nov 29, 2021, 12:52:14 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

8da377d3

Parents:

c7b2215 (diff), 0351e9f (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:

• libcfa/src/concurrency/io.cfa (modified) (1 diff)
• libcfa/src/concurrency/kernel.cfa (modified) (1 diff)
• src/AST/Decl.hpp (modified) (1 diff)
• src/AST/Print.cpp (modified) (1 diff)
• src/AST/Print.hpp (modified) (2 diffs)
• src/Concurrency/Keywords.cc (modified) (1 diff)
• src/InitTweak/InitTweak.cc (modified) (2 diffs)
• src/InitTweak/InitTweak.h (modified) (2 diffs)

libcfa/src/concurrency/io.cfa

@@ -502 +502 @@
         }
 
-        bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd) {
-                $io_context * ctx = proc->io.ctx;
-                /* paranoid */ verify( ! __preemption_enabled() );
-                /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
-                /* paranoid */ verify( ctx );
-
-                __u32 idx;
-                struct io_uring_sqe * sqe;
-
-                // We can proceed to the fast path
-                if( !__alloc(ctx, &idx, 1) ) return false;
-
-                // Allocation was successful
-                __fill( &sqe, 1, &idx, ctx );
-
-                sqe->opcode = IORING_OP_READ;
-                sqe->user_data = (uintptr_t)&future;
-                sqe->flags = 0;
-                sqe->ioprio = 0;
-                sqe->fd = fd;
-                sqe->off = 0;
-                sqe->fsync_flags = 0;
-                sqe->__pad2[0] = 0;
-                sqe->__pad2[1] = 0;
-                sqe->__pad2[2] = 0;
-                sqe->addr = (uintptr_t)buf;
-                sqe->len = sizeof(uint64_t);
-
-                asm volatile("": : :"memory");
-
-                /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
-                __submit( ctx, &idx, 1, true );
-
-                /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
-                /* paranoid */ verify( ! __preemption_enabled() );
-        }
+        #if defined(IO_URING_IDLE)
+                bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd) {
+                        $io_context * ctx = proc->io.ctx;
+                        /* paranoid */ verify( ! __preemption_enabled() );
+                        /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
+                        /* paranoid */ verify( ctx );
+
+                        __u32 idx;
+                        struct io_uring_sqe * sqe;
+
+                        // We can proceed to the fast path
+                        if( !__alloc(ctx, &idx, 1) ) return false;
+
+                        // Allocation was successful
+                        __fill( &sqe, 1, &idx, ctx );
+
+                        sqe->opcode = IORING_OP_READ;
+                        sqe->user_data = (uintptr_t)&future;
+                        sqe->flags = 0;
+                        sqe->ioprio = 0;
+                        sqe->fd = fd;
+                        sqe->off = 0;
+                        sqe->fsync_flags = 0;
+                        sqe->__pad2[0] = 0;
+                        sqe->__pad2[1] = 0;
+                        sqe->__pad2[2] = 0;
+                        sqe->addr = (uintptr_t)buf;
+                        sqe->len = sizeof(uint64_t);
+
+                        asm volatile("": : :"memory");
+
+                        /* paranoid */ verify( sqe->user_data == (uintptr_t)&future );
+                        __submit( ctx, &idx, 1, true );
+
+                        /* paranoid */ verify( proc == __cfaabi_tls.this_processor );
+                        /* paranoid */ verify( ! __preemption_enabled() );
+                }
+        #endif
 #endif

libcfa/src/concurrency/kernel.cfa

@@ -135 +135 @@
 static inline bool __maybe_io_drain( processor * );
 
-extern bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd);
+#if defined(IO_URING_IDLE) && defined(CFA_HAVE_LINUX_IO_URING_H)
+        extern bool __kernel_read(processor * proc, io_future_t & future, char buf[], int fd);
+#endif
 
 extern void __disable_interrupts_hard();

src/AST/Decl.hpp

@@ -270 +270 @@
         : AggregateDecl( loc, name, std::move(attrs), linkage ), kind( kind ) {}
 
-        bool is_coroutine() { return kind == Coroutine; }
-        bool is_generator() { return kind == Generator; }
-        bool is_monitor  () { return kind == Monitor  ; }
-        bool is_thread   () { return kind == Thread   ; }
+        bool is_coroutine() const { return kind == Coroutine; }
+        bool is_generator() const { return kind == Generator; }
+        bool is_monitor  () const { return kind == Monitor  ; }
+        bool is_thread   () const { return kind == Thread   ; }
 
         const Decl * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Print.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Print.cpp --
+// Print.cpp -- Print an AST (or sub-tree) to a stream.
 //
 // Author           : Thierry Delisle

src/AST/Print.hpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Print.hpp --
+// Print.hpp -- Print an AST (or sub-tree) to a stream.
 //
 // Author           : Thierry Delisle
@@ -35 +35 @@
 template< typename Coll >
 void printAll( std::ostream & os, const Coll & c, Indenter indent = {} ) {
-    for ( const auto & i : c ) {
-        if ( ! i ) continue;
-        
-        os << indent;
-        print( os, i, indent );
-        os << std::endl;
-    }
+        for ( const auto & i : c ) {
+                if ( ! i ) continue;
+
+                os << indent;
+                print( os, i, indent );
+                os << std::endl;
+        }
 }
 

src/Concurrency/Keywords.cc

@@ -979 +979 @@
                         // If this is the destructor for a monitor it must be mutex
                         if(isDtor) {
+                                // This reflects MutexKeyword::validate, except does not produce an error.
                                 Type* ty = decl->get_functionType()->get_parameters().front()->get_type();
 

src/InitTweak/InitTweak.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Fri May 13 11:26:36 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun 16 20:57:22 2021
-// Update Count     : 18
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Nov 19 19:22:00 2021
+// Update Count     : 19
 //
 
@@ -540 +540 @@
         }
 
+        const ast::Type * getTypeofThis( const ast::FunctionType * ftype ) {
+                assertf( ftype, "getTypeofThis: nullptr ftype" );
+                const std::vector<ast::ptr<ast::Type>> & params = ftype->params;
+                assertf( !params.empty(), "getTypeofThis: ftype with 0 parameters: %s",
+                                toString( ftype ).c_str() );
+                const ast::ReferenceType * refType =
+                        params.front().strict_as<ast::ReferenceType>();
+                return refType->base;
+        }
+
         ObjectDecl * getParamThis( FunctionType * ftype ) {
                 assertf( ftype, "getParamThis: nullptr ftype" );

src/InitTweak/InitTweak.h

@@ -10 +10 @@
 // Created On       : Fri May 13 11:26:36 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 19 14:18:00 2019
-// Update Count     : 6
+// Last Modified On : Fri Nov 19 14:18:00 2021
+// Update Count     : 7
 //
 
@@ -35 +35 @@
         /// returns the base type of the first parameter to a constructor/destructor/assignment function
         Type * getTypeofThis( FunctionType * ftype );
+        const ast::Type * getTypeofThis( const ast::FunctionType * ftype );
 
         /// returns the first parameter of a constructor/destructor/assignment function