Commit9c26980

committed

Replace unportable and overflow-prone use of 'long long' with safer

'double' arithmetic, per recent discussion.

1 parent80af69c commit9c26980Copy full SHA for 9c26980

File tree

-9

lines changed

-9

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -978,7 +978,7 @@ main(int argc, char *argv[])`
`978`	`978`	`db_info*dbs;`
`979`	`979`	`tbl_info*tbl;`
`980`	`980`	`PGresult*res=NULL;`
`981`		`-long longdiff=0;`
	`981`	`+doublediff;`
`982`	`982`	`structtimevalnow,`
`983`	`983`	`then;`
`984`	`984`
`@@ -1151,14 +1151,14 @@ main(int argc, char *argv[])`
`1151`	`1151`
`1152`	`1152`	`/* Figure out how long to sleep etc ... */`
`1153`	`1153`	`gettimeofday(&now,0);`
`1154`		`-diff= (now.tv_sec-then.tv_sec)*1000000+ (now.tv_usec-then.tv_usec);`
	`1154`	`+diff= (int) (now.tv_sec-then.tv_sec)*1000000.0+ (int) (now.tv_usec-then.tv_usec);`
`1155`	`1155`
`1156`		`-sleep_secs=args->sleep_base_value+args->sleep_scaling_factor*diff /1000000;`
	`1156`	`+sleep_secs=args->sleep_base_value+args->sleep_scaling_factor*diff /1000000.0;`
`1157`	`1157`	`loops++;`
`1158`	`1158`	`if (args->debug >=2)`
`1159`	`1159`	`{`
`1160`	`1160`	`sprintf(logbuffer,`
`1161`		`-"%i All DBs checked in: %lld usec, will sleep for %i secs.",`
	`1161`	`+"%i All DBs checked in: %.0f usec, will sleep for %i secs.",`
`1162`	`1162`	`loops,diff,sleep_secs);`
`1163`	`1163`	`log_entry(logbuffer);`
`1164`	`1164`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.29 2003/11/29 19:51:35 pgsql Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.30 2003/12/07 19:55:58 tgl Exp $`
`3`	`3`	`*`
`4`	`4`	`* pgbench: a simple TPC-B like benchmark program for PostgreSQL`
`5`	`5`	`* written by Tatsuo Ishii`
`@@ -261,14 +261,14 @@ doOne(CState * state, int n, int debug, int ttype)`
`261`	`261`	`*/`
`262`	`262`	`if (use_log)`
`263`	`263`	`{`
`264`		`-long longdiff;`
	`264`	`+doublediff;`
`265`	`265`	`structtimevalnow;`
`266`	`266`
`267`	`267`	`gettimeofday(&now,0);`
`268`		`-diff= (now.tv_sec-st->txn_begin.tv_sec)*1000000+`
`269`		`-(now.tv_usec-st->txn_begin.tv_usec);`
	`268`	`+diff= (int) (now.tv_sec-st->txn_begin.tv_sec)*1000000.0+`
	`269`	`+(int) (now.tv_usec-st->txn_begin.tv_usec);`
`270`	`270`
`271`		`-fprintf(LOGFILE,"%d %d %lld\n",st->id,st->cnt,diff);`
	`271`	`+fprintf(LOGFILE,"%d %d %.0f\n",st->id,st->cnt,diff);`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`res=PQgetResult(st->con);`

Comments

(0)