NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit89779bf

committed

Fix a few problems in barrier.h.

On HPPA, implement pg_memory_barrier() as pg_compiler_barrier(), whichshould be correct since this arch doesn't do memory access reordering,and is anyway better than the completely-nonfunctional-on-this-archdummy_spinlock code. (But note this patch only fixes things for gcc,not for builds with HP's compiler.)Also, fix incorrect default definition of pg_memory_barrier as a macrorequiring an argument.Also, fix incorrect spelling of "#elif" as "#else if" in icc code path(spotted by pgindent).This doesn't come close to fixing all of the functional and stylisticdeficiencies in barrier.h, but at least it un-breaks my personal build.Now that we're actually using barriers in the code, this file is goingto need some serious attention.

1 parent107cbc9 commit89779bfCopy full SHA for 89779bf

File tree

1 file changed

-2

lines changed

src/include/storage
- barrier.h

1 file changed

-2

lines changed

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

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ extern slock_t dummy_spinlock;`
`55`	`55`	`*/`
`56`	`56`	`#if defined(__ia64__)\|\| defined(__ia64)`
`57`	`57`	`#definepg_memory_barrier()__mf()`
`58`		`-#elseifdefined(__i386__)\|\|defined(__x86_64__)`
	`58`	`+#elif defined(__i386__)\|\| defined(__x86_64__)`
`59`	`59`	`#definepg_memory_barrier()_mm_mfence()`
`60`	`60`	`#endif`
`61`	`61`
`@@ -119,6 +119,10 @@ extern slock_t dummy_spinlock;`
`119`	`119`	`#definepg_memory_barrier()__asm__ __volatile__ ("mb" : : : "memory")`
`120`	`120`	`#definepg_read_barrier()__asm__ __volatile__ ("rmb" : : : "memory")`
`121`	`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()`
`122`	`126`	`#elif__GNUC__>4\|\| (__GNUC__==4&&__GNUC_MINOR__ >=1)`
`123`	`127`
`124`	`128`	`/*`
`@@ -153,7 +157,7 @@ extern slock_t dummy_spinlock;`
`153`	`157`	`* fence. But all of our actual implementations seem OK in this regard.`
`154`	`158`	`*/`
`155`	`159`	`#if !defined(pg_memory_barrier)`
`156`		`-#definepg_memory_barrier(x) \`
	`160`	`+#definepg_memory_barrier() \`
`157`	`161`	`do { S_LOCK(&dummy_spinlock); S_UNLOCK(&dummy_spinlock); } while (0)`
`158`	`162`	`#endif`
`159`	`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!

Commit89779bf

File tree

1 file changed

1 file changed

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

0 commit comments