Changes in src/libcfa/concurrency/alarm.c [ea7d2b0:6b0b624]

File:

• src/libcfa/concurrency/alarm.c (modified) (5 diffs)

src/libcfa/concurrency/alarm.c

@@ -40 +40 @@
 __cfa_time_t zero_time = { 0 };
 
-void ?{}( __cfa_time_t & this ) { this.val = 0; }
-void ?{}( __cfa_time_t & this, zero_t zero ) { this.val = 0; }
-
-void ?{}( itimerval & this, __cfa_time_t * alarm ) {
-        this.it_value.tv_sec = alarm->val / one_second;                 // seconds
-        this.it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
-        this.it_interval.tv_sec = 0;
-        this.it_interval.tv_usec = 0;
-}
-
-
-void ?{}( __cfa_time_t & this, timespec * curr ) {
+void ?{}( __cfa_time_t * this ) { this->val = 0; }
+void ?{}( __cfa_time_t * this, zero_t zero ) { this->val = 0; }
+
+void ?{}( itimerval * this, __cfa_time_t * alarm ) {
+        this->it_value.tv_sec = alarm->val / one_second;                        // seconds
+        this->it_value.tv_usec = max( (alarm->val % one_second) / one_microsecond, 1000 ); // microseconds
+        this->it_interval.tv_sec = 0;
+        this->it_interval.tv_usec = 0;
+}
+
+
+void ?{}( __cfa_time_t * this, timespec * curr ) {
         uint64_t secs  = curr->tv_sec;
         uint64_t nsecs = curr->tv_nsec;
-        this.val = (secs * one_second) + nsecs;
-}
-
-__cfa_time_t ?=?( __cfa_time_t & this, zero_t rhs ) {
-        this.val = 0;
-        return this;
+        this->val = (secs * one_second) + nsecs;
+}
+
+__cfa_time_t ?=?( __cfa_time_t * this, zero_t rhs ) {
+        this->val = 0;
+        return *this;
 }
 
@@ -86 +86 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
-        this.thrd = thrd;
-        this.alarm = alarm;
-        this.period = period;
-        this.next = 0;
-        this.set = false;
-        this.kernel_alarm = false;
-}
-
-void ?{}( alarm_node_t & this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
-        this.proc = proc;
-        this.alarm = alarm;
-        this.period = period;
-        this.next = 0;
-        this.set = false;
-        this.kernel_alarm = true;
-}
-
-void ^?{}( alarm_node_t & this ) {
-        if( this.set ) {
-                unregister_self( &this );
+void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+        this->thrd = thrd;
+        this->alarm = alarm;
+        this->period = period;
+        this->next = 0;
+        this->set = false;
+        this->kernel_alarm = false;
+}
+
+void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = zero_time, __cfa_time_t period = zero_time ) {
+        this->proc = proc;
+        this->alarm = alarm;
+        this->period = period;
+        this->next = 0;
+        this->set = false;
+        this->kernel_alarm = true;
+}
+
+void ^?{}( alarm_node_t * this ) {
+        if( this->set ) {
+                unregister_self( this );
         }
 }
@@ -186 +186 @@
 
         disable_interrupts();
-        lock( event_kernel->lock DEBUG_CTX2 );
+        lock( &event_kernel->lock DEBUG_CTX2 );
         {
                 verify( validate( alarms ) );
@@ -196 +196 @@
                 }
         }
-        unlock( event_kernel->lock );
+        unlock( &event_kernel->lock );
         this->set = true;
         enable_interrupts( DEBUG_CTX );
@@ -203 +203 @@
 void unregister_self( alarm_node_t * this ) {
         disable_interrupts();
-        lock( event_kernel->lock DEBUG_CTX2 );
+        lock( &event_kernel->lock DEBUG_CTX2 );
         {
                 verify( validate( &event_kernel->alarms ) );
                 remove( &event_kernel->alarms, this );
         }
-        unlock( event_kernel->lock );
+        unlock( &event_kernel->lock );
         enable_interrupts( DEBUG_CTX );
         this->set = false;