WIP

Author: lfittl

contrib/auto_explain/auto_explain.c

@@ -305,19 +305,9 @@ explain_ExecutorStart(QueryDesc *queryDesc, int eflags)
 
 	if (auto_explain_enabled())
 	{
-		/*
-		 * Set up to track total elapsed time in ExecutorRun.  Make sure the
-		 * space is allocated in the per-query context so it will go away at
-		 * ExecutorEnd.
-		 */
+		/* Set up to track total elapsed time in ExecutorRun. */
 		if (queryDesc->totaltime == NULL)
-		{
-			MemoryContext oldcxt;
-
-			oldcxt = MemoryContextSwitchTo(queryDesc->estate->es_query_cxt);
 			queryDesc->totaltime = InstrAlloc(INSTRUMENT_ALL);
-			MemoryContextSwitchTo(oldcxt);
-		}
 	}
 }
 

contrib/pg_session_buffer_usage/pg_session_buffer_usage.c

@@ -52,7 +52,7 @@ pg_session_buffer_usage(PG_FUNCTION_ARGS)
 	memset(nulls, 0, sizeof(nulls));
 
 #if HAVE_INSTR_STACK
-	usage = &TopInstrStack.bufusage;
+	usage = &TopInstrumentation.bufusage;
 #else
 	usage = &pgBufferUsage;
 #endif
