NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit96112ee

committed

Revert "Add some temporary code to record stack usage at server process exit."

This reverts commit88cf37d as wellas follow-on commitsea9c4a1 andc575627. We've learned about as muchas we can from the buildfarm.

1 parent30b2731 commit96112eeCopy full SHA for 96112ee

File tree

2 files changed

-85

lines changed

src/backend
- storage/ipc
  - ipc.c
- tcop
  - postgres.c

2 files changed

-85

lines changed

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

Lines changed: 0 additions & 73 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@`
`22`	`22`	`#include<signal.h>`
`23`	`23`	`#include<unistd.h>`
`24`	`24`	`#include<sys/stat.h>`
`25`		`-#if defined(__hpux)`
`26`		`-#include<sys/param.h>`
`27`		`-#include<sys/pstat.h>`
`28`		`-#endif`
`29`	`25`
`30`	`26`	`#include"miscadmin.h"`
`31`	`27`	`#ifdefPROFILE_PID_DIR`
`@@ -35,9 +31,6 @@`
`35`	`31`	`#include"storage/ipc.h"`
`36`	`32`	`#include"tcop/tcopprot.h"`
`37`	`33`
`38`		`-externlongmax_measured_stack_depth;`
`39`		`-externlongmax_measured_register_stack_depth;`
`40`		`-`
`41`	`34`
`42`	`35`	`/*`
`43`	`36`	`* This flag is set during proc_exit() to change ereport()'s behavior,`
`@@ -87,69 +80,6 @@ static inton_proc_exit_index,`
`87`	`80`	`before_shmem_exit_index;`
`88`	`81`
`89`	`82`
`90`		`-/* Report process's stack consumption to stderr */`
`91`		`-staticvoid`
`92`		`-report_stack_size(void)`
`93`		`-{`
`94`		`-#if defined(__hpux)`
`95`		`-/* HPUX: examine process's memory map with pstat_getprocvm() */`
`96`		`-inttargetpid=getpid();`
`97`		`-intndx;`
`98`		`-`
`99`		`-for (ndx=0;;ndx++)`
`100`		`-{`
`101`		`-structpst_vm_statusbuf;`
`102`		`-constchar*pagetype;`
`103`		`-intres;`
`104`		`-`
`105`		`-res=pstat_getprocvm(&buf,sizeof(buf),targetpid,ndx);`
`106`		`-if (res<0)`
`107`		`-{`
`108`		`-perror("getprocvm");`
`109`		`-break;`
`110`		`-}`
`111`		`-if (res!=1)`
`112`		`-break;`
`113`		`-switch (buf.pst_type)`
`114`		`-{`
`115`		`-casePS_STACK:`
`116`		`-pagetype="STACK";`
`117`		`-break;`
`118`		`-#ifdefPS_RSESTACK`
`119`		`-casePS_RSESTACK:`
`120`		`-pagetype="REGSTACK";`
`121`		`-break;`
`122`		`-#endif`
`123`		`-default:`
`124`		`-continue;`
`125`		`-}`
`126`		`-fprintf(stderr,"%d: stack addr 0x%lx, length %ld, physical pages %ld, type %s\n",`
`127`		`-targetpid,`
`128`		`-buf.pst_vaddr,`
`129`		`-buf.pst_length,`
`130`		`-buf.pst_phys_pages,`
`131`		`-pagetype);`
`132`		`-}`
`133`		`-#else/* non HPUX */`
`134`		`-/* Otherwise: try to use pmap. No error if that doesn't work. */`
`135`		`-charsysbuf[128];`
`136`		`-`
`137`		`-snprintf(sysbuf,sizeof(sysbuf),"pmap -x %d \| grep -i stack 1>&2",`
`138`		`- (int)getpid());`
`139`		`-(void)system(sysbuf);`
`140`		`-#endif`
`141`		`-`
`142`		`-#if defined(__ia64__)\|\| defined(__ia64)`
`143`		`-fprintf(stderr,"max measured stack depths %ldkB, %ldkB\n",`
`144`		`-(max_measured_stack_depth+1023) /1024,`
`145`		`-(max_measured_register_stack_depth+1023) /1024);`
`146`		`-#else`
`147`		`-fprintf(stderr,"max measured stack depth %ldkB\n",`
`148`		`-(max_measured_stack_depth+1023) /1024);`
`149`		`-#endif`
`150`		`-}`
`151`		`-`
`152`		`-`
`153`	`83`	`/* ----------------------------------------------------------------`
`154`	`84`	`*proc_exit`
`155`	`85`	`*`
`@@ -171,9 +101,6 @@ proc_exit(int code)`
`171`	`101`	`/* Clean up everything that must be cleaned up */`
`172`	`102`	`proc_exit_prepare(code);`
`173`	`103`
`174`		`-/* report stack size to stderr */`
`175`		`-report_stack_size();`
`176`		`-`
`177`	`104`	`#ifdefPROFILE_PID_DIR`
`178`	`105`	`{`
`179`	`106`	`/*`

`‎src/backend/tcop/postgres.c`

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,9 +96,6 @@ intmax_stack_depth = 100;`
`96`	`96`	`/* wait N seconds to allow attach from a debugger */`
`97`	`97`	`intPostAuthDelay=0;`
`98`	`98`
`99`		`-/* Exported for use by proc_exit */`
`100`		`-longmax_measured_stack_depth=0;`
`101`		`-longmax_measured_register_stack_depth=0;`
`102`	`99`
`103`	`100`
`104`	`101`	`/* ----------------`
`@@ -3140,11 +3137,6 @@ stack_is_too_deep(void)`
`3140`	`3137`	`if (stack_depth<0)`
`3141`	`3138`	`stack_depth=-stack_depth;`
`3142`	`3139`
`3143`		`-/* Track max measured depth for reporting by proc_exit */`
`3144`		`-if (stack_depth>max_measured_stack_depth&&`
`3145`		`-stack_base_ptr!=NULL)`
`3146`		`-max_measured_stack_depth=stack_depth;`
`3147`		`-`
`3148`	`3140`	`/*`
`3149`	`3141`	`* Trouble?`
`3150`	`3142`	`*`
`@@ -3168,10 +3160,6 @@ stack_is_too_deep(void)`
`3168`	`3160`	`#if defined(__ia64__)\|\| defined(__ia64)`
`3169`	`3161`	`stack_depth= (long) (ia64_get_bsp()-register_stack_base_ptr);`
`3170`	`3162`
`3171`		`-if (stack_depth>max_measured_register_stack_depth&&`
`3172`		`-register_stack_base_ptr!=NULL)`
`3173`		`-max_measured_register_stack_depth=stack_depth;`
`3174`		`-`
`3175`	`3163`	`if (stack_depth>max_stack_depth_bytes&&`
`3176`	`3164`	`register_stack_base_ptr!=NULL)`
`3177`	`3165`	`return true;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit96112ee

File tree

2 files changed

2 files changed

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

`‎src/backend/tcop/postgres.c`

0 commit comments