Changeset 9cc0472 for src

Timestamp:

Jul 19, 2017, 12:28:59 PM (7 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:

3175147

Parents:

b826e6b

Message:

Fix error with volatile on pointer

Location:

src/libcfa/concurrency

Files:

• coroutine (modified) (1 diff)
• coroutine.c (modified) (1 diff)
• kernel.c (modified) (1 diff)
• kernel_private.h (modified) (1 diff)
• thread (modified) (1 diff)
• thread.c (modified) (1 diff)

src/libcfa/concurrency/coroutine

@@ -63 +63 @@
 
 // Get current coroutine
-extern volatile thread_local coroutine_desc * this_coroutine;
+extern thread_local coroutine_desc * volatile this_coroutine;
 
 // Private wrappers for context switch and stack creation

src/libcfa/concurrency/coroutine.c

@@ -26 +26 @@
 }
 
-#include "kernel"
-#include "libhdr.h"
+#include "kernel_private.h"
 
 #define __CFA_INVOKE_PRIVATE__
 #include "invoke.h"
 
-extern volatile thread_local processor * this_processor;
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/kernel.c

@@ -55 +55 @@
 // Global state
 
-volatile thread_local coroutine_desc * this_coroutine;
-volatile thread_local thread_desc * this_thread;
-volatile thread_local processor * this_processor;
+thread_local coroutine_desc * volatile this_coroutine;
+thread_local thread_desc *    volatile this_thread;
+thread_local processor *      volatile this_processor;
 
 volatile thread_local bool preemption_in_progress = 0;

src/libcfa/concurrency/kernel_private.h

@@ -73 +73 @@
 extern event_kernel_t * event_kernel;
 
-extern volatile thread_local processor * this_processor;
-extern volatile thread_local coroutine_desc * this_coroutine;
-extern volatile thread_local thread_desc * this_thread;
+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;

src/libcfa/concurrency/thread

@@ -54 +54 @@
 }
 
-extern volatile thread_local thread_desc * this_thread;
+extern thread_local thread_desc * volatile this_thread;
 
 forall( dtype T | is_thread(T) )

src/libcfa/concurrency/thread.c

@@ -87 +87 @@
 
 void yield( void ) {
-        BlockInternal( (thread_desc *)this_thread );
+        BlockInternal( (thread_desc*)this_thread );
 }