Changeset 28e58fd for src/libcfa/concurrency/thread.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/thread.c (modified) (3 diffs)

src/libcfa/concurrency/thread.c

@@ -32 +32 @@
 // Thread ctors and dtors
 
-void ?{}(thread_desc* this) {
-        (&this->cor){};
-        this->cor.name = "Anonymous Coroutine";
-        this->mon.owner = this;
-        this->mon.recursion = 1;
-        this->next = NULL;
+void ?{}(thread_desc& this) {
+        (this.cor){};
+        this.cor.name = "Anonymous Coroutine";
+        this.mon.owner = &this;
+        this.mon.recursion = 1;
+        this.next = NULL;
 
-        this->current_monitors      = &this->mon;
-        this->current_monitor_count = 1;
+        this.current_monitors      = &this.mon;
+        this.current_monitor_count = 1;
 }
 
-void ^?{}(thread_desc* this) {
-        ^(&this->cor){};
+void ^?{}(thread_desc& this) {
+        ^(this.cor){};
 }
 
-forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T*); } )
-void ?{}( scoped(T)* this ) {
-        (&this->handle){};
-        __thrd_start(&this->handle);
+forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T&); } )
+void ?{}( scoped(T)& this ) {
+        (this.handle){};
+        __thrd_start(this.handle);
 }
 
-forall( dtype T, ttype P | sized(T) | is_thread(T) | { void ?{}(T*, P); } )
-void ?{}( scoped(T)* this, P params ) {
-        (&this->handle){ params };
-        __thrd_start(&this->handle);
+forall( dtype T, ttype P | sized(T) | is_thread(T) | { void ?{}(T&, P); } )
+void ?{}( scoped(T)& this, P params ) {
+        (this.handle){ params };
+        __thrd_start(this.handle);
 }
 
 forall( dtype T | sized(T) | is_thread(T) )
-void ^?{}( scoped(T)* this ) {
-        ^(&this->handle){};
+void ^?{}( scoped(T)& this ) {
+        ^(this.handle){};
 }
 
@@ -67 +67 @@
 // Starting and stopping threads
 forall( dtype T | is_thread(T) )
-void __thrd_start( T* this ) {
+void __thrd_start( T& this ) {
         coroutine_desc* thrd_c = get_coroutine(this);
         thread_desc*  thrd_h = get_thread   (this);
@@ -77 +77 @@
         create_stack(&thrd_c->stack, thrd_c->stack.size);
         this_coroutine = thrd_c;
-        CtxStart(this, CtxInvokeThread);
+        CtxStart(&this, CtxInvokeThread);
         assert( thrd_c->last->stack.context );
         CtxSwitch( thrd_c->last->stack.context, thrd_c->stack.context );