diff options
| author | Bruce Momjian <bruce@momjian.us> | 2004-01-26 22:59:54 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2004-01-26 22:59:54 +0000 |
| commit | eec08b95e74b6065efa5bc1ea5fd5844e7a95bbd (patch) | |
| tree | a06418f70d68b5eb9281fc0fef0147b6393e71e9 /src/include | |
| parent | ede3b762a35578ddb81a6e73f629736b248e0197 (diff) | |
| download | postgresql-eec08b95e74b6065efa5bc1ea5fd5844e7a95bbd.tar.gz postgresql-eec08b95e74b6065efa5bc1ea5fd5844e7a95bbd.zip | |
[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
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/miscadmin.h | 9 | ||||
| -rw-r--r-- | src/include/port/win32.h | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index b48345858ae..b44d160c27f 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; diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 6562aa93e84..69cccb2b7a3 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.15 2004/01/26 22:54:58 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.16 2004/01/26 22:59:54 momjian Exp $ */ /* undefine and redefine after #include */ #undef mkdir @@ -15,7 +15,7 @@ #define NOFILE 100 /* defines for dynamic linking on Win32 platform */ -#ifdef __CYGWIN__ +#if defined(__CYGWIN__) || defined(__MINGW32__) #if __GNUC__ && ! defined (__declspec) #error You need egcs 1.1 or newer for compiling! @@ -27,7 +27,7 @@ #define DLLIMPORT __declspec (dllimport) #endif -#elif defined(WIN32) && defined(_MSC_VER) /* not CYGWIN */ +#elif defined(WIN32) && defined(_MSC_VER) /* not CYGWIN or MingW */ #if defined(_DLL) #define DLLIMPORT __declspec (dllexport) @@ -35,7 +35,7 @@ #define DLLIMPORT __declspec (dllimport) #endif -#else /* not CYGWIN, not MSVC */ +#else /* not CYGWIN, not MSVC, not MingW */ #define DLLIMPORT #endif |