Changes in libcfa/src/concurrency/kernel/startup.cfa [24e321c:1757f98]

File:

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

libcfa/src/concurrency/kernel/startup.cfa

@@ -100 +100 @@
 // Other Forward Declarations
 extern void __wake_proc(processor *);
+extern int cfa_main_returned;                                                   // from interpose.cfa
 
 //-----------------------------------------------------------------------------
@@ -268 +269 @@
 
 static void __kernel_shutdown(void) {
+        if(!cfa_main_returned) return;
         /* paranoid */ verify( __preemption_enabled() );
         disable_interrupts();
@@ -525 +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));
         }
@@ -540 +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);
 }
 
@@ -582 +584 @@
 // Cluster
 static void ?{}(__cluster_proc_list & this) {
-        this.lock  = 0;
+        this.fd    = 0;
         this.idle  = 0;
         this.total = 0;