Fix millisecond calculation for millisecs_diff()

dummy · dummy · commit bfcba4906fa5 · 2020-08-26T16:22:27.000+09:00
Previously, millisecs_diff() did not return milliseconds correctly, so it was not collecting according to the period settings for the profile and history.
diff --git a/collector.c b/collector.c
@@ -306,11 +306,11 @@ static int64
 millisecs_diff(TimestampTz tz1, TimestampTz tz2)
 {
 	long	secs;
-	int		millisecs;
+	int		microsecs;
 
-	TimestampDifference(tz1, tz2, &secs, &millisecs);
+	TimestampDifference(tz1, tz2, &secs, &microsecs);
 
-	return secs * 1000 + millisecs;
+	return secs * 1000 + microsecs / 1000;
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -306,11 +306,11 @@ static int64`
`306`	`306`	`millisecs_diff(TimestampTz tz1, TimestampTz tz2)`
`307`	`307`	`{`
`308`	`308`	`long secs;`
`309`		`- int millisecs;`
	`309`	`+ int microsecs;`
`310`	`310`
`311`		`- TimestampDifference(tz1, tz2, &secs, &millisecs);`
	`311`	`+ TimestampDifference(tz1, tz2, &secs, &microsecs);`
`312`	`312`
`313`		`- return secs * 1000 + millisecs;`
	`313`	`+ return secs * 1000 + microsecs / 1000;`
`314`	`314`
`315`	`315`	`}`
`316`	`316`