rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixups for dsm.c's file descriptor handling. 

Per complaint from Tom Lane.
This commit is contained in:
Robert Haas 2013-12-09 11:12:33 -05:00
parent 33d3f5594a
commit d9250da032
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/storage/ipc/dsm.c
View File

@ -301,14 +301,14 @@ dsm_cleanup_for_mmap(void)
struct dirent *dent; struct dirent *dent;
/* Open the directory; can't use AllocateDir in postmaster. */ /* Open the directory; can't use AllocateDir in postmaster. */
if ((dir = opendir(PG_DYNSHMEM_DIR)) == NULL) if ((dir = AllocateDir(PG_DYNSHMEM_DIR)) == NULL)
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open directory \"%s\": %m", errmsg("could not open directory \"%s\": %m",
PG_DYNSHMEM_DIR))); PG_DYNSHMEM_DIR)));
/* Scan for something with a name of the correct format. */ /* Scan for something with a name of the correct format. */
while ((dent = readdir(dir)) != NULL) while ((dent = ReadDir(dir, PG_DYNSHMEM_DIR)) != NULL)
{ {
if (strncmp(dent->d_name, PG_DYNSHMEM_MMAP_FILE_PREFIX, if (strncmp(dent->d_name, PG_DYNSHMEM_MMAP_FILE_PREFIX,
strlen(PG_DYNSHMEM_MMAP_FILE_PREFIX)) == 0) strlen(PG_DYNSHMEM_MMAP_FILE_PREFIX)) == 0)
@ -335,7 +335,7 @@ dsm_cleanup_for_mmap(void)
} }
/* Cleanup complete. */ /* Cleanup complete. */
closedir(dir); FreeDir(dir);
} }
/* /*
@ -357,7 +357,7 @@ dsm_read_state_file(dsm_handle *h)
dsm_handle handle; dsm_handle handle;
/* Read the state file to get the ID of the old control segment. */ /* Read the state file to get the ID of the old control segment. */
statefd = open(PG_DYNSHMEM_STATE_FILE, O_RDONLY | PG_BINARY, 0); statefd = BasicOpenFile(PG_DYNSHMEM_STATE_FILE, O_RDONLY | PG_BINARY, 0);
if (statefd < 0) if (statefd < 0)
{ {
if (errno == ENOENT) if (errno == ENOENT)
@ -369,10 +369,13 @@ dsm_read_state_file(dsm_handle *h)
} }
nbytes = read(statefd, statebuf, PG_DYNSHMEM_STATE_BUFSIZ - 1); nbytes = read(statefd, statebuf, PG_DYNSHMEM_STATE_BUFSIZ - 1);
if (nbytes < 0) if (nbytes < 0)
{
close(statefd);
ereport(ERROR, ereport(ERROR,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not read file \"%s\": %m", errmsg("could not read file \"%s\": %m",
PG_DYNSHMEM_STATE_FILE))); PG_DYNSHMEM_STATE_FILE)));
}
/* make sure buffer is NUL terminated */ /* make sure buffer is NUL terminated */
statebuf[nbytes] = '\0'; statebuf[nbytes] = '\0';
close(statefd); close(statefd);