Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2487d87

Browse files
committed
Create a multiplexing structure for signals to Postgres child processes.
This patch gets us out from under the Unix limitation of two user-definedsignal types. We already had done something similar for signals directed tothe postmaster process; this adds multiplexing for signals directed tobackends and auxiliary processes (so long as they're connected to sharedmemory).As proof of concept, replace the former usage of SIGUSR1 and SIGUSR2for backends with use of the multiplexing mechanism. There are still somehard-wired definitions of SIGUSR1 and SIGUSR2 for other process types,but getting rid of those doesn't seem interesting at the moment.Fujii Masao
1 parenta23c641 commit2487d87

File tree

16 files changed

+419
-81
lines changed

16 files changed

+419
-81
lines changed

‎src/backend/bootstrap/bootstrap.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.250 2009/02/18 15:58:41 heikki Exp $
11+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootstrap.c,v 1.251 2009/07/31 20:26:22 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -35,6 +35,7 @@
3535
#include"storage/bufmgr.h"
3636
#include"storage/ipc.h"
3737
#include"storage/proc.h"
38+
#include"storage/procsignal.h"
3839
#include"tcop/tcopprot.h"
3940
#include"utils/builtins.h"
4041
#include"utils/fmgroids.h"
@@ -388,6 +389,19 @@ AuxiliaryProcessMain(int argc, char *argv[])
388389
InitAuxiliaryProcess();
389390
#endif
390391

392+
/*
393+
* Assign the ProcSignalSlot for an auxiliary process. Since it
394+
* doesn't have a BackendId, the slot is statically allocated based on
395+
* the auxiliary process type (auxType). Backends use slots indexed
396+
* in the range from 1 to MaxBackends (inclusive), so we use
397+
* MaxBackends + AuxProcType + 1 as the index of the slot for an
398+
* auxiliary process.
399+
*
400+
* This will need rethinking if we ever want more than one of a
401+
* particular auxiliary process type.
402+
*/
403+
ProcSignalInit(MaxBackends+auxType+1);
404+
391405
/* finish setting up bufmgr.c */
392406
InitBufferPoolBackend();
393407

‎src/backend/commands/async.c

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.148 2009/07/21 20:24:51 petere Exp $
10+
* $PostgreSQL: pgsql/src/backend/commands/async.c,v 1.149 2009/07/31 20:26:22 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -35,14 +35,15 @@
3535
* If the listenerPID in a matching tuple is ours, we just send a notify
3636
* message to our own front end. If it is not ours, and "notification"
3737
* is not already nonzero, we set notification to our own PID and send a
38-
* SIGUSR2 signal to the receiving process (indicated by listenerPID).
38+
* PROCSIG_NOTIFY_INTERRUPT signal to the receiving process (indicated by
39+
* listenerPID).
3940
* BTW: if the signal operation fails, we presume that the listener backend
4041
* crashed without removing this tuple, and remove the tuple for it.
4142
*
42-
* 4. Upon receipt of aSIGUSR2 signal, the signal handler can call inbound-
43-
* notify processing immediately if this backend is idle (ie, it is
44-
* waiting for a frontend command and is not within a transaction block).
45-
* Otherwise the handler may only set a flag, which will cause the
43+
* 4. Upon receipt of aPROCSIG_NOTIFY_INTERRUPT signal, the signal handler
44+
*can call inbound-notify processing immediately if this backend is idle
45+
*(ie, it iswaiting for a frontend command and is not within a transaction
46+
*block).Otherwise the handler may only set a flag, which will cause the
4647
* processing to occur just before we next go idle.
4748
*
4849
* 5. Inbound-notify processing consists of scanning pg_listener for tuples
@@ -95,6 +96,7 @@
9596
#include"libpq/pqformat.h"
9697
#include"miscadmin.h"
9798
#include"storage/ipc.h"
99+
#include"storage/procsignal.h"
98100
#include"storage/sinval.h"
99101
#include"tcop/tcopprot.h"
100102
#include"utils/builtins.h"
@@ -634,12 +636,17 @@ Send_Notify(Relation lRel)
634636

635637
/*
636638
* If someone has already notified this listener, we don't bother
637-
* modifying the table, but we do still send a SIGUSR2 signal,
638-
* just in case that backend missed the earlier signal for some
639-
* reason.It's OK to send the signal first, because the other
640-
* guy can't read pg_listener until we unlock it.
639+
* modifying the table, but we do still send a NOTIFY_INTERRUPT
640+
* signal, just in case that backend missed the earlier signal for
641+
* some reason. It's OK to send the signal first, because the
642+
* other guy can't read pg_listener until we unlock it.
643+
*
644+
* Note: we don't have the other guy's BackendId available, so
645+
* this will incur a search of the ProcSignal table. That's
646+
* probably not worth worrying about.
641647
*/
642-
if (kill(listenerPID,SIGUSR2)<0)
648+
if (SendProcSignal(listenerPID,PROCSIG_NOTIFY_INTERRUPT,
649+
InvalidBackendId)<0)
643650
{
644651
/*
645652
* Get rid of pg_listener entry if it refers to a PID that no
@@ -777,24 +784,22 @@ AtSubAbort_Notify(void)
777784
}
778785

779786
/*
780-
*NotifyInterruptHandler
787+
*HandleNotifyInterrupt
781788
*
782-
*This isthe signal handler for SIGUSR2.
789+
*This iscalled when PROCSIG_NOTIFY_INTERRUPT is received.
783790
*
784791
*If we are idle (notifyInterruptEnabled is set), we can safely invoke
785792
*ProcessIncomingNotify directly. Otherwise, just set a flag
786793
*to do it later.
787794
*/
788795
void
789-
NotifyInterruptHandler(SIGNAL_ARGS)
796+
HandleNotifyInterrupt(void)
790797
{
791-
intsave_errno=errno;
792-
793798
/*
794-
* Note: this is a SIGNAL HANDLER.You must be very wary what you do
795-
* here. Some helpful soul had this routine sprinkled with TPRINTFs, which
796-
* would likely lead to corruption of stdio buffers if they were ever
797-
* turned on.
799+
* Note: this iscalled bya SIGNAL HANDLER.You must be very wary what
800+
*you dohere. Some helpful soul had this routine sprinkled with
801+
*TPRINTFs, whichwould likely lead to corruption of stdio buffers if
802+
*they were everturned on.
798803
*/
799804

800805
/* Don't joggle the elbow of proc_exit */
@@ -815,7 +820,7 @@ NotifyInterruptHandler(SIGNAL_ARGS)
815820

816821
/*
817822
* I'm not sure whether some flavors of Unix might allow another
818-
*SIGUSR2 occurrence to recursively interrupt this routine. To cope
823+
*SIGUSR1 occurrence to recursively interrupt this routine. To cope
819824
* with the possibility, we do the same sort of dance that
820825
* EnableNotifyInterrupt must do --- see that routine for comments.
821826
*/
@@ -831,12 +836,12 @@ NotifyInterruptHandler(SIGNAL_ARGS)
831836
{
832837
/* Here, it is finally safe to do stuff. */
833838
if (Trace_notify)
834-
elog(DEBUG1,"NotifyInterruptHandler: perform async notify");
839+
elog(DEBUG1,"HandleNotifyInterrupt: perform async notify");
835840

836841
ProcessIncomingNotify();
837842

838843
if (Trace_notify)
839-
elog(DEBUG1,"NotifyInterruptHandler: done");
844+
elog(DEBUG1,"HandleNotifyInterrupt: done");
840845
}
841846
}
842847

@@ -854,8 +859,6 @@ NotifyInterruptHandler(SIGNAL_ARGS)
854859
*/
855860
notifyInterruptOccurred=1;
856861
}
857-
858-
errno=save_errno;
859862
}
860863

