diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-03-24 22:40:29 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-03-24 22:40:29 +0000 |
| commit | 8899a2aba92c4a17f422172e7c9dd0e383eefa39 (patch) | |
| tree | aea400d25b0e9c32b84004728c995cd53ab33533 /src/backend/utils/misc/guc.c | |
| parent | a09b9a36d3cc8e4c5cd2877b2b764dc14a78f58e (diff) | |
| download | postgresql-8899a2aba92c4a17f422172e7c9dd0e383eefa39.tar.gz postgresql-8899a2aba92c4a17f422172e7c9dd0e383eefa39.zip | |
Replace max_expr_depth parameter with a max_stack_depth parameter that
is measured in kilobytes and checked against actual physical execution
stack depth, as per my proposal of 30-Dec. This gives us a fairly
bulletproof defense against crashing due to runaway recursive functions.
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 280977d60c1..c14b4286930 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.192 2004/03/23 01:23:48 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.193 2004/03/24 22:40:29 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -1024,6 +1024,15 @@ static struct config_int ConfigureNamesInt[] = }, { + {"max_stack_depth", PGC_SUSET, RESOURCES_MEM, + gettext_noop("Sets the maximum stack depth, in kilobytes."), + NULL + }, + &max_stack_depth, + 2048, 100, INT_MAX / 1024, assign_max_stack_depth, NULL + }, + + { {"vacuum_cost_page_hit", PGC_USERSET, RESOURCES, gettext_noop("Vacuum cost for a page found in the buffer cache."), NULL @@ -1097,14 +1106,6 @@ static struct config_int ConfigureNamesInt[] = 0, 0, INT_MAX, NULL, NULL }, #endif - { - {"max_expr_depth", PGC_USERSET, CLIENT_CONN_OTHER, - gettext_noop("Sets the maximum expression nesting depth."), - NULL - }, - &max_expr_depth, - DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL - }, { {"statement_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT, @@ -1246,7 +1247,7 @@ static struct config_int ConfigureNamesInt[] = }, { - {"debug_shared_buffers", PGC_POSTMASTER, RESOURCES_MEM, + {"debug_shared_buffers", PGC_POSTMASTER, STATS_MONITORING, gettext_noop("Interval to report shared buffer status in seconds"), NULL }, |