Changeset 633a642 for src/libcfa/concurrency/thread.c

Timestamp:

Jan 30, 2018, 4:52:54 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

1449d83, 5ff188f

Parents:

320eb73a (diff), 7416d46a (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 plg2:software/cfa/cfa-cc

File:

• src/libcfa/concurrency/thread.c (modified) (2 diffs)

src/libcfa/concurrency/thread.c

@@ -31 +31 @@
 // Thread ctors and dtors
 
-void ?{}(thread_desc& this) {
-        (this.self_cor){};
-        this.self_cor.name = "Anonymous Thread";
-        this.self_mon.owner = &this;
-        this.self_mon.recursion = 1;
-        this.self_mon_p = &this.self_mon;
-        this.next = NULL;
+void ?{}(thread_desc& this) with( this ) {
+        self_cor{};
+        self_cor.name = "Anonymous Coroutine";
+        self_mon.owner = &this;
+        self_mon.recursion = 1;
+        self_mon_p = &self_mon;
+        next = NULL;
         __cfaabi_dbg_debug_do(
-                this.dbg_next = NULL;
-                this.dbg_prev = NULL;
+                dbg_next = NULL;
+                dbg_prev = NULL;
                 __cfaabi_dbg_thread_register(&this);
         )
 
-        (this.monitors){ &this.self_mon_p, 1, (fptr_t)0 };
+        monitors{ &self_mon_p, 1, (fptr_t)0 };
 }
 
-void ^?{}(thread_desc& this) {
-        __cfaabi_dbg_debug_do(
-                __cfaabi_dbg_thread_unregister(&this);
-        )
-        ^(this.self_cor){};
+void ^?{}(thread_desc& this) with( this ) {
+        ^self_cor{};
 }
 
 forall( dtype T | sized(T) | is_thread(T) | { void ?{}(T&); } )
-void ?{}( scoped(T)& this ) {
-        (this.handle){};
-        __thrd_start(this.handle);
+void ?{}( scoped(T)& this ) with( this ) {
+        handle{};
+        __thrd_start(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);
+void ?{}( scoped(T)& this, P params ) with( this ) {
+        handle{ params };
+        __thrd_start(handle);
 }
 
 forall( dtype T | sized(T) | is_thread(T) )
-void ^?{}( scoped(T)& this ) {
-        ^(this.handle){};
+void ^?{}( scoped(T)& this ) with( this ) {
+        ^handle{};
 }
 
@@ -76 +73 @@
 void __thrd_start( T& this ) {
         coroutine_desc* thrd_c = get_coroutine(this);
-        thread_desc*  thrd_h = get_thread   (this);
+        thread_desc   * thrd_h = get_thread   (this);
         thrd_c->last = this_coroutine;