diff options
| author | Robert Haas <rhaas@postgresql.org> | 2014-10-30 11:35:55 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2014-10-30 11:35:55 -0400 |
| commit | 6057c212f3e783c45e050a78d070edf3e5f069f0 (patch) | |
| tree | 9b5c099b31ca9416a6c83b8accbed134c10fb5b5 /src/backend | |
| parent | 7912f9b7dc9e2d3f6cd81892ef6aa797578e9f06 (diff) | |
| download | postgresql-6057c212f3e783c45e050a78d070edf3e5f069f0.tar.gz postgresql-6057c212f3e783c45e050a78d070edf3e5f069f0.zip | |
"Pin", rather than "keep", dynamic shared memory mappings and segments.
Nobody seemed concerned about this naming when it originally went in,
but there's a pending patch that implements the opposite of
dsm_keep_mapping, and the term "unkeep" was judged unpalatable.
"unpin" has existing precedent in the PostgreSQL code base, and the
English language, so use this terminology instead.
Per discussion, back-patch to 9.4.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/storage/ipc/dsm.c | 10 | ||||
| -rw-r--r-- | src/backend/storage/ipc/dsm_impl.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index a5c008463a9..7ce45caaf9b 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -8,7 +8,7 @@ * facilities provided by dsm_impl.h and dsm_impl.c, mappings and segments * created using this module will be cleaned up automatically. Mappings * will be removed when the resource owner under which they were created - * is cleaned up, unless dsm_keep_mapping() is used, in which case they + * is cleaned up, unless dsm_pin_mapping() is used, in which case they * have session lifespan. Segments will be removed when there are no * remaining mappings, or at postmaster shutdown in any case. After a * hard postmaster crash, remaining segments will be removed, if they @@ -786,7 +786,7 @@ dsm_detach(dsm_segment *seg) * only. */ void -dsm_keep_mapping(dsm_segment *seg) +dsm_pin_mapping(dsm_segment *seg) { if (seg->resowner != NULL) { @@ -804,11 +804,11 @@ dsm_keep_mapping(dsm_segment *seg) * * Note that this function does not arrange for the current process to * keep the segment mapped indefinitely; if that behavior is desired, - * dsm_keep_mapping() should be used from each process that needs to + * dsm_pin_mapping() should be used from each process that needs to * retain the mapping. */ void -dsm_keep_segment(dsm_segment *seg) +dsm_pin_segment(dsm_segment *seg) { /* * Bump reference count for this segment in shared memory. This will @@ -819,7 +819,7 @@ dsm_keep_segment(dsm_segment *seg) dsm_control->item[seg->control_slot].refcnt++; LWLockRelease(DynamicSharedMemoryControlLock); - dsm_impl_keep_segment(seg->handle, seg->impl_private); + dsm_impl_pin_segment(seg->handle, seg->impl_private); } /* diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c index af637dc999d..befe207f460 100644 --- a/src/backend/storage/ipc/dsm_impl.c +++ b/src/backend/storage/ipc/dsm_impl.c @@ -996,7 +996,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size, * do anything to receive the handle; Windows transfers it automatically. */ void -dsm_impl_keep_segment(dsm_handle handle, void *impl_private) +dsm_impl_pin_segment(dsm_handle handle, void *impl_private) { switch (dynamic_shared_memory_type) { |