postgres.git / summary / log / commit / refs
commit 0180bd6180511875db046bf8ddcaa633a2952dfd
Author: Bruce Momjian <bruce@momjian.us>
Date: Thu Oct 13 23:59:13 2011 +0000
First released in: master (reverted before release)
Reverted by: 71b2b657c034 (in 9.2.0)
Remove all "traces" of trace_userlocks, because userlocks were removed
in PG 8.2.
doc/src/sgml/config.sgml | 22 ----------------------
src/backend/storage/lmgr/lock.c | 8 +-------
src/backend/utils/misc/check_guc | 2 +-
src/backend/utils/misc/guc.c | 10 ----------
src/include/storage/lock.h | 1 -
5 files changed, 2 insertions(+), 41 deletions(-)
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index d3a8b2648d8..fa2dcf336c4 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -6192,28 +6192,6 @@ LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
</listitem>
</varlistentry>
- <varlistentry>
- <term><varname>trace_userlocks</varname> (<type>boolean</type>)</term>
- <indexterm>
- <primary><varname>trace_userlocks</> configuration parameter</primary>
- </indexterm>
- <listitem>
- <para>
- If on, emit information about user lock usage. Output is the same
- as for <symbol>trace_locks</symbol>, only for user locks.
- </para>
- <para>
- User locks were removed as of PostgreSQL version 8.2. This option
- currently has no effect.
- </para>
- <para>
- This parameter is only available if the <symbol>LOCK_DEBUG</symbol>
- macro was defined when <productname>PostgreSQL</productname> was
- compiled.
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><varname>trace_lock_oidmin</varname> (<type>integer</type>)</term>
<indexterm>
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 905502f145b..ed8344ff8f2 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -213,12 +213,7 @@ static const LockMethodData user_lockmethod = {
AccessExclusiveLock, /* highest valid lock mode number */
true,
LockConflicts,
- lock_mode_names,
-#ifdef LOCK_DEBUG
- &Trace_userlocks
-#else
- &Dummy_trace
-#endif
+ lock_mode_names
};
/*
@@ -276,7 +271,6 @@ static ResourceOwner awaitedOwner;
int Trace_lock_oidmin = FirstNormalObjectId;
bool Trace_locks = false;
-bool Trace_userlocks = false;
int Trace_lock_table = 0;
bool Debug_deadlocks = false;
diff --git a/src/backend/utils/misc/check_guc b/src/backend/utils/misc/check_guc
index 293fb0363f8..91c1c581acd 100755
--- a/src/backend/utils/misc/check_guc
+++ b/src/backend/utils/misc/check_guc
@@ -20,7 +20,7 @@ INTENTIONALLY_NOT_INCLUDED="autocommit debug_deadlocks \
is_superuser lc_collate lc_ctype lc_messages lc_monetary lc_numeric lc_time \
pre_auth_delay role seed server_encoding server_version server_version_int \
session_authorization trace_lock_oidmin trace_lock_table trace_locks trace_lwlocks \
-trace_notify trace_userlocks transaction_isolation transaction_read_only \
+trace_notify transaction_isolation transaction_read_only \
zero_damaged_pages"
### What options are listed in postgresql.conf.sample, but don't appear
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 106096faee7..f1d35a9a112 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1058,16 +1058,6 @@ static struct config_bool ConfigureNamesBool[] =
false,
NULL, NULL, NULL
},
- {
- {"trace_userlocks", PGC_SUSET, DEVELOPER_OPTIONS,
- gettext_noop("No description available."),
- NULL,
- GUC_NOT_IN_SAMPLE
- },
- &Trace_userlocks,
- false,
- NULL, NULL, NULL
- },
{
{"trace_lwlocks", PGC_SUSET, DEVELOPER_OPTIONS,
gettext_noop("No description available."),
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index e106ad54019..bc746a39e4f 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -34,7 +34,6 @@ extern int max_locks_per_xact;
#ifdef LOCK_DEBUG
extern int Trace_lock_oidmin;
extern bool Trace_locks;
-extern bool Trace_userlocks;
extern int Trace_lock_table;
extern bool Debug_deadlocks;
#endif /* LOCK_DEBUG */
[parent: 23610daf8af0]