* pgstat_report_activity() -
*
* Called from tcop/postgres.c to report what the backend is actually doing
- * (usually "<IDLE>" or the start of the query to be executed).
+ * (but note cmd_str can be NULL for certain cases).
*
* All updates of the status entry follow the protocol of bumping
* st_changecount before and after. We use a volatile pointer here to
if (!beentry)
return;
- /*
- * To minimize the time spent modifying the entry, fetch all the needed
- * data first.
- */
- current_timestamp = GetCurrentTimestamp();
-
- if (!pgstat_track_activities && beentry->st_state != STATE_DISABLED)
+ if (!pgstat_track_activities)
{
- /*
- * Track activities is disabled, but we have a non-disabled state set.
- * That means the status changed - so as our last update, tell the
- * collector that we disabled it and will no longer update.
- */
- beentry->st_changecount++;
- beentry->st_state = STATE_DISABLED;
- beentry->st_state_start_timestamp = current_timestamp;
- beentry->st_changecount++;
- Assert((beentry->st_changecount & 1) == 0);
+ if (beentry->st_state != STATE_DISABLED)
+ {
+ /*
+ * track_activities is disabled, but we last reported a
+ * non-disabled state. As our final update, change the state and
+ * clear fields we will not be updating anymore.
+ */
+ beentry->st_changecount++;
+ beentry->st_state = STATE_DISABLED;
+ beentry->st_state_start_timestamp = 0;
+ beentry->st_activity[0] = '\0';
+ beentry->st_activity_start_timestamp = 0;
+ /* st_xact_start_timestamp and st_waiting are also disabled */
+ beentry->st_xact_start_timestamp = 0;
+ beentry->st_waiting = false;
+ beentry->st_changecount++;
+ Assert((beentry->st_changecount & 1) == 0);
+ }
return;
}
/*
- * Fetch more data before we start modifying the entry
+ * To minimize the time spent modifying the entry, fetch all the needed
+ * data first.
*/
start_timestamp = GetCurrentStatementStartTimestamp();
if (cmd_str != NULL)
len = pg_mbcliplen(cmd_str, strlen(cmd_str),
pgstat_track_activity_query_size - 1);
}
+ current_timestamp = GetCurrentTimestamp();
/*
* Now update the status entry