diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/copyto.c | 2 | ||||
| -rw-r--r-- | src/backend/storage/buffer/freelist.c | 1 | ||||
| -rw-r--r-- | src/include/port/atomics/generic-gcc.h | 12 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index a1919c6db43..cef452584e5 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -586,7 +586,7 @@ ClosePipeToProgram(CopyToState cstate) } /* - * Release resources allocated in a cstate for COPY TO/FROM. + * Release resources allocated in a cstate for COPY TO. */ static void EndCopy(CopyToState cstate) diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 53668b92400..28d952b3534 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -302,7 +302,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, uint32 *buf_state, bool *from_r return buf; } } - } } } diff --git a/src/include/port/atomics/generic-gcc.h b/src/include/port/atomics/generic-gcc.h index e7dfad4f0d5..a0751f2286a 100644 --- a/src/include/port/atomics/generic-gcc.h +++ b/src/include/port/atomics/generic-gcc.h @@ -44,12 +44,20 @@ #if !defined(pg_read_barrier_impl) && defined(HAVE_GCC__ATOMIC_INT32_CAS) /* acquire semantics include read barrier semantics */ -# define pg_read_barrier_impl() __atomic_thread_fence(__ATOMIC_ACQUIRE) +# define pg_read_barrier_impl() do \ +{ \ + pg_compiler_barrier_impl(); \ + __atomic_thread_fence(__ATOMIC_ACQUIRE); \ +} while (0) #endif #if !defined(pg_write_barrier_impl) && defined(HAVE_GCC__ATOMIC_INT32_CAS) /* release semantics include write barrier semantics */ -# define pg_write_barrier_impl() __atomic_thread_fence(__ATOMIC_RELEASE) +# define pg_write_barrier_impl() do \ +{ \ + pg_compiler_barrier_impl(); \ + __atomic_thread_fence(__ATOMIC_RELEASE); \ +} while (0) #endif |