luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gatomic: Drop unnecessary volatile qualifiers from internal variables

Browse Source 
It’s not necessary and provides no thread safety guarantees.

The `volatile` qualifiers on the function arguments have to be kept, as
they are (unfortunately) part of the API.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #600
This commit is contained in:
Philip Withnall 2020-11-11 18:36:37 +00:00
parent 1a7f0002a0
commit 3c648457c2
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
glib/gatomic.c
View File

@ -316,7 +316,7 @@ guint
gpointer gpointer
(g_atomic_pointer_get) (const volatile void *atomic) (g_atomic_pointer_get) (const volatile void *atomic)
{ {
return g_atomic_pointer_get ((const volatile gpointer *) atomic); return g_atomic_pointer_get ((gpointer *) atomic);
} }
/** /**
@ -335,7 +335,7 @@ void
(g_atomic_pointer_set) (volatile void *atomic, (g_atomic_pointer_set) (volatile void *atomic,
gpointer newval) gpointer newval)
{ {
g_atomic_pointer_set ((volatile gpointer *) atomic, newval); g_atomic_pointer_set ((gpointer *) atomic, newval);
} }
/** /**
@ -363,7 +363,7 @@ gboolean
gpointer oldval, gpointer oldval,
gpointer newval) gpointer newval)
{ {
return g_atomic_pointer_compare_and_exchange ((volatile gpointer *) atomic, return g_atomic_pointer_compare_and_exchange ((gpointer *) atomic,
oldval, newval); oldval, newval);
} }
@ -387,7 +387,7 @@ gssize
(g_atomic_pointer_add) (volatile void *atomic, (g_atomic_pointer_add) (volatile void *atomic,
gssize val) gssize val)
{ {
return g_atomic_pointer_add ((volatile gpointer *) atomic, val); return g_atomic_pointer_add ((gpointer *) atomic, val);
} }
/** /**
@ -411,7 +411,7 @@ gsize
(g_atomic_pointer_and) (volatile void *atomic, (g_atomic_pointer_and) (volatile void *atomic,
gsize val) gsize val)
{ {
return g_atomic_pointer_and ((volatile gpointer *) atomic, val); return g_atomic_pointer_and ((gpointer *) atomic, val);
} }
/** /**
@ -435,7 +435,7 @@ gsize
(g_atomic_pointer_or) (volatile void *atomic, (g_atomic_pointer_or) (volatile void *atomic,
gsize val) gsize val)
{ {
return g_atomic_pointer_or ((volatile gpointer *) atomic, val); return g_atomic_pointer_or ((gpointer *) atomic, val);
} }
/** /**
@ -459,7 +459,7 @@ gsize
(g_atomic_pointer_xor) (volatile void *atomic, (g_atomic_pointer_xor) (volatile void *atomic,
gsize val) gsize val)
{ {
return g_atomic_pointer_xor ((volatile gpointer *) atomic, val); return g_atomic_pointer_xor ((gpointer *) atomic, val);
} }
#elif defined (G_PLATFORM_WIN32) #elif defined (G_PLATFORM_WIN32)
@ -591,7 +591,7 @@ guint
gpointer gpointer
(g_atomic_pointer_get) (const volatile void *atomic) (g_atomic_pointer_get) (const volatile void *atomic)
{ {
const volatile gpointer *ptr = atomic; const gpointer *ptr = atomic;
MemoryBarrier (); MemoryBarrier ();
return *ptr; return *ptr;
@ -601,7 +601,7 @@ void
(g_atomic_pointer_set) (volatile void *atomic, (g_atomic_pointer_set) (volatile void *atomic,
gpointer newval) gpointer newval)
{ {
volatile gpointer *ptr = atomic; gpointer *ptr = atomic;
*ptr = newval; *ptr = newval;
MemoryBarrier (); MemoryBarrier ();
@ -797,7 +797,7 @@ guint
gpointer gpointer
(g_atomic_pointer_get) (const volatile void *atomic) (g_atomic_pointer_get) (const volatile void *atomic)
{ {
const volatile gpointer *ptr = atomic; const gpointer *ptr = atomic;
gpointer value; gpointer value;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -811,7 +811,7 @@ void
(g_atomic_pointer_set) (volatile void *atomic, (g_atomic_pointer_set) (volatile void *atomic,
gpointer newval) gpointer newval)
{ {
volatile gpointer *ptr = atomic; gpointer *ptr = atomic;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
*ptr = newval; *ptr = newval;
@ -823,7 +823,7 @@ gboolean
gpointer oldval, gpointer oldval,
gpointer newval) gpointer newval)
{ {
volatile gpointer *ptr = atomic; gpointer *ptr = atomic;
gboolean success; gboolean success;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -840,7 +840,7 @@ gssize
(g_atomic_pointer_add) (volatile void *atomic, (g_atomic_pointer_add) (volatile void *atomic,
gssize val) gssize val)
{ {
volatile gssize *ptr = atomic; gssize *ptr = atomic;
gssize oldval; gssize oldval;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -855,7 +855,7 @@ gsize
(g_atomic_pointer_and) (volatile void *atomic, (g_atomic_pointer_and) (volatile void *atomic,
gsize val) gsize val)
{ {
volatile gsize *ptr = atomic; gsize *ptr = atomic;
gsize oldval; gsize oldval;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -870,7 +870,7 @@ gsize
(g_atomic_pointer_or) (volatile void *atomic, (g_atomic_pointer_or) (volatile void *atomic,
gsize val) gsize val)
{ {
volatile gsize *ptr = atomic; gsize *ptr = atomic;
gsize oldval; gsize oldval;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -885,7 +885,7 @@ gsize
(g_atomic_pointer_xor) (volatile void *atomic, (g_atomic_pointer_xor) (volatile void *atomic,
gsize val) gsize val)
{ {
volatile gsize *ptr = atomic; gsize *ptr = atomic;
gsize oldval; gsize oldval;
pthread_mutex_lock (&g_atomic_lock); pthread_mutex_lock (&g_atomic_lock);
@ -915,5 +915,5 @@ gint
g_atomic_int_exchange_and_add (volatile gint *atomic, g_atomic_int_exchange_and_add (volatile gint *atomic,
gint val) gint val)
{ {
return (g_atomic_int_add) (atomic, val); return (g_atomic_int_add) ((gint *) atomic, val);
} }