Commit7233aae

committed

Fix PPC s_lock operations to work correctly on multi-CPU machines.

Need 'isync' during TAS and 'sync' during S_UNLOCK.

1 parentb2735fc commit7233aaeCopy full SHA for 7233aae

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.8 2002/06/20 20:29:35 momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/s_lock.c,v 1.9 2002/09/21 00:14:05 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -115,6 +115,9 @@ _success:\n\`
`115`	`115`	`/* used in darwin. */`
`116`	`116`	`/* We key off __APPLE__ here because this function differs from`
`117`	`117`	`* the LinuxPPC implementation only in compiler syntax.`
	`118`	`+ *`
	`119`	`+ * NOTE: per the Enhanced PowerPC Architecture manual, v1.0 dated 7-May-2002,`
	`120`	`+ * an isync is a sufficient synchronization barrier after a lwarx/stwcx loop.`
`118`	`121`	`*/`
`119`	`122`	`staticvoid`
`120`	`123`	`tas_dummy()`
`@@ -134,6 +137,7 @@ tas:\n\`
`134`	`137`	`fail:li r3,1\n\`
`135`	`138`	`blr \n\`
`136`	`139`	`success:\n\`
	`140`	`+isync\n\`
`137`	`141`	`li r3,0\n\`
`138`	`142`	`blr\n\`
`139`	`143`	`");`
`@@ -158,6 +162,7 @@ tas:\n\`
`158`	`162`	`fail:li3,1 \n\`
`159`	`163`	`blr \n\`
`160`	`164`	`success:\n\`
	`165`	`+isync\n\`
`161`	`166`	`li 3,0\n\`
`162`	`167`	`blr\n\`
`163`	`168`	`");`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`64`	`64`	`* Portions Copyright (c) 1994, Regents of the University of California`
`65`	`65`	`*`
`66`		`- * $Id: s_lock.h,v 1.100 2002/09/02 04:42:52 momjian Exp $`
	`66`	`+ * $Id: s_lock.h,v 1.101 2002/09/21 00:14:05 tgl Exp $`
`67`	`67`	`*`
`68`	`68`	`*-------------------------------------------------------------------------`
`69`	`69`	`*/`
`@@ -217,6 +217,21 @@ tas(volatile slock_t *lock)`
`217`	`217`	`#endif/* defined(__mc68000__) && defined(__linux__) */`
`218`	`218`
`219`	`219`
	`220`	`+#if defined(__ppc__)\|\| defined(__powerpc__)`
	`221`	`+/*`
	`222`	`+ * We currently use out-of-line assembler for TAS on PowerPC; see s_lock.c.`
	`223`	`+ * S_UNLOCK is almost standard but requires a "sync" instruction.`
	`224`	`+ */`
	`225`	`+#defineS_UNLOCK(lock)\`
	`226`	`+do \`
	`227`	`+{\`
	`228`	`+__asm__ __volatile__ ("sync \n"); \`
	`229`	`+((volatile slock_t ) (lock)) = 0; \`
	`230`	`+} while (0)`
	`231`	`+`
	`232`	`+#endif/* defined(__ppc__) \|\| defined(__powerpc__) */`
	`233`	`+`
	`234`	`+`
`220`	`235`	`#if defined(NEED_VAX_TAS_ASM)`
`221`	`236`	`/*`
`222`	`237`	`* VAXen -- even multiprocessor ones`

Comments

(0)