diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-07-09 03:29:11 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-07-09 03:29:11 +0000 |
| commit | a0659e3e2c79be49feb4aa527d823c71d7bcaf07 (patch) | |
| tree | 7dc58e872cdfce999dd0848000fcd3f2e4edbafa /src/include/commands/dbcommands.h | |
| parent | 8bf61820f033d7df0e89433a0272d7b2567378b8 (diff) | |
| download | postgresql-a0659e3e2c79be49feb4aa527d823c71d7bcaf07.tar.gz | |
From: Tom Lane <tgl@sss.pgh.pa.us>
Making PQrequestCancel safe to call in a signal handler turned out to be
much easier than I feared. So here are the diffs.
Some notes:
* I modified the postmaster's packet "iodone" callback interface to allow
the callback routine to return a continue-or-drop-connection return
code; this was necessary to allow the connection to be closed after
receiving a Cancel, rather than proceeding to launch a new backend...
Being a neatnik, I also made the iodone proc have a typechecked
parameter list.
* I deleted all code I could find that had to do with OOB.
* I made some edits to ensure that all signals mentioned in the code
are referred to symbolically not by numbers ("SIGUSR2" not "2").
I think Bruce may have already done at least some of the same edits;
I hope that merging these patches is not too painful.
Diffstat (limited to 'src/include/commands/dbcommands.h')
| -rw-r--r-- | src/include/commands/dbcommands.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h index 7717fd9d15..06a291070e 100644 --- a/src/include/commands/dbcommands.h +++ b/src/include/commands/dbcommands.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: dbcommands.h,v 1.1 1997/11/24 05:32:51 momjian Exp $ + * $Id: dbcommands.h,v 1.2 1998/07/09 03:28:56 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -17,8 +17,7 @@ * Originally from tmp/daemon.h. The functions declared in daemon.h does not * exist; hence removed. -- AY 7/29/94 */ -#define SIGKILLDAEMON1 SIGINT -#define SIGKILLDAEMON2 SIGTERM +#define SIGKILLDAEMON1 SIGTERM extern void createdb(char *dbname, char *dbpath); extern void destroydb(char *dbname); |