@@ -87,7 +87,7 @@ Datum
 pg_session_buffer_usage_reset(PG_FUNCTION_ARGS)
 {
 #if HAVE_INSTR_STACK
-	memset(&TopInstrStack.bufusage, 0, sizeof(BufferUsage));
+	memset(&TopInstrumentation.bufusage, 0, sizeof(BufferUsage));
 #else
 	memset(&pgBufferUsage, 0, sizeof(BufferUsage));
 #endif

contrib/pg_stat_statements/pg_stat_statements.c

@@ -911,12 +911,12 @@ pgss_planner(Query *parse,
 	{
 		instr_time	start;
 		instr_time	duration;
-		InstrStack	stack = {0};
+		Instrumentation instr = {0};
 
 		INSTR_TIME_SET_CURRENT(start);
 
 		/* We need to track buffer/WAL usage as the planner can access them. */
-		InstrPushStack(&stack);
+		InstrPushStack(&instr);
 
 		nesting_level++;
 		PG_TRY();
@@ -930,7 +930,7 @@ pgss_planner(Query *parse,
 		}
 		PG_FINALLY();
 		{
-			InstrPopAndFinalizeStack(&stack);
+			InstrPopAndFinalizeStack(&instr);
 			nesting_level--;
 		}
 		PG_END_TRY();
@@ -945,8 +945,8 @@ pgss_planner(Query *parse,
 				   PGSS_PLAN,
 				   INSTR_TIME_GET_MILLISEC(duration),
 				   0,
-				   &stack.bufusage,
-				   &stack.walusage,
+				   &instr.bufusage,
+				   &instr.walusage,
 				   NULL,
 				   NULL,
 				   0,
@@ -998,19 +998,9 @@ pgss_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	 */
 	if (pgss_enabled(nesting_level) && queryDesc->plannedstmt->queryId != INT64CONST(0))
 	{
-		/*
-		 * Set up to track total elapsed time in ExecutorRun.  Make sure the
-		 * space is allocated in the per-query context so it will go away at
-		 * ExecutorEnd.
-		 */
+		/* Set up to track total elapsed time in ExecutorRun. */
 		if (queryDesc->totaltime == NULL)
-		{
-			MemoryContext oldcxt;
-
-			oldcxt = MemoryContextSwitchTo(queryDesc->estate->es_query_cxt);
 			queryDesc->totaltime = InstrAlloc(INSTRUMENT_ALL);
-			MemoryContextSwitchTo(oldcxt);
-		}
 	}
 }
 
@@ -1071,8 +1061,8 @@ pgss_ExecutorEnd(QueryDesc *queryDesc)
 		 * Check if stack is initialized - it is not when ExecutorRun wasn't
 		 * called
 		 */
-		const BufferUsage *bufusage = queryDesc->totaltime->stack ? &queryDesc->totaltime->stack->bufusage : NULL;
-		const WalUsage *walusage = queryDesc->totaltime->stack ? &queryDesc->totaltime->stack->walusage : NULL;
+		const BufferUsage *bufusage = (queryDesc->totaltime->need_bufusage) ? &queryDesc->totaltime->bufusage : NULL;
+		const WalUsage *walusage = (queryDesc->totaltime->need_walusage) ? &queryDesc->totaltime->walusage : NULL;
 
 		pgss_store(queryDesc->sourceText,
 				   queryId,
@@ -1149,10 +1139,10 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 		instr_time	start;
 		instr_time	duration;
 		uint64		rows;
-		InstrStack	stack = {0};
+		Instrumentation instr = {0};
 
 		INSTR_TIME_SET_CURRENT(start);
-		InstrPushStack(&stack);
+		InstrPushStack(&instr);
 
 		nesting_level++;
 		PG_TRY();
@@ -1168,7 +1158,7 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 		}
 		PG_FINALLY();
 		{
-			InstrPopAndFinalizeStack(&stack);
+			InstrPopAndFinalizeStack(&instr);
 			nesting_level--;
 		}
 		PG_END_TRY();
@@ -1204,8 +1194,8 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 				   PGSS_EXEC,
 				   INSTR_TIME_GET_MILLISEC(duration),
 				   rows,
-				   &stack.bufusage,
-				   &stack.walusage,
+				   &instr.bufusage,
+				   &instr.walusage,
 				   NULL,
 				   NULL,
 				   0,

src/backend/access/heap/vacuumlazy.c

@@ -984,7 +984,7 @@ heap_vacuum_rel(Relation rel, const VacuumParams params,
 	{
 		TimestampTz endtime = GetCurrentTimestamp();
 
-		InstrStop(instr, true);
+		instr = InstrStop(instr, true);
 
 		if (verbose || params.log_vacuum_min_duration == 0 ||
 			TimestampDifferenceExceeds(starttime, endtime,
@@ -1000,8 +1000,8 @@ heap_vacuum_rel(Relation rel, const VacuumParams params,
 			int64		total_blks_hit;
 			int64		total_blks_read;
 			int64		total_blks_dirtied;
-			BufferUsage bufferusage = instr->stack->bufusage;
-			WalUsage	walusage = instr->stack->walusage;
+			BufferUsage bufferusage = instr->bufusage;
+			WalUsage	walusage = instr->walusage;
 
 			TimestampDifference(starttime, endtime, &secs_dur, &usecs_dur);
 

src/backend/commands/analyze.c

@@ -742,7 +742,7 @@ do_analyze_rel(Relation onerel, const VacuumParams params,
 	{
 		TimestampTz endtime = GetCurrentTimestamp();
 
-		InstrStop(instr, true);
+		instr = InstrStop(instr, true);
 
 		if (verbose || params.log_analyze_min_duration == 0 ||
 			TimestampDifferenceExceeds(starttime, endtime,
@@ -756,8 +756,8 @@ do_analyze_rel(Relation onerel, const VacuumParams params,
 			int64		total_blks_hit;
 			int64		total_blks_read;
 			int64		total_blks_dirtied;
-			BufferUsage bufusage = instr->stack->bufusage;
-			WalUsage	walusage = instr->stack->walusage;
+			BufferUsage bufusage = instr->bufusage;
+			WalUsage	walusage = instr->walusage;
 
 			total_blks_hit = bufusage.shared_blks_hit +
 				bufusage.local_blks_hit;

src/backend/commands/explain.c

@@ -353,7 +353,7 @@ standard_ExplainOneQuery(Query *query, int cursorOptions,
 	/* plan the query */
 	plan = pg_plan_query(query, queryString, cursorOptions, params, es);
 
-	InstrStop(instr, true);
+	instr = InstrStop(instr, true);
 
 	if (es->memory)
 	{
@@ -363,7 +363,7 @@ standard_ExplainOneQuery(Query *query, int cursorOptions,
 
 	/* run it (if needed) and produce output */
 	ExplainOnePlan(plan, into, es, queryString, params, queryEnv,
-				   &instr->total, (es->buffers ? &instr->stack->bufusage : NULL),
+				   &instr->total, (es->buffers ? &instr->bufusage : NULL),
 				   es->memory ? &mem_counters : NULL);
 }
 
@@ -1827,7 +1827,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 	{
 		double		nloops = planstate->instrument->nloops;
 		double		startup_ms = INSTR_TIME_GET_MILLISEC(planstate->instrument->startup) / nloops;
-		double		total_ms = INSTR_TIME_GET_MILLISEC(planstate->instrument->total) / nloops;
+		double		total_ms = INSTR_TIME_GET_MILLISEC(planstate->instrument->instr.total) / nloops;
 		double		rows = planstate->instrument->ntuples / nloops;
 
 		if (es->format == EXPLAIN_FORMAT_TEXT)
@@ -1893,7 +1893,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
 			if (nloops <= 0)
 				continue;
 			startup_ms = INSTR_TIME_GET_MILLISEC(instrument->startup) / nloops;
-			total_ms = INSTR_TIME_GET_MILLISEC(instrument->total) / nloops;
+			total_ms = INSTR_TIME_GET_MILLISEC(instrument->instr.total) / nloops;
 			rows = instrument->ntuples / nloops;
 
 			ExplainOpenWorker(n, es);
@@ -2283,9 +2283,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
 
 	/* Show buffer/WAL usage */
 	if (es->buffers && planstate->instrument)
-		show_buffer_usage(es, &planstate->instrument->stack.bufusage, NULL);
+		show_buffer_usage(es, &planstate->instrument->instr.bufusage, NULL);
 	if (es->wal && planstate->instrument)
-		show_wal_usage(es, &planstate->instrument->stack.walusage);
+		show_wal_usage(es, &planstate->instrument->instr.walusage);
 
 	/* Prepare per-worker buffer/WAL usage */
 	if (es->workers_state && (es->buffers || es->wal) && es->verbose)
@@ -2302,9 +2302,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
 
 			ExplainOpenWorker(n, es);
 			if (es->buffers)
-				show_buffer_usage(es, &instrument->stack.bufusage, NULL);
+				show_buffer_usage(es, &instrument->instr.bufusage, NULL);
 			if (es->wal)
-				show_wal_usage(es, &instrument->stack.walusage);
+				show_wal_usage(es, &instrument->instr.walusage);
 			ExplainCloseWorker(n, es);
 		}
 	}

src/backend/commands/explain_dr.c

@@ -192,15 +192,15 @@ serializeAnalyzeReceive(TupleTableSlot *slot, DestReceiver *self)
 	MemoryContextReset(myState->tmpcontext);
 
 	if (myState->es->timing || myState->es->buffers)
-		InstrStop(instr, true);
+		instr = InstrStop(instr, true);
 
 	/* Update timing data */
 	if (myState->es->timing)
 		INSTR_TIME_ADD(myState->metrics.timeSpent, instr->total);
 
 	/* Update buffer metrics */
 	if (myState->es->buffers)
-		BufferUsageAdd(&myState->metrics.bufferUsage, &instr->stack->bufusage);
+		BufferUsageAdd(&myState->metrics.bufferUsage, &instr->bufusage);
 
 	return true;
 }

src/backend/commands/prepare.c

@@ -634,7 +634,7 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, IntoClause *into, ExplainState *es,
 	cplan = GetCachedPlan(entry->plansource, paramLI,
 						  CurrentResourceOwner, pstate->p_queryEnv);
 
-	InstrStop(instr, true);
+	instr = InstrStop(instr, true);
 
 	if (es->memory)
 	{
@@ -651,7 +651,7 @@ ExplainExecuteQuery(ExecuteStmt *execstmt, IntoClause *into, ExplainState *es,
 
 		if (pstmt->commandType != CMD_UTILITY)
 			ExplainOnePlan(pstmt, into, es, query_string, paramLI, pstate->p_queryEnv,
-						   &instr->total, (es->buffers ? &instr->stack->bufusage : NULL),
+						   &instr->total, (es->buffers ? &instr->bufusage : NULL),
 						   es->memory ? &mem_counters : NULL);
 		else
 			ExplainOneUtility(pstmt->utilityStmt, into, es, pstate, paramLI);

src/backend/executor/execMain.c

@@ -343,12 +343,13 @@ standard_ExecutorRun(QueryDesc *queryDesc,
 		InstrStart(queryDesc->totaltime);
 
 		/*
-		 * Remember all node stacks for abort recovery. We do this once here
-		 * after the first call to InstrStart has allocated the parent stack.
+		 * Remember all node entries for abort recovery. We do this once here
+		 * after the first call to InstrStart has pushed the parent entry.
 		 */
-		if (queryDesc->totaltime->stack && !queryDesc->already_executed)
+		if ((queryDesc->totaltime->need_bufusage || queryDesc->totaltime->need_walusage) &&
+			!queryDesc->already_executed)
 			ExecRememberNodeInstrumentation(queryDesc->planstate,
-											queryDesc->totaltime->stack);
+											queryDesc->totaltime);
 	}
 
 	/*
@@ -479,7 +480,7 @@ standard_ExecutorFinish(QueryDesc *queryDesc)
 	}
 
 	if (queryDesc->totaltime)
-		InstrStop(queryDesc->totaltime, true);
+		queryDesc->totaltime = InstrStop(queryDesc->totaltime, true);
 
 	MemoryContextSwitchTo(oldcontext);
 
@@ -1533,8 +1534,8 @@ ExecFinalizeTriggerInstrumentation(EState *estate)
 	{
 		TriggerInstrumentation *ti = rInfo->ri_TrigInstrument;
 
-		if (ti && ti->instr.stack)
-			InstrStackAdd(CurrentInstrStack, ti->instr.stack);
+		if (ti && (ti->instr.need_bufusage || ti->instr.need_walusage))
+			InstrAccum(instr_stack.current, &ti->instr);
 	}
 }