database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-05 07:41:25 +03:00
Code Activity

Repair an error introduced by log_line_prefix patch: it is not acceptable

Browse Source 
to assume that the string pointer passed to set_ps_display is good forever.
There's no need to anyway since ps_status.c itself saves the string, and
we already had an API (get_ps_display) to return it.
I believe this explains Jim Nasby's report of intermittent crashes in
elog.c when %i format code is in use in log_line_prefix.
While at it, repair a previously unnoticed problem: on some platforms such as
Darwin, the string returned by get_ps_display was blank-padded to the maximum
length, meaning that lock.c's attempt to append " waiting" to it never worked.
This commit is contained in:
Tom Lane
2005-11-05 03:04:53 +00:00
parent 95af2633c3
commit 48052de722
6 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/backend/utils/misc/ps_status.c
View File

@@ -5,7 +5,7 @@
* to contain some useful information. Mechanism differs wildly across
* platforms.
*
* $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.25 2005/10/15 02:49:36 momjian Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.26 2005/11/05 03:04:52 tgl Exp $
*
* Copyright (c) 2000-2005, PostgreSQL Global Development Group
* various details abducted from various places
@@ -307,10 +307,6 @@ init_ps_display(const char *username, const char *dbname,
void
set_ps_display(const char *activity)
{
/* save tag for possible use by elog.c */
if (MyProcPort)
MyProcPort->commandTag = activity;
#ifndef PS_USE_NONE
/* no ps display for stand-alone backend */
if (!IsUnderPostmaster)
@@ -365,15 +361,31 @@ set_ps_display(const char *activity)
/*
* Returns what's currently in the ps display, in case someone needs
* it. Note that only the activity part is returned.
* it. Note that only the activity part is returned. On some platforms
* the string will not be null-terminated, so return the effective
* length into *displen.
*/
const char *
get_ps_display(void)
get_ps_display(int *displen)
{
#ifdef PS_USE_CLOBBER_ARGV
size_t offset;
/* If ps_buffer is a pointer, it might still be null */
if (!ps_buffer)
{
*displen = 0;
return "";
}
/* Remove any trailing spaces to offset the effect of PS_PADDING */
offset = ps_buffer_size;
while (offset > ps_buffer_fixed_size && ps_buffer[offset-1] == PS_PADDING)
offset--;
*displen = offset - ps_buffer_fixed_size;
#else
*displen = strlen(ps_buffer + ps_buffer_fixed_size);
#endif
return ps_buffer + ps_buffer_fixed_size;