|
7 | 7 | * |
8 | 8 | * |
9 | 9 | * IDENTIFICATION |
10 | | - * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.39 1998/12/15 12:46:30 vadim Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.40 1999/01/17 20:59:56 tgl Exp $ |
11 | 11 | * |
12 | 12 | * NOTES |
13 | 13 | * Outside modules can create a lock table and acquire/release |
@@ -79,7 +79,8 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode, |
79 | 79 | #defineLOCK_PRINT(where,lock,type) \ |
80 | 80 | if (((LOCKDEBUG(LOCK_LOCKMETHOD(*(lock))) >= 1) \ |
81 | 81 | && (lock->tag.relId >= lockDebugOidMin)) \ |
82 | | -|| (lock->tag.relId == lockDebugRelation)) \ |
| 82 | +|| \ |
| 83 | +(lockDebugRelation && (lock->tag.relId == lockDebugRelation))) \ |
83 | 84 | LOCK_PRINT_AUX(where,lock,type) |
84 | 85 |
|
85 | 86 | #defineLOCK_PRINT_AUX(where,lock,type) \ |
@@ -113,8 +114,9 @@ static int WaitOnLock(LOCKMETHOD lockmethod, LOCK *lock, LOCKMODE lockmode, |
113 | 114 | if (((LOCKDEBUG(XIDENT_LOCKMETHOD(*(xidentP))) >= 1) \ |
114 | 115 | && (((LOCK *)MAKE_PTR(xidentP->tag.lock))->tag.relId \ |
115 | 116 | >= lockDebugOidMin)) \ |
116 | | -|| (((LOCK *)MAKE_PTR(xidentP->tag.lock))->tag.relId \ |
117 | | -== lockDebugRelation)) \ |
| 117 | +|| (lockDebugRelation && \ |
| 118 | +(((LOCK *)MAKE_PTR(xidentP->tag.lock))->tag.relId \ |
| 119 | + == lockDebugRelation))) \ |
118 | 120 | XID_PRINT_AUX(where,xidentP) |
119 | 121 |
|
120 | 122 | #defineXID_PRINT_AUX(where,xidentP) \ |
@@ -1206,7 +1208,8 @@ LockRelease(LOCKMETHOD lockmethod, LOCKTAG *locktag, LOCKMODE lockmode) |
1206 | 1208 | { |
1207 | 1209 | if (((LOCKDEBUG(LOCK_LOCKMETHOD(*(lock))) >=1) \ |
1208 | 1210 | && (lock->tag.relId >=lockDebugOidMin)) \ |
1209 | | -|| (lock->tag.relId==lockDebugRelation)) |
| 1211 | +|| \ |
| 1212 | +(lockDebugRelation&& (lock->tag.relId==lockDebugRelation))) |
1210 | 1213 | TPRINTF(TRACE_ALL,"LockRelease: no wakeup needed"); |
1211 | 1214 | } |
1212 | 1215 |
|
@@ -1290,7 +1293,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, SHM_QUEUE *lockQueue) |
1290 | 1293 | lock= (LOCK*)MAKE_PTR(xidLook->tag.lock); |
1291 | 1294 |
|
1292 | 1295 | xidtag_lockmethod=XIDENT_LOCKMETHOD(*xidLook); |
1293 | | -if ((xidtag_lockmethod==lockmethod)|| (trace_flag >=2)) |
| 1296 | +if ((xidtag_lockmethod==lockmethod)&&pg_options[trace_flag]) |
1294 | 1297 | { |
1295 | 1298 | XID_PRINT("LockReleaseAll",xidLook); |
1296 | 1299 | LOCK_PRINT("LockReleaseAll",lock,0); |
|