Skip to content

Remove queryids_lock #12

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

Open
mikecaat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove queryids_lock #12

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
13 changes: 2 additions & 11 deletions agent/lib/last_xact_activity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ typedef struct ruGlobalStats
typedef struct ruSharedState
{
LWLock *lock; /* protects hashtable search/modification */
LWLock *queryids_lock; /* protects queryids array */
slock_t mutex; /* protects ruGlobalStats fields: */
ruGlobalStats stats; /* global statistics for rusage */
uint64 queryids[FLEXIBLE_ARRAY_MEMBER]; /* queryid info for parallel leaders */
Expand Down Expand Up @@ -396,7 +395,7 @@ request_last_xact_activity(void)
RequestAddinShmemSpace(buffer_size(MaxBackends));

RequestAddinShmemSpace(ru_memsize());
RequestNamedLWLockTranche("pg_statsinfo_rusage", 2);
RequestNamedLWLockTranche("pg_statsinfo_rusage", 1);

return;
}
Expand Down Expand Up @@ -436,9 +435,7 @@ shmem_startup(void)
if (!found)
{
/* First time */
LWLockPadded *locks = GetNamedLWLockTranche("pg_statsinfo_rusage");
ru_ss->lock = &(locks[0]).lock;
ru_ss->queryids_lock = &(locks[1]).lock;
ru_ss->lock = &(GetNamedLWLockTranche("pg_statsinfo_rusage"))->lock;
ru_ss->stats.dealloc = 0;
ru_ss->stats.stats_reset = GetCurrentTimestamp();
}
Expand Down Expand Up @@ -752,9 +749,7 @@ ru_set_queryid(uint64 queryid)
{
Assert(!IsParallelWorker());

LWLockAcquire(ru_ss->queryids_lock, LW_EXCLUSIVE);
ru_ss->queryids[MyProcNumber] = queryid;
LWLockRelease(ru_ss->queryids_lock);
}


Expand Down Expand Up @@ -1132,11 +1127,7 @@ myExecutorEnd(QueryDesc * queryDesc)
getrusage(RUSAGE_SELF, &rusage_end);

if (IsParallelWorker())
{
LWLockAcquire(ru_ss->queryids_lock, LW_SHARED);
queryId = ru_ss->queryids[ParallelLeaderProcNumber];
LWLockRelease(ru_ss->queryids_lock);
}
else
queryId = queryDesc->plannedstmt->queryId;

Expand Down