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/backend/utils/init/globals.c | |
| parent | 8bf61820f033d7df0e89433a0272d7b2567378b8 (diff) | |
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/backend/utils/init/globals.c')
| -rw-r--r-- | src/backend/utils/init/globals.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c index 2deec81de00..585471d37f6 100644 --- a/src/backend/utils/init/globals.c +++ b/src/backend/utils/init/globals.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.23 1998/05/29 17:00:18 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/globals.c,v 1.24 1998/07/09 03:28:51 scrappy Exp $ * * NOTES * Globals used all over the place should be declared here and not @@ -44,6 +44,8 @@ bool QueryCancel = false; int MyProcPid; +long MyCancelKey; + char *DataDir; /* |