diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/init/postinit.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 2a57a7acd74..47926b146f5 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.92 2001/09/27 16:29:12 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.93 2001/09/29 04:02:25 tgl Exp $ * * *------------------------------------------------------------------------- @@ -401,11 +401,12 @@ ShutdownPostgres(void) * since that just raises the odds of failure --- but there's some * stuff we need to do. * - * Release any spinlocks or buffer context locks we might be holding. + * Release any LW locks and buffer context locks we might be holding. * This is a kluge to improve the odds that we won't get into a - * self-made stuck-spinlock scenario while trying to shut down. + * self-made stuck-lock scenario while trying to shut down. */ - ProcReleaseSpins(NULL); + LWLockReleaseAll(); + AbortBufferIO(); UnlockBuffers(); /* diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 17f142b1eaf..6efd41c2a8e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.52 2001/09/23 21:52:36 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.53 2001/09/29 04:02:25 tgl Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -240,7 +240,7 @@ static struct config_bool #ifdef LOCK_DEBUG {"trace_locks", PGC_SUSET, &Trace_locks, false, NULL}, {"trace_userlocks", PGC_SUSET, &Trace_userlocks, false, NULL}, - {"trace_spinlocks", PGC_SUSET, &Trace_spinlocks, false, NULL}, + {"trace_lwlocks", PGC_SUSET, &Trace_lwlocks, false, NULL}, {"debug_deadlocks", PGC_SUSET, &Debug_deadlocks, false, NULL}, #endif diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index fdb7c775aed..789f1a1d08d 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -164,7 +164,7 @@ #ifdef LOCK_DEBUG #trace_locks = false #trace_userlocks = false -#trace_spinlocks = false +#trace_lwlocks = false #debug_deadlocks = false #trace_lock_oidmin = 16384 #trace_lock_table = 0 |