database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Win32 signals cleanup. Patch by Magnus Hagander, with input from Claudio

Browse Source 
Natoli and Bruce Momjian (and some cosmetic fixes from Neil Conway).
Changes:

    - remove duplicate signal definitions from pqsignal.h

    - replace pqkill() with kill() and redefine kill() in Win32

    - use ereport() in place of fprintf() in some error handling in
      pqsignal.c

    - export pg_queue_signal() and make use of it where necessary

    - add a console control handler for Ctrl-C and similar handling
      on Win32

    - do WaitForSingleObjectEx() in CHECK_FOR_INTERRUPTS() on Win32;
      query cancelling should now work on Win32

    - various other fixes and cleanups
This commit is contained in:
Neil Conway
2004-02-08 22:28:57 +00:00
parent 04e82e5008
commit f06e79525a
11 changed files with 118 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/storage/ipc/pmsignal.c
View File

@@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.12 2004/01/27 00:45:26 momjian Exp $
* $PostgreSQL: pgsql/src/backend/storage/ipc/pmsignal.c,v 1.13 2004/02/08 22:28:56 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,7 +20,6 @@
#include "miscadmin.h"
#include "storage/pmsignal.h"
#include "storage/shmem.h"
#include "libpq/pqsignal.h"
/*
@@ -65,7 +64,7 @@ SendPostmasterSignal(PMSignalReason reason)
/* Atomically set the proper flag */
PMSignalFlags[reason] = true;
/* Send signal to postmaster */
pqkill(PostmasterPid, SIGUSR1);
kill(PostmasterPid, SIGUSR1);
}
/*

5
src/backend/storage/lmgr/proc.c
View File

@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.145 2004/01/27 00:45:26 momjian Exp $
* $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.146 2004/02/08 22:28:56 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,6 @@
#include "storage/proc.h"
#include "storage/sinval.h"
#include "storage/spin.h"
#include "libpq/pqsignal.h"
/* GUC variables */
int DeadlockTimeout = 1000;
@@ -1131,7 +1130,7 @@ CheckStatementTimeout(void)
{
/* Time to die */
statement_timeout_active = false;
pqkill(MyProcPid, SIGINT);
kill(MyProcPid, SIGINT);
}
else
{