@@ -3447,8 +3447,8 @@ main(int argc, char **argv)
3447
3447
3448
3448
/* thread level stats */
3449
3449
throttle_lag += thread -> throttle_lag ;
3450
- throttle_latency_skipped = threads -> throttle_latency_skipped ;
3451
- latency_late = thread -> latency_late ;
3450
+ throttle_latency_skipped + = threads -> throttle_latency_skipped ;
3451
+ latency_late + = thread -> latency_late ;
3452
3452
if (throttle_lag_max > thread -> throttle_lag_max )
3453
3453
throttle_lag_max = thread -> throttle_lag_max ;
3454
3454
INSTR_TIME_ADD (conn_total_time , thread -> conn_time );
@@ -3759,15 +3759,17 @@ threadRun(void *arg)
3759
3759
}
3760
3760
3761
3761
for (i = 0 ; i < progress_nthreads ; i ++ )
3762
+ {
3763
+ skipped += thread [i ].throttle_latency_skipped ;
3762
3764
lags += thread [i ].throttle_lag ;
3765
+ }
3763
3766
3764
3767
total_run = (now - thread_start ) / 1000000.0 ;
3765
3768
tps = 1000000.0 * (count - last_count ) / run ;
3766
3769
latency = 0.001 * (lats - last_lats ) / (count - last_count );
3767
3770
sqlat = 1.0 * (sqlats - last_sqlats ) / (count - last_count );
3768
3771
stdev = 0.001 * sqrt (sqlat - 1000000.0 * latency * latency );
3769
3772
lag = 0.001 * (lags - last_lags ) / (count - last_count );
3770
- skipped = thread -> throttle_latency_skipped - last_skipped ;
3771
3773
3772
3774
fprintf (stderr ,
3773
3775
"progress: %.1f s, %.1f tps, "
@@ -3777,7 +3779,8 @@ threadRun(void *arg)
3777
3779
{
3778
3780
fprintf (stderr , ", lag %.3f ms" , lag );
3779
3781
if (latency_limit )
3780
- fprintf (stderr , ", " INT64_FORMAT " skipped" , skipped );
3782
+ fprintf (stderr , ", " INT64_FORMAT " skipped" ,
3783
+ skipped - last_skipped );
3781
3784
}
3782
3785
fprintf (stderr , "\n" );
3783
3786
@@ -3786,7 +3789,7 @@ threadRun(void *arg)
3786
3789
last_sqlats = sqlats ;
3787
3790
last_lags = lags ;
3788
3791
last_report = now ;
3789
- last_skipped = thread -> throttle_latency_skipped ;
3792
+ last_skipped = skipped ;
3790
3793
3791
3794
/*
3792
3795
* Ensure that the next report is in the future, in case
0 commit comments