Changeset 28e58fd for src/libcfa/concurrency/preemption.c

Timestamp:

Aug 25, 2017, 10:38:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

800d275

Parents:

af08051 (diff), 3eab308c (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

File:

• src/libcfa/concurrency/preemption.c (modified) (3 diffs)

src/libcfa/concurrency/preemption.c

@@ -71 +71 @@
 static pthread_t alarm_thread;                        // pthread handle to alarm thread
 
-void ?{}(event_kernel_t * this) {
-        (&this->alarms){};
-        (&this->lock){};
+void ?{}(event_kernel_t & this) {
+        (this.alarms){};
+        (this.lock){};
 }
 
@@ -240 +240 @@
         // Initialize the event kernel
         event_kernel = (event_kernel_t *)&storage_event_kernel;
-        event_kernel{};
+        (*event_kernel){};
 
         // Setup proper signal handlers
@@ -276 +276 @@
 // Raii ctor/dtor for the preemption_scope
 // Used by thread to control when they want to receive preemption signals
-void ?{}( preemption_scope * this, processor * proc ) {
-        (&this->alarm){ proc, zero_time, zero_time };
-        this->proc = proc;
-        this->proc->preemption_alarm = &this->alarm;
-
-        update_preemption( this->proc, from_us(this->proc->cltr->preemption) );
-}
-
-void ^?{}( preemption_scope * this ) {
+void ?{}( preemption_scope & this, processor * proc ) {
+        (this.alarm){ proc, zero_time, zero_time };
+        this.proc = proc;
+        this.proc->preemption_alarm = &this.alarm;
+
+        update_preemption( this.proc, from_us(this.proc->cltr->preemption) );
+}
+
+void ^?{}( preemption_scope & this ) {
         disable_interrupts();
 
-        update_preemption( this->proc, zero_time );
+        update_preemption( this.proc, zero_time );
 }