Changeset 0720e049 for src/libcfa/concurrency/kernel_private.h

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/concurrency/kernel_private.h (modified) (6 diffs)

src/libcfa/concurrency/kernel_private.h

@@ -1 @@
-//                              -*- Mode: CFA -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -10 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Mon Feb 13 12:27:26 2017
-// Last Modified By : Thierry Delisle
-// Last Modified On : --
-// Update Count     : 0
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jul 22 09:58:09 2017
+// Update Count     : 2
 //
 
-#ifndef KERNEL_PRIVATE_H
-#define KERNEL_PRIVATE_H
+#pragma once
 
 #include "libhdr.h"
@@ -31 +29 @@
 extern "C" {
         void disable_interrupts();
-        void enable_interrupts_noRF();
+        void enable_interrupts_noPoll();
         void enable_interrupts( DEBUG_CTX_PARAM );
 }
@@ -45 +43 @@
 thread_desc * nextThread(cluster * this);
 
+//Block current thread and release/wake-up the following resources
 void BlockInternal(void);
 void BlockInternal(spinlock * lock);
@@ -65 +64 @@
 void spin(processor * this, unsigned int * spin_count);
 
-struct system_proc_t {
-        processor proc;
-
+struct event_kernel_t {
         alarm_list_t alarms;
-        spinlock alarm_lock;
-
-        bool pending_alarm;
+        spinlock lock;
 };
 
-extern cluster * systemCluster;
-extern system_proc_t * systemProcessor;
-extern volatile thread_local processor * this_processor;
-extern volatile thread_local coroutine_desc * this_coroutine;
-extern volatile thread_local thread_desc * this_thread;
+extern event_kernel_t * event_kernel;
+
+extern thread_local coroutine_desc * volatile this_coroutine;
+extern thread_local thread_desc *    volatile this_thread;
+extern thread_local processor *      volatile this_processor;
+
 extern volatile thread_local bool preemption_in_progress;
 extern volatile thread_local unsigned short disable_preempt_count;
@@ -91 +87 @@
 extern void ThreadCtxSwitch(coroutine_desc * src, coroutine_desc * dst);
 
-#endif //KERNEL_PRIVATE_H
+//-----------------------------------------------------------------------------
+// Utils
+#define KERNEL_STORAGE(T,X) static char storage_##X[sizeof(T)]
 
 // Local Variables: //