about summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2015-03-03 22:50:02 -0500
committerRich Felker <dalias@aerifal.cx>2015-03-03 22:50:02 -0500
commit56fbaa3bbe73f12af2bfbbcf2adb196e6f9fe264 (patch)
tree09fbe371b108e25bb2f9c90e74da356359950d29 /include
parenteb4bd8d8bb5c9f535ee8250edd4efbd3d4f84c5a (diff)
downloadmusl-56fbaa3bbe73f12af2bfbbcf2adb196e6f9fe264.tar.gz
musl-56fbaa3bbe73f12af2bfbbcf2adb196e6f9fe264.tar.xz
musl-56fbaa3bbe73f12af2bfbbcf2adb196e6f9fe264.zip
make all objects used with atomic operations volatile
the memory model we use internally for atomics permits plain loads of
values which may be subject to concurrent modification without
requiring that a special load function be used. since a compiler is
free to make transformations that alter the number of loads or the way
in which loads are performed, the compiler is theoretically free to
break this usage. the most obvious concern is with atomic cas
constructs: something of the form tmp=*p;a_cas(p,tmp,f(tmp)); could be
transformed to a_cas(p,*p,f(*p)); where the latter is intended to show
multiple loads of *p whose resulting values might fail to be equal;
this would break the atomicity of the whole operation. but even more
fundamental breakage is possible.

with the changes being made now, objects that may be modified by
atomics are modeled as volatile, and the atomic operations performed
on them by other threads are modeled as asynchronous stores by
hardware which happens to be acting on the request of another thread.
such modeling of course does not itself address memory synchronization
between cores/cpus, but that aspect was already handled. this all
seems less than ideal, but it's the best we can do without mandating a
C11 compiler and using the C11 model for atomics.

in the case of pthread_once_t, the ABI type of the underlying object
is not volatile-qualified. so we are assuming that accessing the
object through a volatile-qualified lvalue via casts yields volatile
access semantics. the language of the C standard is somewhat unclear
on this matter, but this is an assumption the linux kernel also makes,
and seems to be the correct interpretation of the standard.
Diffstat (limited to 'include')
-rw-r--r--include/aio.h2
-rw-r--r--include/semaphore.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/aio.h b/include/aio.h
index d9330ebe..19bc28a9 100644
--- a/include/aio.h
+++ b/include/aio.h
@@ -21,7 +21,7 @@ struct aiocb {
 	struct sigevent aio_sigevent;
 	void *__td;
 	int __lock[2];
-	int __err;
+	volatile int __err;
 	ssize_t __ret;
 	off_t aio_offset;
 	void *__next, *__prev;
diff --git a/include/semaphore.h b/include/semaphore.h
index 20d46f0d..277c47d6 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -15,7 +15,7 @@ extern "C" {
 #define SEM_FAILED ((sem_t *)0)
 
 typedef struct {
-	int __val[4*sizeof(long)/sizeof(int)];
+	volatile int __val[4*sizeof(long)/sizeof(int)];
 } sem_t;
 
 int    sem_close(sem_t *);