diff options
| author | Robert Haas <rhaas@postgresql.org> | 2014-01-27 11:07:44 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2014-01-27 11:07:44 -0500 |
| commit | ea9df812d8502fff74e7bc37d61bdc7d66d77a7f (patch) | |
| tree | 7e138cbe713ccbf24c3be5603bcc84cae1f3079e /contrib | |
| parent | f62eba204f367acbfea7e63991524bf981b307f8 (diff) | |
| download | postgresql-ea9df812d8502fff74e7bc37d61bdc7d66d77a7f.tar.gz postgresql-ea9df812d8502fff74e7bc37d61bdc7d66d77a7f.zip | |
Relax the requirement that all lwlocks be stored in a single array.
This makes it possible to store lwlocks as part of some other data
structure in the main shared memory segment, or in a dynamic shared
memory segment. There is still a main LWLock array and this patch does
not move anything out of it, but it provides necessary infrastructure
for doing that in the future.
This change is likely to increase the size of LWLockPadded on some
platforms, especially 32-bit platforms where it was previously only
16 bytes.
Patch by me. Review by Andres Freund and KaiGai Kohei.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_buffercache/pg_buffercache_pages.c | 4 | ||||
| -rw-r--r-- | contrib/pg_stat_statements/pg_stat_statements.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/pg_buffercache/pg_buffercache_pages.c b/contrib/pg_buffercache/pg_buffercache_pages.c index dbf8030f7c6..1e2d192f119 100644 --- a/contrib/pg_buffercache/pg_buffercache_pages.c +++ b/contrib/pg_buffercache/pg_buffercache_pages.c @@ -116,7 +116,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS) * possible deadlocks. */ for (i = 0; i < NUM_BUFFER_PARTITIONS; i++) - LWLockAcquire(FirstBufMappingLock + i, LW_SHARED); + LWLockAcquire(BufMappingPartitionLockByIndex(i), LW_SHARED); /* * Scan though all the buffers, saving the relevant fields in the @@ -157,7 +157,7 @@ pg_buffercache_pages(PG_FUNCTION_ARGS) * avoids O(N^2) behavior inside LWLockRelease. */ for (i = NUM_BUFFER_PARTITIONS; --i >= 0;) - LWLockRelease(FirstBufMappingLock + i); + LWLockRelease(BufMappingPartitionLockByIndex(i)); } funcctx = SRF_PERCALL_SETUP(); diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index 2f069b768e1..858cce34576 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -150,7 +150,7 @@ typedef struct pgssEntry */ typedef struct pgssSharedState { - LWLockId lock; /* protects hashtable search/modification */ + LWLock *lock; /* protects hashtable search/modification */ int query_size; /* max query length in bytes */ double cur_median_usage; /* current median usage in hashtable */ } pgssSharedState; |