database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Adjust HINT for stack depth limit to mention checking the underlying

Browse Source 
platform limit, rather than just blindly raising max_stack_depth.
Also, tweak the code to work properly if someone sets max_stack_depth
to more than 2Gb, which guc.c will allow on a 64-bit machine.
This commit is contained in:
Tom Lane
2006-10-07 16:43:28 +00:00
parent cc1d55b74b
commit 1c160291ef
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.510 2006/10/04 00:29:58 momjian Exp $ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.511 2006/10/07 16:43:28 tgl Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -91,7 +91,7 @@ int PostAuthDelay = 0;
*/ */
/* max_stack_depth converted to bytes for speed of checking */ /* max_stack_depth converted to bytes for speed of checking */
static int max_stack_depth_bytes = 2048 * 1024; static long max_stack_depth_bytes = 2048 * 1024L;
/* /*
* Stack base pointer -- initialized by PostgresMain. This is not static * Stack base pointer -- initialized by PostgresMain. This is not static
@ -2498,16 +2498,12 @@ void
check_stack_depth(void) check_stack_depth(void)
{ {
char stack_top_loc; char stack_top_loc;
int stack_depth; long stack_depth;
/* /*
* Compute distance from PostgresMain's local variables to my own * Compute distance from PostgresMain's local variables to my own
*
* Note: in theory stack_depth should be ptrdiff_t or some such, but since
* the whole point of this code is to bound the value to something much
* less than integer-sized, int should work fine.
*/ */
stack_depth = (int) (stack_base_ptr - &stack_top_loc); stack_depth = (long) (stack_base_ptr - &stack_top_loc);
/* /*
* Take abs value, since stacks grow up on some machines, down on others * Take abs value, since stacks grow up on some machines, down on others
@ -2529,7 +2525,8 @@ check_stack_depth(void)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_STATEMENT_TOO_COMPLEX), (errcode(ERRCODE_STATEMENT_TOO_COMPLEX),
errmsg("stack depth limit exceeded"), errmsg("stack depth limit exceeded"),
errhint("Increase the configuration parameter \"max_stack_depth\"."))); errhint("Increase the configuration parameter \"max_stack_depth\", "
"after ensuring the platform's stack depth limit is adequate.")));
} }
} }
@ -2539,7 +2536,7 @@ assign_max_stack_depth(int newval, bool doit, GucSource source)
{ {
/* Range check was already handled by guc.c */ /* Range check was already handled by guc.c */
if (doit) if (doit)
max_stack_depth_bytes = newval * 1024; max_stack_depth_bytes = newval * 1024L;
return true; return true;
} }