Commit 3eba7651 authored by Bruce Momjian's avatar Bruce Momjian

Remove hardcoded 20000 and change to BootstrapObjectIdData.

parent 31c8e94b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.7 1997/02/12 05:23:49 scrappy Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.8 1997/02/14 04:52:59 momjian Exp $
* *
* NOTES * NOTES
* Outside modules can create a lock table and acquire/release * Outside modules can create a lock table and acquire/release
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "utils/memutils.h" #include "utils/memutils.h"
#include "utils/palloc.h" #include "utils/palloc.h"
#include "access/xact.h" #include "access/xact.h"
#include "access/transam.h"
/*#define LOCK_MGR_DEBUG*/ /*#define LOCK_MGR_DEBUG*/
...@@ -59,18 +60,8 @@ ...@@ -59,18 +60,8 @@
int lockDebug = 0; int lockDebug = 0;
#ifndef LOCK_DEBUG_OID_MIN
/*
* This is totally arbitrary. It is the minimum relation oid
* which will trigger the locking debug when the -K option
* is given to the backend. This is done to avoid tracing
* locks on system relations.
*/
#define LOCK_DEBUG_OID_MIN 20000
#endif
#define LOCK_PRINT(where,tag,type)\ #define LOCK_PRINT(where,tag,type)\
if ((lockDebug >= 1) && (tag->relId >= LOCK_DEBUG_OID_MIN)) \ if ((lockDebug >= 1) && (tag->relId >= BootstrapObjectIdData)) \
elog(DEBUG, \ elog(DEBUG, \
"%s: pid (%d) rel (%d) dbid (%d) tid (%d,%d) type (%d)",where, \ "%s: pid (%d) rel (%d) dbid (%d) tid (%d,%d) type (%d)",where, \
getpid(),\ getpid(),\
...@@ -81,7 +72,7 @@ int lockDebug = 0; ...@@ -81,7 +72,7 @@ int lockDebug = 0;
type); type);
#define LOCK_DUMP(where,lock,type)\ #define LOCK_DUMP(where,lock,type)\
if ((lockDebug >= 1) && (lock->tag.relId >= LOCK_DEBUG_OID_MIN)) \ if ((lockDebug >= 1) && (lock->tag.relId >= BootstrapObjectIdData)) \
elog(DEBUG, \ elog(DEBUG, \
"%s: pid (%d) rel (%d) dbid (%d) tid (%d,%d) nHolding (%d) "\ "%s: pid (%d) rel (%d) dbid (%d) tid (%d,%d) nHolding (%d) "\
"holders (%d,%d,%d,%d,%d) type (%d)",where, \ "holders (%d,%d,%d,%d,%d) type (%d)",where, \
...@@ -101,7 +92,7 @@ int lockDebug = 0; ...@@ -101,7 +92,7 @@ int lockDebug = 0;
#define XID_PRINT(where,xidentP)\ #define XID_PRINT(where,xidentP)\
if ((lockDebug >= 2) && \ if ((lockDebug >= 2) && \
(((LOCK *)MAKE_PTR(xidentP->tag.lock))->tag.relId \ (((LOCK *)MAKE_PTR(xidentP->tag.lock))->tag.relId \
>= LOCK_DEBUG_OID_MIN)) \ >= BootstrapObjectIdData)) \
elog(DEBUG,\ elog(DEBUG,\
"%s: pid (%d) xid (%d) pid (%d) lock (%x) nHolding (%d) "\ "%s: pid (%d) xid (%d) pid (%d) lock (%x) nHolding (%d) "\
"holders (%d,%d,%d,%d,%d)",\ "holders (%d,%d,%d,%d,%d)",\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment