diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/ps_status.c | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 09a10eb1554..17177f55dda 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -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.40 2010/01/02 16:57:58 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/ps_status.c,v 1.41 2010/05/27 19:19:38 tgl Exp $ * * Copyright (c) 2000-2010, PostgreSQL Global Development Group * various details abducted from various places @@ -51,7 +51,7 @@ bool update_process_title = true; * (some other BSD systems) * PS_USE_CLOBBER_ARGV * write over the argv and environment area - * (most SysV-like systems) + * (Linux and most SysV-like systems) * PS_USE_WIN32 * push the string out as the name of a Windows event * PS_USE_NONE @@ -84,7 +84,7 @@ bool update_process_title = true; #ifndef PS_USE_CLOBBER_ARGV -/* all but one options need a buffer to write their ps line in */ +/* all but one option need a buffer to write their ps line in */ #define PS_BUFFER_SIZE 256 static char ps_buffer[PS_BUFFER_SIZE]; static const size_t ps_buffer_size = PS_BUFFER_SIZE; @@ -94,6 +94,8 @@ static size_t ps_buffer_size; /* space determined at run time */ static size_t last_status_len; /* use to minimize length of clobber */ #endif /* PS_USE_CLOBBER_ARGV */ +static size_t ps_buffer_cur_len; /* nominal strlen(ps_buffer) */ + static size_t ps_buffer_fixed_size; /* size of the constant prefix */ /* save the original argv[] location here */ @@ -226,6 +228,7 @@ init_ps_display(const char *username, const char *dbname, /* no ps display if you didn't call save_ps_display_args() */ if (!save_argv) return; + #ifdef PS_USE_CLOBBER_ARGV /* If ps_buffer is a pointer, it might still be null */ if (!ps_buffer) @@ -270,7 +273,7 @@ init_ps_display(const char *username, const char *dbname, username, dbname, host_info); #endif - ps_buffer_fixed_size = strlen(ps_buffer); + ps_buffer_cur_len = ps_buffer_fixed_size = strlen(ps_buffer); set_ps_display(initial_str, true); #endif /* not PS_USE_NONE */ @@ -285,11 +288,11 @@ init_ps_display(const char *username, const char *dbname, void set_ps_display(const char *activity, bool force) { - +#ifndef PS_USE_NONE + /* update_process_title=off disables updates, unless force = true */ if (!force && !update_process_title) return; -#ifndef PS_USE_NONE /* no ps display for stand-alone backend */ if (!IsUnderPostmaster) return; @@ -303,6 +306,7 @@ set_ps_display(const char *activity, bool force) /* Update ps_buffer to contain both fixed part and activity */ strlcpy(ps_buffer + ps_buffer_fixed_size, activity, ps_buffer_size - ps_buffer_fixed_size); + ps_buffer_cur_len = strlen(ps_buffer); /* Transmit new setting to kernel, if necessary */ @@ -315,7 +319,7 @@ set_ps_display(const char *activity, bool force) union pstun pst; pst.pst_command = ps_buffer; - pstat(PSTAT_SETCMD, pst, strlen(ps_buffer), 0, 0); + pstat(PSTAT_SETCMD, pst, ps_buffer_cur_len, 0, 0); } #endif /* PS_USE_PSTAT */ @@ -325,16 +329,11 @@ set_ps_display(const char *activity, bool force) #endif /* PS_USE_PS_STRINGS */ #ifdef PS_USE_CLOBBER_ARGV - { - int buflen; - - /* pad unused memory */ - buflen = strlen(ps_buffer); - /* clobber remainder of old status string */ - if (last_status_len > buflen) - MemSet(ps_buffer + buflen, PS_PADDING, last_status_len - buflen); - last_status_len = buflen; - } + /* pad unused memory; need only clobber remainder of old status string */ + if (last_status_len > ps_buffer_cur_len) + MemSet(ps_buffer + ps_buffer_cur_len, PS_PADDING, + last_status_len - ps_buffer_cur_len); + last_status_len = ps_buffer_cur_len; #endif /* PS_USE_CLOBBER_ARGV */ #ifdef PS_USE_WIN32 @@ -369,24 +368,15 @@ const char * 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 + *displen = (int) (ps_buffer_cur_len - ps_buffer_fixed_size); + return ps_buffer + ps_buffer_fixed_size; } |