Changeset 6c53a93 for libcfa/src/concurrency/kernel

Timestamp:

Jan 5, 2022, 10:39:39 AM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

0ac728b

Parents:

e2853eb (diff), 6111f1f (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:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (3 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -527 +527 @@
         this.local_data = 0p;
 
-        this.idle = eventfd(0, 0);
-        if (idle < 0) {
+        this.idle_fd = eventfd(0, 0);
+        if (idle_fd < 0) {
                 abort("KERNEL ERROR: PROCESSOR EVENTFD - %s\n", strerror(errno));
         }
@@ -542 +542 @@
 // Not a ctor, it just preps the destruction but should not destroy members
 static void deinit(processor & this) {
-        close(this.idle);
+        close(this.idle_fd);
 }
 
@@ -584 +584 @@
 // Cluster
 static void ?{}(__cluster_proc_list & this) {
-        this.lock  = 0;
+        this.fd    = 0;
         this.idle  = 0;
         this.total = 0;