Changeset a6e0e4c for libcfa/src

Timestamp:

Dec 11, 2020, 3:44:29 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

361bf01, 6ce9a4f2

Parents:

b3a0df6 (diff), 4422579 (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:

• concurrency/coroutine.hfa (modified) (1 diff)
• concurrency/io/setup.cfa (modified) (6 diffs)
• heap.cfa (modified) (8 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -144 +144 @@
 
         if( unlikely(dst->context.SP == 0p) ) {
-                active_thread()->curr_cor = dst;
                 __stack_prepare(&dst->stack, 65000);
                 __cfactx_start(main, dst, cor, __cfactx_invoke_coroutine);
-                active_thread()->curr_cor = src;
         }
 

libcfa/src/concurrency/io/setup.cfa

@@ -17 +17 @@
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
 
+#if defined(__CFA_DEBUG__)
+        // #define __CFA_DEBUG_PRINT_IO__
+        // #define __CFA_DEBUG_PRINT_IO_CORE__
+#endif
+
 #include "io/types.hfa"
 #include "kernel.hfa"
@@ -111 +116 @@
 
         void __kernel_io_startup(void) {
-                __cfaabi_dbg_print_safe( "Kernel : Creating EPOLL instance\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Creating EPOLL instance\n" );
 
                 iopoll.epollfd = epoll_create1(0);
@@ -118 +123 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : Starting io poller thread\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Starting io poller thread\n" );
 
                 iopoll.run = true;
@@ -141 +146 @@
                 // Io polling is now fully stopped
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller stopped\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller stopped\n" );
         }
 
@@ -149 +154 @@
                 id.id = doregister(&id);
                 __cfaabi_tls.this_proc_id = &id;
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread starting\n" );
 
                 // Block signals to control when they arrive
@@ -184 +189 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread stopping\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread stopping\n" );
                 unregister(&id);
                 return 0p;

libcfa/src/heap.cfa

@@ -10 +10 @@
 // Created On       : Tue Dec 19 21:58:35 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  7 22:17:46 2020
-// Update Count     : 957
+// Last Modified On : Fri Dec 11 07:36:34 2020
+// Update Count     : 970
 //
 
@@ -464 +464 @@
 } // headers
 
+#ifdef __CFA_DEBUG__
+#if __SIZEOF_POINTER__ == 4
+#define MASK 0xdeadbeef
+#else
+#define MASK 0xdeadbeefdeadbeef
+#endif
+#define STRIDE size_t
+
+static void * Memset( void * addr, STRIDE size ) {              // debug only
+        if ( size % sizeof(STRIDE) != 0 ) abort( "Memset() : internal error, size %zd not multiple of %zd.", size, sizeof(STRIDE) );
+        if ( (STRIDE)addr % sizeof(STRIDE) != 0 ) abort( "Memset() : internal error, addr %p not multiple of %zd.", addr, sizeof(STRIDE) );
+
+        STRIDE * end = (STRIDE *)addr + size / sizeof(STRIDE);
+        for ( STRIDE * p = (STRIDE *)addr; p < end; p += 1 ) *p = MASK;
+        return addr;
+} // Memset
+#endif // __CFA_DEBUG__
+
 #define NO_MEMORY_MSG "insufficient heap memory available for allocating %zd new bytes."
 
@@ -483 +501 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                memset( (char *)heapEnd + heapRemaining, '\377', increase );
+                //memset( (char *)heapEnd + heapRemaining, '\377', increase );
+                Memset( (char *)heapEnd + heapRemaining, increase );
                 #endif // __CFA_DEBUG__
                 rem = heapRemaining + increase - size;
@@ -557 +576 @@
                 #ifdef __CFA_DEBUG__
                 // Set new memory to garbage so subsequent uninitialized usages might fail.
-                memset( block, '\377', tsize );
+                //memset( block, '\377', tsize );
+                Memset( block, tsize );
                 #endif // __CFA_DEBUG__
                 block->header.kind.real.blockSize = tsize;              // storage size for munmap
@@ -606 +626 @@
                 #ifdef __CFA_DEBUG__
                 // Set free memory to garbage so subsequent usages might fail.
-                memset( ((HeapManager.Storage *)header)->data, '\377', freeElem->blockSize - sizeof( HeapManager.Storage ) );
+                //memset( ((HeapManager.Storage *)header)->data, '\377', freeElem->blockSize - sizeof( HeapManager.Storage ) );
+                Memset( ((HeapManager.Storage *)header)->data, freeElem->blockSize - sizeof( HeapManager.Storage ) );
                 #endif // __CFA_DEBUG__
 
@@ -935 +956 @@
                         header->kind.real.size = size;                          // reset allocation size
                         if ( unlikely( ozfill ) && size > osize ) {     // previous request zero fill and larger ?
-                                memset( (char *)oaddr + osize, (int)'\0', size - osize ); // initialize added storage
+                                memset( (char *)oaddr + osize, '\0', size - osize ); // initialize added storage
                         } // if
                         return oaddr;
@@ -960 +981 @@
                         header->kind.real.blockSize |= 2;                       // mark new request as zero filled
                         if ( size > osize ) {                                           // previous request larger ?
-                                memset( (char *)naddr + osize, (int)'\0', size - osize ); // initialize added storage
+                                memset( (char *)naddr + osize, '\0', size - osize ); // initialize added storage
                         } // if
                 } // if
@@ -1327 +1348 @@
                 header->kind.real.blockSize |= 2;                               // mark new request as zero filled
                 if ( size > osize ) {                                                   // previous request larger ?
-                        memset( (char *)naddr + osize, (int)'\0', size - osize ); // initialize added storage
+                        memset( (char *)naddr + osize, '\0', size - osize ); // initialize added storage
                 } // if
         } // if