mirror of
https://github.com/postgres/postgres.git
synced 2025-06-01 00:01:20 -04:00
a4c40f140d
It works on the principle of turning sockets into non-blocking, and then emulate blocking behaviour on top of that, while allowing signals to run. Signals are now implemented using an event instead of APCs, thus getting rid of the issue of APCs not being compatible with "old style" sockets functions. It also moves the win32 specific code away from pqsignal.h/c into port/win32, and also removes the "thread style workaround" of the APC issue previously in place. In order to make things work, a few things are also changed in pgstat.c: 1) There is now a separate pipe to the collector and the bufferer. This is required because the pipe will otherwise only be signalled in one of the processes when the postmaster goes down. The MS winsock code for select() must have some kind of workaround for this behaviour, but I have found no stable way of doing that. You really are not supposed to use the same socket from more than one process (unless you use WSADuplicateSocket(), in which case the docs specifically say that only one will be flagged). 2) The check for "postmaster death" is moved into a separate select() call after the main loop. The previous behaviour select():ed on the postmaster pipe, while later explicitly saying "we do NOT check for postmaster exit inside the loop". The issue was that the code relies on the same select() call seeing both the postmaster pipe *and* the pgstat pipe go away. This does not always happen, and it appears that useing WSAEventSelect() makes it even more common that it does not. Since it's only called when the process exits, I don't think using a separate select() call will have any significant impact on how the stats collector works. Magnus Hagander
49 lines
1.1 KiB
C
49 lines
1.1 KiB
C
/*-------------------------------------------------------------------------
|
|
*
|
|
* pqsignal.h
|
|
* prototypes for the reliable BSD-style signal(2) routine.
|
|
*
|
|
*
|
|
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
|
|
* Portions Copyright (c) 1994, Regents of the University of California
|
|
*
|
|
* $PostgreSQL: pgsql/src/include/libpq/pqsignal.h,v 1.26 2004/04/12 16:19:18 momjian Exp $
|
|
*
|
|
* NOTES
|
|
* This shouldn't be in libpq, but the monitor and some other
|
|
* things need it...
|
|
*
|
|
*-------------------------------------------------------------------------
|
|
*/
|
|
#ifndef PQSIGNAL_H
|
|
#define PQSIGNAL_H
|
|
|
|
#include <signal.h>
|
|
|
|
#ifdef HAVE_SIGPROCMASK
|
|
extern sigset_t UnBlockSig,
|
|
BlockSig,
|
|
AuthBlockSig;
|
|
|
|
#define PG_SETMASK(mask) sigprocmask(SIG_SETMASK, mask, NULL)
|
|
#else
|
|
extern int UnBlockSig,
|
|
BlockSig,
|
|
AuthBlockSig;
|
|
|
|
#ifndef WIN32
|
|
#define PG_SETMASK(mask) sigsetmask(*((int*)(mask)))
|
|
#else
|
|
#define PG_SETMASK(mask) pqsigsetmask(*((int*)(mask)))
|
|
int pqsigsetmask(int mask);
|
|
#endif
|
|
#endif
|
|
|
|
typedef void (*pqsigfunc) (int);
|
|
|
|
extern void pqinitmask(void);
|
|
|
|
extern pqsigfunc pqsignal(int signo, pqsigfunc func);
|
|
|
|
#endif /* PQSIGNAL_H */
|