mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvement: avoid assuming that GetLastError value cannot be

Browse Source 
affected by CloseHandle() or Sleep().
This commit is contained in:
Tom Lane 2009-05-05 21:51:46 +00:00
parent 1bbbcb04f0
commit 2fe0f2962c
1 changed files with 7 additions and 6 deletions

13
src/backend/port/win32_shmem.c

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.9 2009/05/05 09:48:51 mha Exp $ * $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.10 2009/05/05 21:51:46 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -158,12 +158,13 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port)
/* /*
* If the segment already existed, CreateFileMapping() will return a * If the segment already existed, CreateFileMapping() will return a
* handle to the existing one. * handle to the existing one and set ERROR_ALREADY_EXISTS.
*/ */
if (GetLastError() == ERROR_ALREADY_EXISTS) if (GetLastError() == ERROR_ALREADY_EXISTS)
{ {
CloseHandle(hmap); /* Close the old handle, since we got a valid CloseHandle(hmap); /* Close the handle, since we got a valid
* one to the previous segment. */ * one to the previous segment. */
hmap = NULL;
Sleep(1000); Sleep(1000);
continue; continue;
} }
@ -171,10 +172,10 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port)
} }
/* /*
* If the last call in the loop still returned ERROR_ALREADY_EXISTS, this shared memory * If the last call in the loop still returned ERROR_ALREADY_EXISTS, this
* segment exists and we assume it belongs to somebody else. * shared memory segment exists and we assume it belongs to somebody else.
*/ */
if (GetLastError() == ERROR_ALREADY_EXISTS) if (!hmap)
ereport(FATAL, ereport(FATAL,
(errmsg("pre-existing shared memory block is still in use"), (errmsg("pre-existing shared memory block is still in use"),
errhint("Check if there are any old server processes still running, and terminate them."))); errhint("Check if there are any old server processes still running, and terminate them.")));