Changes in / [1eb222ff:02a43ff]

Files:

• libcfa/src/concurrency/alarm.cfa (modified) (2 diffs)
• libcfa/src/concurrency/locks.cfa (modified) (2 diffs)
• src/GenPoly/Box.cc (modified) (1 diff)
• tests/raii/.expect/boxed-types.txt (added)
• tests/raii/boxed-types.cfa (added)
• tests/unified_locking/timeout_lock.cfa (modified) (2 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -119 +119 @@
                 insert( &alarms, this );
                 __kernel_set_timer( this->timeval - curr);
+                this->set = true;
         }
         unlock( event_kernel->lock );
-        this->set = true;
         enable_interrupts();
 }
@@ -130 +130 @@
         {
                 verify( validate( event_kernel->alarms ) );
-                remove( *this );
+                if (this->set) remove( *this );
+                this->set = false;
         }
         unlock( event_kernel->lock );
         enable_interrupts();
-        this->set = false;
 }
 

libcfa/src/concurrency/locks.cfa

@@ -313 +313 @@
 
         // helper for wait()'s' with a timeout
-        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t ) with(this) {
+        void queue_info_thread_timeout( condition_variable(L) & this, info_thread(L) & info, Duration t, Alarm_Callback callback ) with(this) {
                 lock( lock __cfaabi_dbg_ctx2 );
                 size_t recursion_count = queue_and_get_recursion(this, &info);
-                alarm_node_wrap(L) node_wrap = { t, 0`s, alarm_node_wrap_cast, &this, &info };
+                alarm_node_wrap(L) node_wrap = { t, 0`s, callback, &this, &info };
                 register_self( &node_wrap.alarm_node );
                 unlock( lock );
@@ -332 +332 @@
         #define WAIT_TIME( u, l, t ) \
                 info_thread( L ) i = { active_thread(), u, l }; \
-                queue_info_thread_timeout(this, i, t ); \
+                queue_info_thread_timeout(this, i, t, alarm_node_wrap_cast ); \
                 return i.signalled;
 

src/GenPoly/Box.cc

@@ -1525 +1525 @@
                                         stmtsToAddBefore.push_back( new DeclStmt( newBuf ) );
 
+                                        // if the object has a cleanup attribute, the cleanup should be on the buffer, not the pointer
+                                        auto matchAndMove = [newBuf](Attribute * attr){
+                                                if(attr->name == "cleanup") {
+                                                        newBuf->attributes.push_back(attr);
+                                                        return true;
+                                                }
+                                                return false;
+                                        };
+
+                                        objectDecl->attributes.remove_if(matchAndMove);
+
                                         delete objectDecl->get_init();
                                         objectDecl->set_init( new SingleInit( new VariableExpr( newBuf ) ) );

tests/unified_locking/timeout_lock.cfa

@@ -33 +33 @@
 
         for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-            if ( wait( c_m, m, 1`s ) ) { 
+            if ( wait( c_m, m, 1`s ) ) {
                         // printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
             } else {
@@ -73 +73 @@
         processor p[2];
         printf("Start Test 1: surface testing condition variable timeout routines\n");
-        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );        
+        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );
         wait( c_m, 10, 1`ns );                                                                                                  // bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
-        wait( c_m, __kernel_get_time() + 1`ns );                                                                // bool wait( condition_variable(L) & this, Time time );
-        wait( c_m, 10, __kernel_get_time() + 1`ns );                                                    // bool wait( condition_variable(L) & this, uintptr_t info, Time time );
         lock(m); wait( c_m, m, 1`ns ); unlock(m);                                                               // bool wait( condition_variable(L) & this, L & l, Duration duration );
         lock(m); wait( c_m, m, 10, 1`ns ); unlock(m);                                                   // bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
-        lock(m); wait( c_m, m, __kernel_get_time() + 1`ns ); unlock(m);                 // bool wait( condition_variable(L) & this, L & l, Time time );
-        lock(m); wait( c_m, m, 10, __kernel_get_time() + 1`ns ); unlock(m);             // bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time );
         printf("Done Test 1\n");