Prevent integer overflow with --progress >= 2148

hlinnaka · hlinnaka · commit 277279981fba · 2014-01-17T10:14:01.000+02:00
If --progress=2148 or higher was given, the calculation of the next time
to report overflowed, and pgbench would print a progress report very
frequently.

Kingter Wang
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -2974,7 +2974,7 @@ threadRun(void *arg)
 	/* for reporting progress: */
 	int64       thread_start = INSTR_TIME_GET_MICROSEC(thread->start_time);
 	int64		last_report = thread_start;
-	int64		next_report = last_report + progress * 1000000;
+	int64		next_report = last_report + (int64) progress * 1000000;
 	int64		last_count = 0, last_lats = 0, last_sqlats = 0, last_lags = 0;
 
 	AggVals		aggs;
@@ -3210,7 +3210,7 @@ threadRun(void *arg)
 				last_sqlats = sqlats;
 				last_lags = lags;
 				last_report = now;
-				next_report += progress * 1000000;
+				next_report += (int64) progress * 1000000;
 			}
 		}
 #else
@@ -3261,7 +3261,7 @@ threadRun(void *arg)
 				last_sqlats = sqlats;
 				last_lags = lags;
 				last_report = now;
-				next_report += progress * 1000000;
+				next_report += (int64) progress * 1000000;
 			}
 		}
 #endif /* PTHREAD_FORK_EMULATION */

Original file line number	Diff line number	Diff line change
`@@ -2974,7 +2974,7 @@ threadRun(void *arg)`
`2974`	`2974`	`/* for reporting progress: */`
`2975`	`2975`	`int64 thread_start = INSTR_TIME_GET_MICROSEC(thread->start_time);`
`2976`	`2976`	`int64 last_report = thread_start;`
`2977`		`- int64 next_report = last_report + progress * 1000000;`
	`2977`	`+ int64 next_report = last_report + (int64) progress * 1000000;`
`2978`	`2978`	`int64 last_count = 0, last_lats = 0, last_sqlats = 0, last_lags = 0;`
`2979`	`2979`
`2980`	`2980`	`AggVals aggs;`
`@@ -3210,7 +3210,7 @@ threadRun(void *arg)`
`3210`	`3210`	`last_sqlats = sqlats;`
`3211`	`3211`	`last_lags = lags;`
`3212`	`3212`	`last_report = now;`
`3213`		`- next_report += progress * 1000000;`
	`3213`	`+ next_report += (int64) progress * 1000000;`
`3214`	`3214`	`}`
`3215`	`3215`	`}`
`3216`	`3216`	`#else`
`@@ -3261,7 +3261,7 @@ threadRun(void *arg)`
`3261`	`3261`	`last_sqlats = sqlats;`
`3262`	`3262`	`last_lags = lags;`
`3263`	`3263`	`last_report = now;`
`3264`		`- next_report += progress * 1000000;`
	`3264`	`+ next_report += (int64) progress * 1000000;`
`3265`	`3265`	`}`
`3266`	`3266`	`}`
`3267`	`3267`	`#endif /* PTHREAD_FORK_EMULATION */`