NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit93b57eb

committed

trace.patch (compilation error) the gettimeofday doesn't compile under Linux with glibc2 because the DST_NONE constant is no more defined. It seems that this code (written by me) has always be wrong but for some reason working.From: Massimo Dal Zotto <dz@cs.unitn.it>

1 parentdbaab4a commit93b57ebCopy full SHA for 93b57eb

File tree

2 files changed

-11

lines changed

src
- backend/utils/misc
  - trace.c
- include/utils
  - trace.h

2 files changed

-11

lines changed

`‎src/backend/utils/misc/trace.c`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@`
`11`	`11`
`12`	`12`	`#include<stdio.h>`
`13`	`13`	`#include<string.h>`
`14`		`-#include<time.h>`
`15`	`14`	`#include<stdarg.h>`
`16`	`15`	`#include<unistd.h>`
`17`	`16`	`#include<signal.h>`
	`17`	`+#include<sys/time.h>`
`18`	`18`	`#include<sys/types.h>`
`19`	`19`	`#include<sys/stat.h>`
`20`	`20`	`#include<fcntl.h>`
`@@ -47,7 +47,7 @@`
`47`	`47`	`* Trace option names, must match the constants in trace_opts[].`
`48`	`48`	`*/`
`49`	`49`	`staticchar*opt_names[]= {`
`50`		`-"all",`
	`50`	`+"all",/* 0=trace some, 1=trace all, -1=trace none */`
`51`	`51`	`"verbose",`
`52`	`52`	`"query",`
`53`	`53`	`"plan",`
`@@ -73,6 +73,8 @@ static char *opt_names[] = {`
`73`	`73`	`"syslog",/* use syslog for error messages */`
`74`	`74`	`"hostlookup",/* enable hostname lookup in ps_status */`
`75`	`75`	`"showportnumber",/* show port number in ps_status */`
	`76`	`+`
	`77`	`+/* NUM_PG_OPTIONS // must be the last item of enum */`
`76`	`78`	`};`
`77`	`79`
`78`	`80`	`/*`
`@@ -92,7 +94,6 @@ tprintf(int flag, const char *fmt,...)`
`92`	`94`
`93`	`95`	`#ifdefUSE_SYSLOG`
`94`	`96`	`intlog_level;`
`95`		`-`
`96`	`97`	`#endif`
`97`	`98`
`98`	`99`	`if ((flag==TRACE_ALL)\|\| (pg_options[TRACE_ALL]>0))`
`@@ -208,7 +209,6 @@ write_syslog(int level, char *line)`
`208`	`209`	`syslog(level,"%s",line);`
`209`	`210`	`}`
`210`	`211`	`}`
`211`		`-`
`212`	`212`	`#endif`
`213`	`213`
`214`	`214`	`#ifdefELOG_TIMESTAMPS`
`@@ -219,24 +219,24 @@ char *`
`219`	`219`	`tprintf_timestamp()`
`220`	`220`	`{`
`221`	`221`	`structtimevaltv;`
	`222`	`+structtimezonetz= {0,0 };`
`222`	`223`	`structtm*time;`
`223`	`224`	`time_ttm;`
`224`	`225`	`staticchartimestamp[32],`
`225`	`226`	`pid[8];`
`226`	`227`
`227`		`-gettimeofday(&tv,DST_NONE);`
	`228`	`+gettimeofday(&tv,&tz);`
`228`	`229`	`tm=tv.tv_sec;`
`229`	`230`	`time=localtime(&tm);`
`230`	`231`
`231`	`232`	`sprintf(pid,"[%d]",MyProcPid);`
`232`	`233`	`sprintf(timestamp,"%02d%02d%02d.%02d:%02d:%02d.%03d %7s ",`
`233`	`234`	`time->tm_year,time->tm_mon+1,time->tm_mday,`
`234`	`235`	`time->tm_hour,time->tm_min,time->tm_sec,`
`235`		`-tv.tv_usec /1000,pid);`
	`236`	`+(int) (tv.tv_usec/1000),pid);`
`236`	`237`
`237`	`238`	`returntimestamp;`
`238`	`239`	`}`
`239`		`-`
`240`	`240`	`#endif`
`241`	`241`
`242`	`242`	`#ifdefNOT_USED`

`‎src/include/utils/trace.h`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,8 @@ extern void read_pg_options(SIGNAL_ARGS);`
`37`	`37`	`* Trace options, used as index into pg_options.`
`38`	`38`	`* Must match the constants in pg_options[].`
`39`	`39`	`*/`
`40`		`-enumpg_option_enum`
`41`		`-{`
`42`		`-TRACE_ALL,/* 0=trace some, 1=trace all, -1=trace`
`43`		`- * none */`
	`40`	`+enumpg_option_enum {`
	`41`	`+TRACE_ALL,/* 0=trace some, 1=trace all, -1=trace none */`
`44`	`42`	`TRACE_VERBOSE,`
`45`	`43`	`TRACE_QUERY,`
`46`	`44`	`TRACE_PLAN,`

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!

Commit93b57eb

File tree

2 files changed

2 files changed

`‎src/backend/utils/misc/trace.c`

`‎src/include/utils/trace.h`

0 commit comments