From eec08b95e74b6065efa5bc1ea5fd5844e7a95bbd Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 26 Jan 2004 22:59:54 +0000 Subject: [all] Removed call to getppid in SendPostmasterSignal, replacing with a PostmasterPid variable, which gets set (early) in PostmasterMain getppid would not be the postmaster? [fork/exec] Implements processCancelRequest by keeping an array of pid/cancel_key structs in shared mem [fork/exec] Moves AttachSharedMemoryAndSemaphores call for backends into SubPostmasterMain [win32] Implements reaper/waitpid by keeping an arrays of children pids,handles in postmaster local mem - this item is largely untested, for reasons which should be obvious, but appears sound [win32/all] Added extern for pgpipe in Win32 case, and changed the second pipe call (which seems to have been missed earlier) to pgpipe [win32] #define'd ftruncate to chsize in the Win32 case [win32] PG_USLEEP for Win32 has a misplaced paren. Fixed. [win32] DLLIMPORT handling for MingW case Claudio Natoli --- src/include/miscadmin.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/include/miscadmin.h') diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index b48345858a..b44d160c27 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.147 2004/01/26 22:54:57 momjian Exp $ + * $PostgreSQL: pgsql/src/include/miscadmin.h,v 1.148 2004/01/26 22:59:53 momjian Exp $ * * NOTES * some of the information in this file should be moved to @@ -109,10 +109,14 @@ do { \ #else #define PG_USLEEP(_usec) \ do { \ - Sleep(_usec < 500) ? 1 : (_usec+500)/ 1000); \ + Sleep((_usec) < 500 ? 1 : ((_usec)+500)/ 1000); \ } while(0) #endif +#ifdef WIN32 +#define ftruncate(a,b) chsize(a,b) +#endif + /***************************************************************************** * globals.h -- * *****************************************************************************/ @@ -132,6 +136,7 @@ extern void ClosePostmasterPorts(bool pgstat_too); /* * from utils/init/globals.c */ +extern pid_t PostmasterPid; extern bool IsPostmasterEnvironment; extern bool IsUnderPostmaster; -- cgit v1.2.1