861864
/*
@@ -922,8 +925,8 @@ EnableNotifyInterrupt(void)
922925
*a frontend command. Signal handler execution of inbound notifies
923926
*is disabled until the next EnableNotifyInterrupt call.
924927
*
925-
*TheSIGUSR1 signal handler also needs to call this, so as to
926-
*prevent conflicts if one signal interrupts the other. So we
928+
*ThePROCSIG_CATCHUP_INTERRUPT signal handler also needs to call this,
929+
*so as toprevent conflicts if one signal interrupts the other. So we
927930
*must return the previous state of the flag.
928931
*/
929932
bool
@@ -940,8 +943,8 @@ DisableNotifyInterrupt(void)
940943
* ProcessIncomingNotify
941944
*
942945
*Deal with arriving NOTIFYs from other backends.
943-
*This is called either directly from theSIGUSR2 signal handler,
944-
*or the next time control reaches the outer idle loop.
946+
*This is called either directly from thePROCSIG_NOTIFY_INTERRUPT
947+
*signal handler,or the next time control reaches the outer idle loop.
945948
*Scan pg_listener for arriving notifies, report them to my front end,
946949
*and clear the notification field in pg_listener until next time.
947950
*
@@ -961,7 +964,7 @@ ProcessIncomingNotify(void)
961964
nulls[Natts_pg_listener];
962965
boolcatchup_enabled;
963966

