Skip to content

Fix possible spinlock leakage #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix possible spinlock leakage #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pg_show_plans.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ typedef struct pgspCtx { /* Used as `funcctx->user_fctx` in pg_show_plans(). */
pgspEntry *pgsp_tmp_entry; /* PGSP entry currently processing. */
int curr_nest; /* Current nest level porcessing. */
bool is_done; /* Done processing current PGSP entry? */
int n_plans;
} pgspCtx;

/* Function Prototypes */
Expand Down Expand Up @@ -611,6 +612,7 @@ pg_show_plans(PG_FUNCTION_ARGS)
pgsp_ctx = (pgspCtx *)palloc(sizeof(pgspCtx));
pgsp_ctx->is_done = true;
pgsp_ctx->curr_nest = 0;
pgsp_ctx->n_plans = 0;
pgsp_ctx->hash_seq = (HASH_SEQ_STATUS *)palloc(sizeof(HASH_SEQ_STATUS));
hash_seq_init(pgsp_ctx->hash_seq, pgsp_hash);
funcctx->user_fctx = (void *)pgsp_ctx;
Expand Down Expand Up @@ -663,6 +665,8 @@ pg_show_plans(PG_FUNCTION_ARGS)
call_cntr++;
}
SpinLockAcquire(&pgsp_tmp_entry->mutex);
pgsp_ctx->n_plans = pgsp_tmp_entry->n_plans;
SpinLockRelease(&pgsp_tmp_entry->mutex);
}

/* A single hash entry may store multiple (nested) plans, so
Expand All @@ -679,15 +683,15 @@ pg_show_plans(PG_FUNCTION_ARGS)
values[4] = CStringGetTextDatum(pgsp_tmp_entry->plan + offset);
htup = heap_form_tuple(funcctx->tuple_desc, values, nulls);

if (curr_nest < pgsp_tmp_entry->n_plans-1)
if (curr_nest < pgsp_ctx->n_plans - 1)
{ /* Still have nested plans. */
curr_nest++;
call_cntr--; /* May not be legal, but it works. */
is_done = false;
} else { /* No more nested plans, get a new entry. */
curr_nest = 0;
is_done = true;
SpinLockRelease(&pgsp_tmp_entry->mutex);
pgsp_ctx->n_plans = 0;
}
/* Save values back to the context. */
pgsp_ctx->is_done = is_done;
Expand Down
Loading