Skip to content

P
Postgres FD Implementation
Commit 70d58115 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Pgindent win32 signal code.

parent 50491963
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 173 deletions
src/backend/libpq/pqsignal.c
View file @ 70d58115
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/libpq/pqsignal.c,v 1.29 2004/01/27 00:45:26 momjian Exp $ * $PostgreSQL: pgsql/src/backend/libpq/pqsignal.c,v 1.30 2004/01/27 00:46:58 momjian Exp $
* *
* NOTES * NOTES
* This shouldn't be in libpq, but the monitor and some other * This shouldn't be in libpq, but the monitor and some other
...@@ -182,12 +182,16 @@ HANDLE pgwin32_main_thread_handle; ...@@ -182,12 +182,16 @@ HANDLE pgwin32_main_thread_handle;
static DWORD WINAPI pg_signal_thread(LPVOID param); static DWORD WINAPI pg_signal_thread(LPVOID param);
/* Initialization */ /* Initialization */
void pgwin32_signal_initialize(void) { void
pgwin32_signal_initialize(void)
{
int i; int i;
HANDLE signal_thread_handle; HANDLE signal_thread_handle;
InitializeCriticalSection(&pg_signal_crit_sec); InitializeCriticalSection(&pg_signal_crit_sec);
for (i = 0; i < PG_SIGNAL_COUNT; i++) { for (i = 0; i < PG_SIGNAL_COUNT; i++)
{
pg_signal_array[i] = SIG_DFL; pg_signal_array[i] = SIG_DFL;
pg_signal_defaults[i] = SIG_IGN; pg_signal_defaults[i] = SIG_IGN;
} }
...@@ -195,17 +199,19 @@ void pgwin32_signal_initialize(void) { ...@@ -195,17 +199,19 @@ void pgwin32_signal_initialize(void) {
pg_signal_queue = 0; pg_signal_queue = 0;
/* Get handle to main thread so we can post calls to it later */ /* Get handle to main thread so we can post calls to it later */
if (!DuplicateHandle(GetCurrentProcess(),GetCurrentThread(), if (!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(),
GetCurrentProcess(),&pgwin32_main_thread_handle, GetCurrentProcess(), &pgwin32_main_thread_handle,
0,FALSE,DUPLICATE_SAME_ACCESS)) { 0, FALSE, DUPLICATE_SAME_ACCESS))
fprintf(stderr,gettext("Failed to get main thread handle!\n")); {
fprintf(stderr, gettext("Failed to get main thread handle!\n"));
exit(1); exit(1);
} }
/* Create thread for handling signals */ /* Create thread for handling signals */
signal_thread_handle = CreateThread(NULL,0,pg_signal_thread,NULL,0,NULL); signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL);
if (signal_thread_handle == NULL) { if (signal_thread_handle == NULL)
fprintf(stderr,gettext("Failed to create signal handler thread!\n")); {
fprintf(stderr, gettext("Failed to create signal handler thread!\n"));
exit(1); exit(1);
} }
} }
...@@ -214,28 +220,36 @@ void pgwin32_signal_initialize(void) { ...@@ -214,28 +220,36 @@ void pgwin32_signal_initialize(void) {
/* Dispatch all signals currently queued and not blocked /* Dispatch all signals currently queued and not blocked
* Blocked signals are ignored, and will be fired at the time of * Blocked signals are ignored, and will be fired at the time of
* the sigsetmask() call. */ * the sigsetmask() call. */
static void dispatch_queued_signals(void) { static void
dispatch_queued_signals(void)
{
int i; int i;
EnterCriticalSection(&pg_signal_crit_sec); EnterCriticalSection(&pg_signal_crit_sec);
while (pg_signal_queue & ~pg_signal_mask) { while (pg_signal_queue & ~pg_signal_mask)
{
/* One or more unblocked signals queued for execution */ /* One or more unblocked signals queued for execution */
int exec_mask = pg_signal_queue & ~pg_signal_mask; int exec_mask = pg_signal_queue & ~pg_signal_mask;
for (i = 0; i < PG_SIGNAL_COUNT; i++) { for (i = 0; i < PG_SIGNAL_COUNT; i++)
if (exec_mask & sigmask(i)) { {
if (exec_mask & sigmask(i))
{
/* Execute this signal */ /* Execute this signal */
pqsigfunc sig = pg_signal_array[i]; pqsigfunc sig = pg_signal_array[i];
if (sig == SIG_DFL) if (sig == SIG_DFL)
sig = pg_signal_defaults[i]; sig = pg_signal_defaults[i];
pg_signal_queue &= ~sigmask(i); pg_signal_queue &= ~sigmask(i);
if (sig != SIG_ERR && sig != SIG_IGN && sig != SIG_DFL) { if (sig != SIG_ERR && sig != SIG_IGN && sig != SIG_DFL)
{
LeaveCriticalSection(&pg_signal_crit_sec); LeaveCriticalSection(&pg_signal_crit_sec);
sig(i); sig(i);
EnterCriticalSection(&pg_signal_crit_sec); EnterCriticalSection(&pg_signal_crit_sec);
break; /* Restart outer loop, in case signal mask or queue break; /* Restart outer loop, in case signal mask
has been modified inside signal handler */ * or queue has been modified inside
* signal handler */
} }
} }
} }
...@@ -244,13 +258,18 @@ static void dispatch_queued_signals(void) { ...@@ -244,13 +258,18 @@ static void dispatch_queued_signals(void) {
} }
/* signal masking. Only called on main thread, no sync required */ /* signal masking. Only called on main thread, no sync required */
int pqsigsetmask(int mask) { int
pqsigsetmask(int mask)
{
int prevmask; int prevmask;
prevmask = pg_signal_mask; prevmask = pg_signal_mask;
pg_signal_mask = mask; pg_signal_mask = mask;
/* Dispatch any signals queued up right away, in case we have /*
unblocked one or more signals previously queued */ * Dispatch any signals queued up right away, in case we have
* unblocked one or more signals previously queued
*/
dispatch_queued_signals(); dispatch_queued_signals();
return prevmask; return prevmask;
...@@ -258,8 +277,11 @@ int pqsigsetmask(int mask) { ...@@ -258,8 +277,11 @@ int pqsigsetmask(int mask) {
/* signal manipulation. Only called on main thread, no sync required */ /* signal manipulation. Only called on main thread, no sync required */
pqsigfunc pqsignal(int signum, pqsigfunc handler) { pqsigfunc
pqsignal(int signum, pqsigfunc handler)
{
pqsigfunc prevfunc; pqsigfunc prevfunc;
if (signum >= PG_SIGNAL_COUNT || signum < 0) if (signum >= PG_SIGNAL_COUNT || signum < 0)
return SIG_ERR; return SIG_ERR;
prevfunc = pg_signal_array[signum]; prevfunc = pg_signal_array[signum];
...@@ -268,23 +290,28 @@ pqsigfunc pqsignal(int signum, pqsigfunc handler) { ...@@ -268,23 +290,28 @@ pqsigfunc pqsignal(int signum, pqsigfunc handler) {
} }
/* signal sending */ /* signal sending */
int pqkill(int pid, int sig) { int
pqkill(int pid, int sig)
{
char pipename[128]; char pipename[128];
BYTE sigData = sig; BYTE sigData = sig;
BYTE sigRet = 0; BYTE sigRet = 0;
DWORD bytes; DWORD bytes;
if (sig >= PG_SIGNAL_COUNT || sig <= 0) { if (sig >= PG_SIGNAL_COUNT || sig <= 0)
{
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if (pid <= 0) { if (pid <= 0)
{
/* No support for process groups */ /* No support for process groups */
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
wsprintf(pipename,"\\\\.\\pipe\\pgsignal_%i",pid); wsprintf(pipename, "\\\\.\\pipe\\pgsignal_%i", pid);
if (!CallNamedPipe(pipename,&sigData,1,&sigRet,1,&bytes,1000)) { if (!CallNamedPipe(pipename, &sigData, 1, &sigRet, 1, &bytes, 1000))
{
if (GetLastError() == ERROR_FILE_NOT_FOUND) if (GetLastError() == ERROR_FILE_NOT_FOUND)
errno = ESRCH; errno = ESRCH;
else if (GetLastError() == ERROR_ACCESS_DENIED) else if (GetLastError() == ERROR_ACCESS_DENIED)
...@@ -293,7 +320,8 @@ int pqkill(int pid, int sig) { ...@@ -293,7 +320,8 @@ int pqkill(int pid, int sig) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
if (bytes != 1 || sigRet != sig) { if (bytes != 1 || sigRet != sig)
{
errno = ESRCH; errno = ESRCH;
return -1; return -1;
} }
...@@ -302,7 +330,9 @@ int pqkill(int pid, int sig) { ...@@ -302,7 +330,9 @@ int pqkill(int pid, int sig) {
} }
/* APC callback scheduled on main thread when signals are fired */ /* APC callback scheduled on main thread when signals are fired */
static void CALLBACK pg_signal_apc(ULONG_PTR param) { static void CALLBACK
pg_signal_apc(ULONG_PTR param)
{
dispatch_queued_signals(); dispatch_queued_signals();
} }
...@@ -314,7 +344,9 @@ static void CALLBACK pg_signal_apc(ULONG_PTR param) { ...@@ -314,7 +344,9 @@ static void CALLBACK pg_signal_apc(ULONG_PTR param) {
*/ */
static void pg_queue_signal(int signum) { static void
pg_queue_signal(int signum)
{
if (signum >= PG_SIGNAL_COUNT || signum < 0) if (signum >= PG_SIGNAL_COUNT || signum < 0)
return; return;
...@@ -322,26 +354,31 @@ static void pg_queue_signal(int signum) { ...@@ -322,26 +354,31 @@ static void pg_queue_signal(int signum) {
pg_signal_queue |= sigmask(signum); pg_signal_queue |= sigmask(signum);
LeaveCriticalSection(&pg_signal_crit_sec); LeaveCriticalSection(&pg_signal_crit_sec);
QueueUserAPC(pg_signal_apc,pgwin32_main_thread_handle,(ULONG_PTR)NULL); QueueUserAPC(pg_signal_apc, pgwin32_main_thread_handle, (ULONG_PTR) NULL);
} }
/* Signal dispatching thread */ /* Signal dispatching thread */
static DWORD WINAPI pg_signal_dispatch_thread(LPVOID param) { static DWORD WINAPI
HANDLE pipe = (HANDLE)param; pg_signal_dispatch_thread(LPVOID param)
{
HANDLE pipe = (HANDLE) param;
BYTE sigNum; BYTE sigNum;
DWORD bytes; DWORD bytes;
if (!ReadFile(pipe,&sigNum,1,&bytes,NULL)) { if (!ReadFile(pipe, &sigNum, 1, &bytes, NULL))
{
/* Client died before sending */ /* Client died before sending */
CloseHandle(pipe); CloseHandle(pipe);
return 0; return 0;
} }
if (bytes != 1) { if (bytes != 1)
{
/* Received <bytes> bytes over signal pipe (should be 1) */ /* Received <bytes> bytes over signal pipe (should be 1) */
CloseHandle(pipe); CloseHandle(pipe);
return 0; return 0;
} }
WriteFile(pipe,&sigNum,1,&bytes,NULL); /* Don't care if it works or not.. */ WriteFile(pipe, &sigNum, 1, &bytes, NULL); /* Don't care if it works
* or not.. */
FlushFileBuffers(pipe); FlushFileBuffers(pipe);
DisconnectNamedPipe(pipe); DisconnectNamedPipe(pipe);
CloseHandle(pipe); CloseHandle(pipe);
...@@ -351,33 +388,37 @@ static DWORD WINAPI pg_signal_dispatch_thread(LPVOID param) { ...@@ -351,33 +388,37 @@ static DWORD WINAPI pg_signal_dispatch_thread(LPVOID param) {
} }
/* Signal handling thread */ /* Signal handling thread */
static DWORD WINAPI pg_signal_thread(LPVOID param) { static DWORD WINAPI
pg_signal_thread(LPVOID param)
{
char pipename[128]; char pipename[128];
HANDLE pipe = INVALID_HANDLE_VALUE; HANDLE pipe = INVALID_HANDLE_VALUE;
wsprintf(pipename,"\\\\.\\pipe\\pgsignal_%i",GetCurrentProcessId()); wsprintf(pipename, "\\\\.\\pipe\\pgsignal_%i", GetCurrentProcessId());
for (;;) { for (;;)
{
BOOL fConnected; BOOL fConnected;
HANDLE hThread; HANDLE hThread;
pipe = CreateNamedPipe(pipename,PIPE_ACCESS_DUPLEX, pipe = CreateNamedPipe(pipename, PIPE_ACCESS_DUPLEX,
PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
PIPE_UNLIMITED_INSTANCES,16,16,1000,NULL); PIPE_UNLIMITED_INSTANCES, 16, 16, 1000, NULL);
if (pipe == INVALID_HANDLE_VALUE) { if (pipe == INVALID_HANDLE_VALUE)
fprintf(stderr,gettext("Failed to create signal listener pipe: %i. Retrying.\n"),(int)GetLastError()); {
SleepEx(500,TRUE); fprintf(stderr, gettext("Failed to create signal listener pipe: %i. Retrying.\n"), (int) GetLastError());
SleepEx(500, TRUE);
continue; continue;
} }
fConnected = ConnectNamedPipe(pipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED); fConnected = ConnectNamedPipe(pipe, NULL) ? TRUE : (GetLastError() == ERROR_PIPE_CONNECTED);
if (fConnected) { if (fConnected)
{
hThread = CreateThread(NULL, 0, hThread = CreateThread(NULL, 0,
(LPTHREAD_START_ROUTINE)pg_signal_dispatch_thread, (LPTHREAD_START_ROUTINE) pg_signal_dispatch_thread,
(LPVOID)pipe,0,NULL); (LPVOID) pipe, 0, NULL);
if (hThread == INVALID_HANDLE_VALUE) { if (hThread == INVALID_HANDLE_VALUE)
fprintf(stderr,gettext("Failed to create signal dispatch thread: %i\n"),(int)GetLastError()); fprintf(stderr, gettext("Failed to create signal dispatch thread: %i\n"), (int) GetLastError());
}
else else
CloseHandle(hThread); CloseHandle(hThread);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment