NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf4f4f69

committed

Sync 9.2 and 9.3 versions of barrier.h with 9.4's version.

We weren't particularly maintaining barrier.h before 9.4, because nothingwas using it in those branches. Well, nothing until commit37de8de gotback-patched. That broke 9.2 and 9.3 for some non-mainstream platformsthat we haven't been testing in the buildfarm, including icc on ia64,HPPA, and Alpha.This commit effectively back-patches commitse5592c6,89779bf,and747ca66, though I did it just by copying the file (less copyrightdate updates) rather than by cherry-picking those commits.Per an attempt to run gaur and pademelon over old branches they'venot been run on since ~2013.

1 parent6e53bb4 commitf4f4f69Copy full SHA for f4f4f69

File tree

1 file changed

+11

-2

lines changed

src/include/storage
- barrier.h

1 file changed

+11

-2

lines changed

`‎src/include/storage/barrier.h`

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,12 @@ extern slock_t dummy_spinlock;`
`53`	`53`	`/*`
`54`	`54`	`* icc defines __GNUC__, but doesn't support gcc's inline asm syntax`
`55`	`55`	`*/`
	`56`	`+#if defined(__ia64__)\|\| defined(__ia64)`
	`57`	`+#definepg_memory_barrier()__mf()`
	`58`	`+#elif defined(__i386__)\|\| defined(__x86_64__)`
`56`	`59`	`#definepg_memory_barrier()_mm_mfence()`
	`60`	`+#endif`
	`61`	`+`
`57`	`62`	`#definepg_compiler_barrier()__memory_barrier()`
`58`	`63`	`#elif defined(__GNUC__)`
`59`	`64`
`@@ -112,8 +117,12 @@ extern slock_t dummy_spinlock;`
`112`	`117`	`* read barrier to cover that case. We might need to add that later.`
`113`	`118`	`*/`
`114`	`119`	`#definepg_memory_barrier()__asm__ __volatile__ ("mb" : : : "memory")`
`115`		`-#definepg_read_barrier()__asm__ __volatile__ ("rmb" : : : "memory")`
	`120`	`+#definepg_read_barrier()__asm__ __volatile__ ("mb" : : : "memory")`
`116`	`121`	`#definepg_write_barrier()__asm__ __volatile__ ("wmb" : : : "memory")`
	`122`	`+#elif defined(__hppa)\|\| defined(__hppa__)/* HP PA-RISC */`
	`123`	`+`
	`124`	`+/* HPPA doesn't do either read or write reordering */`
	`125`	`+#definepg_memory_barrier()pg_compiler_barrier()`
`117`	`126`	`#elif__GNUC__>4\|\| (__GNUC__==4&&__GNUC_MINOR__ >=1)`
`118`	`127`
`119`	`128`	`/*`
`@@ -148,7 +157,7 @@ extern slock_t dummy_spinlock;`
`148`	`157`	`* fence. But all of our actual implementations seem OK in this regard.`
`149`	`158`	`*/`
`150`	`159`	`#if !defined(pg_memory_barrier)`
`151`		`-#definepg_memory_barrier(x) \`
	`160`	`+#definepg_memory_barrier() \`
`152`	`161`	`do { S_LOCK(&dummy_spinlock); S_UNLOCK(&dummy_spinlock); } while (0)`
`153`	`162`	`#endif`
`154`	`163`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf4f4f69

File tree

1 file changed

1 file changed

`‎src/include/storage/barrier.h`

0 commit comments