964-
/* Must preventSIGUSR1 interrupt while I am running */
967+
/* Must preventcatchup interrupt while I am running */
965968
catchup_enabled=DisableCatchupInterrupt();
966969

967970
if (Trace_notify)

‎src/backend/postmaster/autovacuum.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
*
5656
*
5757
* IDENTIFICATION
58-
* $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.99 2009/06/12 16:17:29 tgl Exp $
58+
* $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.100 2009/07/31 20:26:22 tgl Exp $
5959
*
6060
*-------------------------------------------------------------------------
6161
*/
@@ -91,6 +91,7 @@
9191
#include"storage/pmsignal.h"
9292
#include"storage/proc.h"
9393
#include"storage/procarray.h"
94+
#include"storage/procsignal.h"
9495
#include"storage/sinvaladt.h"
9596
#include"tcop/tcopprot.h"
9697
#include"utils/dynahash.h"
@@ -436,7 +437,6 @@ AutoVacLauncherMain(int argc, char *argv[])
436437

437438
pqsignal(SIGPIPE,SIG_IGN);
438439
pqsignal(SIGUSR1,avl_sigusr1_handler);
439-
/* We don't listen for async notifies */
440440
pqsignal(SIGUSR2,SIG_IGN);
441441
pqsignal(SIGFPE,FloatExceptionHandler);
442442
pqsignal(SIGCHLD,SIG_DFL);
@@ -1322,7 +1322,7 @@ avl_sighup_handler(SIGNAL_ARGS)
13221322
got_SIGHUP= true;
13231323
}
13241324

