opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small lock cleanup for prototype.

This commit is contained in:
Bruce Momjian 1997-09-22 15:49:14 +00:00
parent 5fb82eb4c7
commit 85f7555132
2 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/include/storage/ipc.h
View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: ipc.h,v 1.21 1997/09/18 14:20:54 momjian Exp $
* $Id: ipc.h,v 1.22 1997/09/22 15:49:11 momjian Exp $
*
* NOTES
* This file is very architecture-specific. This stuff should actually
@ -26,20 +26,6 @@
#include <config.h>
#if defined(HAS_TEST_AND_SET)
#if (defined(alpha) && !defined(linuxalpha)) || \
defined(hpux) || \
defined(irix5) || \
defined(nextstep)
extern int S_LOCK_FREE(slock_t *lock);
#else
#define S_LOCK_FREE(lock) ((*lock) == 0)
#endif
#endif /* HAS_TEST_AND_SET */
#ifndef HAVE_UNION_SEMUN
union semun
{

24
src/include/storage/s_lock.h
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.2 1997/09/22 04:21:51 vadim Exp $
* $Header: /cvsroot/pgsql/src/include/storage/s_lock.h,v 1.3 1997/09/22 15:49:14 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -301,11 +301,11 @@ tas_dummy()
#define S_LOCK(lock) do \
{ \
slock_t res; \
slock_t _res; \
do \
{ \
__asm__("xchgb %0,%1": "=q"(res), "=m"(*lock):"0"(0x1)); \
} while (res != 0); \
__asm__("xchgb %0,%1": "=q"(_res), "=m"(*lock):"0"(0x1)); \
} while (_res != 0); \
} while (0)
#define S_UNLOCK(lock) (*(lock) = 0)
@ -319,7 +319,7 @@ tas_dummy()
#define S_LOCK(lock) do \
{ \
slock_t res; \
slock_t _res; \
do \
{ \
__asm__(" ldq $0, %0 \n\
@ -334,8 +334,8 @@ tas_dummy()
jmp $31, end \n\
stqc_fail: or $31, 1, $0 \n\
already_set: bis $0, $0, %1 \n\
end: nop ": "=m"(*lock), "=r"(res): :"0"); \
} while (res != 0); \
end: nop ": "=m"(*lock), "=r"(_res): :"0"); \
} while (_res != 0); \
} while (0)
@ -349,13 +349,13 @@ tas_dummy()
#define S_LOCK(lock) do \
{ \
slock_t res; \
slock_t _res; \
do \
{ \
__asm__("ldstub [%1], %0" \
: "=&r"(res) \
: "=&r"(_res) \
: "r"(lock)); \
} while (!res != 0); \
} while (!_res != 0); \
} while (0)
#define S_UNLOCK(lock) (*(lock) = 0)
@ -399,6 +399,10 @@ success: \n\
#endif /* defined(linux) && defined(PPC) */
#else /* HAS_TEST_AND_SET */
#define S_LOCK_FREE(lock) ((*lock) == 0)
#endif /* HAS_TEST_AND_SET */
#endif /* S_LOCK_H */