Index: doc/src/sgml/runtime.sgml
===================================================================
RCS file: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v
retrieving revision 1.120
diff -c -r1.120 runtime.sgml
*** doc/src/sgml/runtime.sgml 5 Jul 2002 01:17:20 -0000 1.120
--- doc/src/sgml/runtime.sgml 10 Jul 2002 03:58:52 -0000
***************
*** 1585,1590 ****
--- 1585,1600 ----
+ QUERY_TIMEOUT (integer)
+
+
+ Aborts any query that takes over the specified number of
+ microseconds. A value of zero turns off the timer.
+
+
+
+
+
SHARED_BUFFERS (integer)
Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.280
diff -c -r1.280 postmaster.c
*** src/backend/postmaster/postmaster.c 20 Jun 2002 20:29:33 -0000 1.280
--- src/backend/postmaster/postmaster.c 10 Jul 2002 03:58:56 -0000
***************
*** 2105,2111 ****
* after a time delay, so that a broken client can't hog a connection
* indefinitely. PreAuthDelay doesn't count against the time limit.
*/
! if (!enable_sigalrm_interrupt(AuthenticationTimeout * 1000))
elog(FATAL, "DoBackend: Unable to set timer for auth timeout");
/*
--- 2105,2111 ----
* after a time delay, so that a broken client can't hog a connection
* indefinitely. PreAuthDelay doesn't count against the time limit.
*/
! if (!enable_sig_alarm(AuthenticationTimeout * 1000, false))
elog(FATAL, "DoBackend: Unable to set timer for auth timeout");
/*
***************
*** 2134,2140 ****
* Done with authentication. Disable timeout, and prevent
* SIGTERM/SIGQUIT again until backend startup is complete.
*/
! if (!disable_sigalrm_interrupt())
elog(FATAL, "DoBackend: Unable to disable timer for auth timeout");
PG_SETMASK(&BlockSig);
--- 2134,2140 ----
* Done with authentication. Disable timeout, and prevent
* SIGTERM/SIGQUIT again until backend startup is complete.
*/
! if (!disable_sig_alarm(false))
elog(FATAL, "DoBackend: Unable to disable timer for auth timeout");
PG_SETMASK(&BlockSig);
Index: src/backend/storage/lmgr/proc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v
retrieving revision 1.121
diff -c -r1.121 proc.c
*** src/backend/storage/lmgr/proc.c 20 Jun 2002 20:29:35 -0000 1.121
--- src/backend/storage/lmgr/proc.c 10 Jul 2002 03:58:56 -0000
***************
*** 52,59 ****
#include "storage/sinval.h"
#include "storage/spin.h"
-
int DeadlockTimeout = 1000;
PGPROC *MyProc = NULL;
--- 52,61 ----
#include "storage/sinval.h"
#include "storage/spin.h"
int DeadlockTimeout = 1000;
+ int QueryTimeout = 0;
+ int RemainingQueryTimeout = 0;
+ bool alarm_is_query_timeout = false;
PGPROC *MyProc = NULL;
***************
*** 319,325 ****
waitingForLock = false;
/* Turn off the deadlock timer, if it's still running (see ProcSleep) */
! disable_sigalrm_interrupt();
/* Unlink myself from the wait queue, if on it (might not be anymore!) */
LWLockAcquire(LockMgrLock, LW_EXCLUSIVE);
--- 321,327 ----
waitingForLock = false;
/* Turn off the deadlock timer, if it's still running (see ProcSleep) */
! disable_sig_alarm(false);
/* Unlink myself from the wait queue, if on it (might not be anymore!) */
LWLockAcquire(LockMgrLock, LW_EXCLUSIVE);
***************
*** 632,638 ****
* By delaying the check until we've waited for a bit, we can avoid
* running the rather expensive deadlock-check code in most cases.
*/
! if (!enable_sigalrm_interrupt(DeadlockTimeout))
elog(FATAL, "ProcSleep: Unable to set timer for process wakeup");
/*
--- 634,640 ----
* By delaying the check until we've waited for a bit, we can avoid
* running the rather expensive deadlock-check code in most cases.
*/
! if (!enable_sig_alarm(DeadlockTimeout, false))
elog(FATAL, "ProcSleep: Unable to set timer for process wakeup");
/*
***************
*** 654,660 ****
/*
* Disable the timer, if it's still running
*/
! if (!disable_sigalrm_interrupt())
elog(FATAL, "ProcSleep: Unable to disable timer for process wakeup");
/*
--- 656,662 ----
/*
* Disable the timer, if it's still running
*/
! if (!disable_sig_alarm(false))
elog(FATAL, "ProcSleep: Unable to disable timer for process wakeup");
/*
***************
*** 785,791 ****
* --------------------
*/
void
! HandleDeadLock(SIGNAL_ARGS)
{
int save_errno = errno;
--- 787,793 ----
* --------------------
*/
void
! HandleDeadLock(void)
{
int save_errno = errno;
***************
*** 921,949 ****
* Delay is given in milliseconds. Caller should be sure a SIGALRM
* signal handler is installed before this is called.
*
* Returns TRUE if okay, FALSE on failure.
*/
bool
! enable_sigalrm_interrupt(int delayms)
{
#ifndef __BEOS__
! struct itimerval timeval,
! dummy;
MemSet(&timeval, 0, sizeof(struct itimerval));
timeval.it_value.tv_sec = delayms / 1000;
timeval.it_value.tv_usec = (delayms % 1000) * 1000;
! if (setitimer(ITIMER_REAL, &timeval, &dummy))
return false;
#else
/* BeOS doesn't have setitimer, but has set_alarm */
- bigtime_t time_interval;
-
time_interval = delayms * 1000; /* usecs */
! if (set_alarm(time_interval, B_ONE_SHOT_RELATIVE_ALARM) < 0)
return false;
#endif
return true;
}
--- 923,1014 ----
* Delay is given in milliseconds. Caller should be sure a SIGALRM
* signal handler is installed before this is called.
*
+ * This code properly handles multiple alarms when when the query_timeout
+ * alarm is specified first.
+ *
* Returns TRUE if okay, FALSE on failure.
*/
bool
! enable_sig_alarm(int delayms, bool is_query_timeout)
{
#ifndef __BEOS__
! struct itimerval timeval, remaining;
! #else
! bigtime_t time_interval, remaining;
! #endif
! int remainingms;
+ /* Don't set timer if the query timeout scheduled before next alarm. */
+ if (alarm_is_query_timeout &&
+ !is_query_timeout &&
+ RemainingQueryTimeout <= delayms)
+ return true;
+
+ #ifndef __BEOS__
MemSet(&timeval, 0, sizeof(struct itimerval));
timeval.it_value.tv_sec = delayms / 1000;
timeval.it_value.tv_usec = (delayms % 1000) * 1000;
! if (setitimer(ITIMER_REAL, &timeval, &remaining))
return false;
+ if (alarm_is_query_timeout && !is_query_timeout)
+ {
+ remainingms = remaining.it_value.tv_sec * 1000 +
+ remaining.it_value.tv_usec;
+ /* Query already timed out */
+ if (remainingms == 0)
+ {
+ alarm_is_query_timeout = true;
+ kill(MyProcPid, SIGALRM);
+ }
+ /* Previous alarm < delayms? */
+ if (remainingms < delayms)
+ {
+ alarm_is_query_timeout = true;
+ /* return alarm as though no change was made */
+ if (setitimer(ITIMER_REAL, &remaining, &timeval))
+ return false;
+ else
+ return true;
+ }
+ RemainingQueryTimeout = remainingms - delayms;
+ }
+ else if (is_query_timeout)
+ RemainingQueryTimeout = QueryTimeout;
#else
/* BeOS doesn't have setitimer, but has set_alarm */
time_interval = delayms * 1000; /* usecs */
! if ((remaining = set_alarm(time_interval, B_ONE_SHOT_RELATIVE_ALARM)) < 0)
return false;
+ if (alarm_is_query_timeout && !is_query_timeout)
+ {
+ remainingms = remaining / 1000;
+ /* Query already timed out */
+ if (remainingms == 0)
+ {
+ alarm_is_query_timeout = true;
+ kill(MyProcPid, SIGALRM);
+ }
+ /* Previous alarm < delayms? */
+ if (remainingms < delayms)
+ {
+ alarm_is_query_timeout = true;
+ /* return as though no change was made */
+ if ((timeval = set_alarm(remaining, B_ONE_SHOT_RELATIVE_ALARM)) < 0)
+ return false;
+ else
+ return true;
+ }
+ RemainingQueryTimeout = remainingms - delayms;
+ }
+ else if (is_query_timeout)
+ RemainingQueryTimeout = QueryTimeout;
#endif
+ if (is_query_timeout)
+ alarm_is_query_timeout = true;
+ else
+ alarm_is_query_timeout = false;
+
return true;
}
***************
*** 953,972 ****
* Returns TRUE if okay, FALSE on failure.
*/
bool
! disable_sigalrm_interrupt(void)
{
#ifndef __BEOS__
! struct itimerval timeval,
! dummy;
MemSet(&timeval, 0, sizeof(struct itimerval));
! if (setitimer(ITIMER_REAL, &timeval, &dummy))
! return false;
#else
/* BeOS doesn't have setitimer, but has set_alarm */
! if (set_alarm(B_INFINITE_TIMEOUT, B_PERIODIC_ALARM) < 0)
! return false;
#endif
return true;
}
--- 1018,1087 ----
* Returns TRUE if okay, FALSE on failure.
*/
bool
! disable_sig_alarm(bool is_query_timeout)
{
#ifndef __BEOS__
! struct itimerval timeval, dummy;
! #endif
+ #ifndef __BEOS__
MemSet(&timeval, 0, sizeof(struct itimerval));
! if (!is_query_timeout && RemainingQueryTimeout)
! {
! /* Restore remaining query timeout value */
! timeval.it_value.tv_sec = RemainingQueryTimeout / 1000;
! timeval.it_value.tv_usec = (RemainingQueryTimeout % 1000) * 1000;
! alarm_is_query_timeout = true;
! }
! /*
! * Optimization: is_query_timeout && RemainingQueryTimeout == 0
! * does nothing. This is for cases where no timeout was set.
! */
! if (!is_query_timeout || RemainingQueryTimeout)
! {
! if (setitimer(ITIMER_REAL, &timeval, &dummy))
! return false;
! }
#else
/* BeOS doesn't have setitimer, but has set_alarm */
! if (!is_query_timeout && RemainingQueryTimeout)
! {
! bigtime_t time_interval = RemainingQueryTimeout * 1000;
!
! alarm_is_query_timeout = true;
! if (!is_query_timeout)
! {
! if (set_alarm(time_interval, B_ONE_SHOT_RELATIVE_ALARM) < 0)
! return false;
! }
! }
! else if (!is_query_timeout || RemainingQueryTimeout)
! {
! if (set_alarm(B_INFINITE_TIMEOUT, B_PERIODIC_ALARM) < 0)
! return false;
! }
#endif
+ if (is_query_timeout)
+ RemainingQueryTimeout = 0;
+
return true;
}
+
+
+ /*
+ * Call alarm handler.
+ */
+ void
+ handle_sig_alarm(SIGNAL_ARGS)
+ {
+ if (alarm_is_query_timeout)
+ {
+ RemainingQueryTimeout = 0;
+ alarm_is_query_timeout = false;
+ kill(MyProcPid, SIGINT);
+ }
+ else
+ HandleDeadLock();
+ }
+
Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/tcop/postgres.c,v
retrieving revision 1.268
diff -c -r1.268 postgres.c
*** src/backend/tcop/postgres.c 20 Jun 2002 20:29:36 -0000 1.268
--- src/backend/tcop/postgres.c 10 Jul 2002 03:58:58 -0000
***************
*** 78,83 ****
--- 78,85 ----
/* Note: whereToSendOutput is initialized for the bootstrap/standalone case */
CommandDest whereToSendOutput = Debug;
+ extern int QueryTimeout;
+
static bool dontExecute = false;
/* note: these declarations had better match tcopprot.h */
***************
*** 723,728 ****
--- 725,733 ----
*/
CHECK_FOR_INTERRUPTS();
+ if (QueryTimeout)
+ enable_sig_alarm(QueryTimeout, true);
+
if (querytree->commandType == CMD_UTILITY)
{
/*
***************
*** 791,796 ****
--- 796,803 ----
ShowUsage("EXECUTOR STATISTICS");
}
+ disable_sig_alarm(true);
+
/*
* In a query block, we want to increment the command counter
* between queries so that the effects of early queries are
***************
*** 821,829 ****
finish_xact_command();
xact_started = false;
}
!
! } /* end loop over queries generated from a
! * parsetree */
/*
* If this is the last parsetree of the query string, close down
--- 828,834 ----
finish_xact_command();
xact_started = false;
}
! } /* end loop over queries generated from a parsetree */
/*
* If this is the last parsetree of the query string, close down
***************
*** 1554,1560 ****
pqsignal(SIGINT, QueryCancelHandler); /* cancel current query */
pqsignal(SIGTERM, die); /* cancel current query and exit */
pqsignal(SIGQUIT, quickdie); /* hard crash time */
! pqsignal(SIGALRM, HandleDeadLock); /* check for deadlock after
* timeout */
/*
--- 1559,1565 ----
pqsignal(SIGINT, QueryCancelHandler); /* cancel current query */
pqsignal(SIGTERM, die); /* cancel current query and exit */
pqsignal(SIGQUIT, quickdie); /* hard crash time */
! pqsignal(SIGALRM, handle_sig_alarm); /* check for deadlock after
* timeout */
/*
***************
*** 1819,1824 ****
--- 1824,1832 ----
*/
QueryCancelPending = false; /* forget any earlier CANCEL
* signal */
+
+ /* Stop any query timer */
+ disable_sig_alarm(true);
EnableNotifyInterrupt();
Index: src/backend/utils/misc/guc.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v
retrieving revision 1.70
diff -c -r1.70 guc.c
*** src/backend/utils/misc/guc.c 16 Jun 2002 00:09:12 -0000 1.70
--- src/backend/utils/misc/guc.c 10 Jul 2002 03:59:00 -0000
***************
*** 51,56 ****
--- 51,57 ----
extern bool Log_connections;
extern int PreAuthDelay;
extern int AuthenticationTimeout;
+ extern int QueryTimeout;
extern int CheckPointTimeout;
extern int CommitDelay;
extern int CommitSiblings;
***************
*** 573,578 ****
--- 574,584 ----
{
{ "max_expr_depth", PGC_USERSET }, &max_expr_depth,
DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
+ },
+
+ {
+ { "query_timeout", PGC_USERSET }, &QueryTimeout,
+ 0, 0, INT_MAX, NULL, NULL
},
{
Index: src/backend/utils/misc/postgresql.conf.sample
===================================================================
RCS file: /cvsroot/pgsql/src/backend/utils/misc/postgresql.conf.sample,v
retrieving revision 1.40
diff -c -r1.40 postgresql.conf.sample
*** src/backend/utils/misc/postgresql.conf.sample 16 Jun 2002 00:09:12 -0000 1.40
--- src/backend/utils/misc/postgresql.conf.sample 10 Jul 2002 03:59:00 -0000
***************
*** 200,202 ****
--- 200,203 ----
#password_encryption = true
#sql_inheritance = true
#transform_null_equals = false
+ #query_timeout = 0 # 0 is disabled
Index: src/bin/psql/tab-complete.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v
retrieving revision 1.50
diff -c -r1.50 tab-complete.c
*** src/bin/psql/tab-complete.c 16 Jun 2002 00:09:12 -0000 1.50
--- src/bin/psql/tab-complete.c 10 Jul 2002 03:59:05 -0000
***************
*** 267,272 ****
--- 267,273 ----
"default_transaction_isolation",
"search_path",
+ "query_timeout",
NULL
};
Index: src/include/storage/proc.h
===================================================================
RCS file: /cvsroot/pgsql/src/include/storage/proc.h,v
retrieving revision 1.57
diff -c -r1.57 proc.h
*** src/include/storage/proc.h 20 Jun 2002 20:29:52 -0000 1.57
--- src/include/storage/proc.h 10 Jul 2002 03:59:05 -0000
***************
*** 105,117 ****
extern PGPROC *ProcWakeup(PGPROC *proc, int errType);
extern void ProcLockWakeup(LOCKMETHODTABLE *lockMethodTable, LOCK *lock);
extern bool LockWaitCancel(void);
! extern void HandleDeadLock(SIGNAL_ARGS);
extern void ProcWaitForSignal(void);
extern void ProcCancelWaitForSignal(void);
extern void ProcSendSignal(BackendId procId);
! extern bool enable_sigalrm_interrupt(int delayms);
! extern bool disable_sigalrm_interrupt(void);
#endif /* PROC_H */
--- 105,118 ----
extern PGPROC *ProcWakeup(PGPROC *proc, int errType);
extern void ProcLockWakeup(LOCKMETHODTABLE *lockMethodTable, LOCK *lock);
extern bool LockWaitCancel(void);
! extern void HandleDeadLock(void);
extern void ProcWaitForSignal(void);
extern void ProcCancelWaitForSignal(void);
extern void ProcSendSignal(BackendId procId);
! extern bool enable_sig_alarm(int delayms, bool is_query_timeout);
! extern bool disable_sig_alarm(bool is_query_timeout);
! extern void handle_sig_alarm(SIGNAL_ARGS);
#endif /* PROC_H */