1325-
/* SIGUSR1: a worker is up and running, or just finished */
1325+
/* SIGUSR1: a worker is up and running, or just finished, or failed to fork */
13261326
staticvoid
13271327
avl_sigusr1_handler(SIGNAL_ARGS)
13281328
{
@@ -1501,8 +1501,7 @@ AutoVacWorkerMain(int argc, char *argv[])
15011501
pqsignal(SIGALRM,handle_sig_alarm);
15021502

15031503
pqsignal(SIGPIPE,SIG_IGN);
1504-
pqsignal(SIGUSR1,CatchupInterruptHandler);
1505-
/* We don't listen for async notifies */
1504+
pqsignal(SIGUSR1,procsignal_sigusr1_handler);
15061505
pqsignal(SIGUSR2,SIG_IGN);
15071506
pqsignal(SIGFPE,FloatExceptionHandler);
15081507
pqsignal(SIGCHLD,SIG_DFL);

‎src/backend/postmaster/bgwriter.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*
3939
*
4040
* IDENTIFICATION
41-
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.62 2009/06/26 20:29:04 tgl Exp $
41+
* $PostgreSQL: pgsql/src/backend/postmaster/bgwriter.c,v 1.63 2009/07/31 20:26:22 tgl Exp $
4242
*
4343
*-------------------------------------------------------------------------
4444
*/
@@ -223,15 +223,15 @@ BackgroundWriterMain(void)
223223
* tell us it's okay to shut down (via SIGUSR2).
224224
*
225225
* SIGUSR1 is presently unused; keep it spare in case someday we want this
226-
* process to participate insinval messaging.
226+
* process to participate inProcSignal signalling.
227227
*/
228228
pqsignal(SIGHUP,BgSigHupHandler);/* set flag to read config file */
229229
pqsignal(SIGINT,ReqCheckpointHandler);/* request checkpoint */
230230
pqsignal(SIGTERM,SIG_IGN);/* ignore SIGTERM */
231231
pqsignal(SIGQUIT,bg_quickdie);/* hard crash time */
232232
pqsignal(SIGALRM,SIG_IGN);
233233
pqsignal(SIGPIPE,SIG_IGN);
234-
pqsignal(SIGUSR1,SIG_IGN);/* reserve forsinval */
234+
pqsignal(SIGUSR1,SIG_IGN);/* reserve forProcSignal */
235235
pqsignal(SIGUSR2,ReqShutdownHandler);/* request shutdown */
236236

237237
/*

‎src/backend/postmaster/walwriter.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*
3535
*
3636
* IDENTIFICATION
37-
* $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.7 2009/06/11 14:49:01 momjian Exp $
37+
* $PostgreSQL: pgsql/src/backend/postmaster/walwriter.c,v 1.8 2009/07/31 20:26:23 tgl Exp $
3838
*
3939
*-------------------------------------------------------------------------
4040
*/
@@ -113,7 +113,7 @@ WalWriterMain(void)
113113
pqsignal(SIGQUIT,wal_quickdie);/* hard crash time */
114114
pqsignal(SIGALRM,SIG_IGN);
115115
pqsignal(SIGPIPE,SIG_IGN);
116-
pqsignal(SIGUSR1,SIG_IGN);/* reserve forsinval */
116+
pqsignal(SIGUSR1,SIG_IGN);/* reserve forProcSignal */
117117
pqsignal(SIGUSR2,SIG_IGN);/* not used */
118118

119119
/*

‎src/backend/storage/ipc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Makefile for storage/ipc
33
#
4-
# $PostgreSQL: pgsql/src/backend/storage/ipc/Makefile,v 1.21 2008/02/19 10:30:08 petere Exp $
4+
# $PostgreSQL: pgsql/src/backend/storage/ipc/Makefile,v 1.22 2009/07/31 20:26:23 tgl Exp $
55
#
66

77
subdir = src/backend/storage/ipc
@@ -15,7 +15,7 @@ override CFLAGS+= -fno-inline
1515
endif
1616
endif
1717

18-
OBJS = ipc.o ipci.o pmsignal.o procarray.o shmem.o shmqueue.o\
18+
OBJS = ipc.o ipci.o pmsignal.o procarray.oprocsignal.oshmem.o shmqueue.o\
1919
sinval.o sinvaladt.o
2020

2121
include$(top_srcdir)/src/backend/common.mk

‎src/backend/storage/ipc/ipci.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.100 2009/05/05 19:59:00 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/ipc/ipci.c,v 1.101 2009/07/31 20:26:23 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -30,6 +30,7 @@
3030
#include"storage/pg_shmem.h"
3131
#include"storage/pmsignal.h"
3232
#include"storage/procarray.h"
33+
#include"storage/procsignal.h"
3334
#include"storage/sinvaladt.h"
3435
#include"storage/spin.h"
3536

@@ -112,6 +113,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
112113
size=add_size(size,BackendStatusShmemSize());
113114
size=add_size(size,SInvalShmemSize());
114115
size=add_size(size,PMSignalShmemSize());
116+
size=add_size(size,ProcSignalShmemSize());
115117
size=add_size(size,BgWriterShmemSize());
116118
size=add_size(size,AutoVacuumShmemSize());
117119
size=add_size(size,BTreeShmemSize());
@@ -208,6 +210,7 @@ CreateSharedMemoryAndSemaphores(bool makePrivate, int port)
208210
* Set up interprocess signaling mechanisms
209211
*/
210212
PMSignalShmemInit();
213+
ProcSignalShmemInit();
211214
BgWriterShmemInit();
212215
AutoVacuumShmemInit();
213216

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp