Changes in / [84e8423:15d248e]

Location:

src

Files:

• Concurrency/Waitfor.cc (modified) (1 diff)
• benchmark/Makefile.am (modified) (1 diff)
• benchmark/Makefile.in (modified) (1 diff)
• libcfa/concurrency/preemption.c (modified) (1 diff)
• tests/.expect/alloc-ERROR.txt (modified) (3 diffs)
• tests/.expect/alloc.txt (modified) (1 diff)
• tests/.expect/vector.txt (added)
• tests/alloc.c (modified) (4 diffs)

src/Concurrency/Waitfor.cc

@@ -507 +507 @@
                         new ListInit({
                                 new SingleInit( new AddressExpr( new VariableExpr( index ) ) ),
-                                new SingleInit( new VariableExpr( acceptables ) ),
-                                new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                new ListInit({
+                                        new SingleInit( new VariableExpr( acceptables ) ),
+                                        new SingleInit( new ConstantExpr( Constant::from_ulong( count ) ) )
+                                })
                         })
                 );

src/benchmark/Makefile.am

@@ -198 +198 @@
 
 waitfor-cfa1$(EXEEXT):
-        ${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa2$(EXEEXT):

src/benchmark/Makefile.in

@@ -607 +607 @@
 
 waitfor-cfa1$(EXEEXT):
-        ${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
+        @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
 
 waitfor-cfa2$(EXEEXT):

src/libcfa/concurrency/preemption.c

@@ -300 +300 @@
         // Check if it is safe to preempt here
         if( !preemption_ready() ) { return; }
+
+        // __cfaabi_dbg_print_buffer_decl(" KERNEL: preempting core %p (%p).\n", this_processor, this_thread);
 
         preemption_in_progress = true;                      // Sync flag : prevent recursive calls to the signal handler

src/tests/.expect/alloc-ERROR.txt

@@ -1 +1 @@
 alloc.c:264:1 error: No reasonable alternatives for expression Applying untyped: 
+  Name: ?=?
+...to: 
+  Name: p
+  Applying untyped: 
+    Name: realloc
+  ...to: 
+    Name: stp
+    Applying untyped: 
+      Name: ?*?
+    ...to: 
+      Name: dim
+      Sizeof Expression on: Applying untyped: 
+          Name: *?
+        ...to: 
+          Name: stp
+
+
+
+
+alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 
@@ -19 +39 @@
 
 
-alloc.c:265:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 
@@ -30 +50 @@
 
 
-alloc.c:266:1 error: No reasonable alternatives for expression Applying untyped: 
+alloc.c:267:1 error: No reasonable alternatives for expression Applying untyped: 
   Name: ?=?
 ...to: 

src/tests/.expect/alloc.txt

@@ -60 +60 @@
 pointer arithmetic 0
 CFA deep malloc 0xdeadbeef
-
-SHOULD FAIL

src/tests/alloc.c

@@ -10 +10 @@
 // Created On       : Wed Feb  3 07:56:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Nov 24 23:06:42 2017
-// Update Count     : 319
+// Last Modified On : Mon Jan 22 21:26:40 2018
+// Update Count     : 326
 //
 
@@ -32 +32 @@
         // allocation, non-array types
 
-        // int &r = malloc();
+        // int & r = malloc();
         // r = 0xdeadbeef;
         // printf( "C   malloc %#x\n", r );
         // free( &r );
 
-        p = (int *)(void *)malloc( sizeof(*p) );                        // C malloc, type unsafe
+        p = (int *)malloc( sizeof(*p) );                                        // C malloc, type unsafe
         *p = 0xdeadbeef;
         printf( "C   malloc %#x\n", *p );
@@ -88 +88 @@
         printf( "\n" );
 
-        p = (int *)(void *)realloc( p, dim * sizeof(*p) );      // C realloc
+        p = (int *)realloc( p, dim * sizeof(*p) );                      // C realloc
         for ( int i = 0; i < dim; i += 1 ) { p[i] = 0xdeadbeef; }
         printf( "C   realloc\n" );
@@ -259 +259 @@
         free( p );
 
+#ifdef ERR1
         stp = malloc();
         printf( "\nSHOULD FAIL\n" );
-#ifdef ERR1
-        p = alloc( stp, dim * sizeof(*stp) );
+        p = realloc( stp, dim * sizeof( *stp ) );
+        p = alloc( stp, dim * sizeof( *stp ) );
         p = memset( stp, 10 );
         p = memcpy( &st1, &st );