Mop-up for HAS_TEST_AND_SET refactoring. Un-break two or three platforms

tglsfdc · tglsfdc · commit 9adaf64da343 · 2003-12-23T18:13:17.000Z
that were broken, try to make layout of s_lock.h entries consistent,
use HAVE_SPINLOCKS in preference to HAS_TEST_AND_SET everywhere outside
s_lock.h itself.
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.189 2003/12/13 23:59:06 neilc Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.190 2003/12/23 18:13:17 tgl Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1762,8 +1762,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
        Peter Eisentraut (<email>peter_e@gmx.net</email>)</entry>
       <entry>
        needs new <filename>config.guess</filename>,
-       <option>--disable-spinlocks</option>, <literal>#undef
-       HAS_TEST_AND_SET</>, disable <function>tas_dummy()</>
+       <option>--disable-spinlocks</option>
       </entry>
      </row>
      <row>
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
@@ -9,14 +9,15 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.20 2003/12/23 03:31:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.21 2003/12/23 18:13:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
 #include "postgres.h"
 
 #include <sys/time.h>
 #include <unistd.h>
+
 #include "storage/s_lock.h"
 
 
@@ -118,8 +119,8 @@ s_lock(volatile slock_t *lock, const char *file, int line)
  * definition exists (yet).
  * In the future, get rid of tas.[cso] and fold it into this file.
  *
- * If you change something here, you have to modify s_lock.h because
- * the definitions for these is split between this file and s_lock.h.
+ * If you change something here, you will likely need to modify s_lock.h too,
+ * because the definitions for these are split between this file and s_lock.h.
  */
 
 
diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c
@@ -16,7 +16,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/spin.c,v 1.13 2003/12/23 03:31:30 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/lmgr/spin.c,v 1.14 2003/12/23 18:13:17 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -25,10 +25,9 @@
 #include "storage/lwlock.h"
 #include "storage/pg_sema.h"
 #include "storage/spin.h"
-#include "storage/s_lock.h"
 
 
-#ifdef HAS_TEST_AND_SET
+#ifdef HAVE_SPINLOCKS
 
 /*
  * Report number of semaphores needed to support spinlocks.
@@ -39,7 +38,7 @@ SpinlockSemas(void)
 	return 0;
 }
 
-#else							/* !HAS_TEST_AND_SET */
+#else							/* !HAVE_SPINLOCKS */
 
 /*
  * No TAS, so spinlocks are implemented as PGSemaphores.
@@ -93,4 +92,4 @@ tas_sema(volatile slock_t *lock)
 	return !PGSemaphoreTryLock((PGSemaphore) lock);
 }
 
-#endif   /* !HAS_TEST_AND_SET */
+#endif   /* !HAVE_SPINLOCKS */
diff --git a/src/include/port/univel.h b/src/include/port/univel.h
@@ -1,5 +1,3 @@
-#define HAS_TEST_AND_SET
-
 /***************************************
  * Define this if you are compiling with
  * the native UNIXWARE C compiler.
@@ -17,5 +15,4 @@
 #endif
 #ifndef			BYTE_ORDER
 #define			BYTE_ORDER		LITTLE_ENDIAN
-
 #endif
diff --git a/src/include/port/unixware.h b/src/include/port/unixware.h
@@ -1,5 +1,3 @@
-#define HAS_TEST_AND_SET
-
 /* see src/backend/libpq/pqcomm.c */
 #define SCO_ACCEPT_BUG
 
@@ -20,5 +18,4 @@
 #endif
 #ifndef			BYTE_ORDER
 #define			BYTE_ORDER		LITTLE_ENDIAN
-
 #endif
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,15 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.20 2003/12/23 03:31:30 momjian Exp $`
	`12`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/s_lock.c,v 1.21 2003/12/23 18:13:17 tgl Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`16`	`16`	`#include "postgres.h"`
`17`	`17`
`18`	`18`	`#include <sys/time.h>`
`19`	`19`	`#include <unistd.h>`
	`20`	`+`
`20`	`21`	`#include "storage/s_lock.h"`
`21`	`22`
`22`	`23`
`@@ -118,8 +119,8 @@ s_lock(volatile slock_t lock, const char file, int line)`
`118`	`119`	`* definition exists (yet).`
`119`	`120`	`* In the future, get rid of tas.[cso] and fold it into this file.`
`120`	`121`	`*`
`121`		`- * If you change something here, you have to modify s_lock.h because`
`122`		`- * the definitions for these is split between this file and s_lock.h.`
	`122`	`+ * If you change something here, you will likely need to modify s_lock.h too,`
	`123`	`+ * because the definitions for these are split between this file and s_lock.h.`
`123`	`124`	`*/`
`124`	`125`
`125`	`126`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`*`
`18`	`18`	`* IDENTIFICATION`
`19`		`- * $PostgreSQL: pgsql/src/backend/storage/lmgr/spin.c,v 1.13 2003/12/23 03:31:30 momjian Exp $`
	`19`	`+ * $PostgreSQL: pgsql/src/backend/storage/lmgr/spin.c,v 1.14 2003/12/23 18:13:17 tgl Exp $`
`20`	`20`	`*`
`21`	`21`	`*-------------------------------------------------------------------------`
`22`	`22`	`*/`
`@@ -25,10 +25,9 @@`
`25`	`25`	`#include "storage/lwlock.h"`
`26`	`26`	`#include "storage/pg_sema.h"`
`27`	`27`	`#include "storage/spin.h"`
`28`		`-#include "storage/s_lock.h"`
`29`	`28`
`30`	`29`
`31`		`-#ifdef HAS_TEST_AND_SET`
	`30`	`+#ifdef HAVE_SPINLOCKS`
`32`	`31`
`33`	`32`	`/*`
`34`	`33`	`* Report number of semaphores needed to support spinlocks.`
`@@ -39,7 +38,7 @@ SpinlockSemas(void)`
`39`	`38`	`return 0;`
`40`	`39`	`}`
`41`	`40`
`42`		`-#else /* !HAS_TEST_AND_SET */`
	`41`	`+#else /* !HAVE_SPINLOCKS */`
`43`	`42`
`44`	`43`	`/*`
`45`	`44`	`* No TAS, so spinlocks are implemented as PGSemaphores.`
`@@ -93,4 +92,4 @@ tas_sema(volatile slock_t *lock)`
`93`	`92`	`return !PGSemaphoreTryLock((PGSemaphore) lock);`
`94`	`93`	`}`
`95`	`94`
`96`		`-#endif /* !HAS_TEST_AND_SET */`
	`95`	`+#endif /* !HAVE_SPINLOCKS */`