@@ -2334,9 +2334,11 @@ doLog(TState *thread, CState *st, instr_time *now,
2334
2334
while (agg -> start_time + agg_interval < INSTR_TIME_GET_DOUBLE (* now ))
2335
2335
{
2336
2336
/* print aggregated report to logfile */
2337
- fprintf (logfile ,"%ld " INT64_FORMAT " %.0f %.0f %.0f %.0f" ,
2337
+ fprintf (logfile ,"%ld " INT64_FORMAT "" INT64_FORMAT " " INT64_FORMAT " %.0f %.0f %.0f %.0f" ,
2338
2338
agg -> start_time ,
2339
2339
agg -> cnt ,
2340
+ agg -> serialization_failures ,
2341
+ agg -> deadlock_failures ,
2340
2342
agg -> latency .sum ,
2341
2343
agg -> latency .sum2 ,
2342
2344
agg -> latency .min ,
@@ -2351,8 +2353,6 @@ doLog(TState *thread, CState *st, instr_time *now,
2351
2353
if (latency_limit )
2352
2354
fprintf (logfile ," " INT64_FORMAT ,agg -> skipped );
2353
2355
}
2354
- fprintf (logfile ," " INT64_FORMAT " " INT64_FORMAT ,
2355
- agg -> serialization_failures ,agg -> deadlock_failures );
2356
2356
fputc ('\n' ,logfile );
2357
2357
2358
2358
/* reset data and move to next interval */
@@ -4651,8 +4651,14 @@ threadRun(void *arg)
4651
4651
sprintf (tbuf ,"%.1f s" ,total_run );
4652
4652
4653
4653
fprintf (stderr ,
4654
- "progress: %s, %.1f tps, lat %.3f ms stddev %.3f" ,
4655
- tbuf ,tps ,latency ,stdev );
4654
+ "progress: %s, %.1f tps, " INT64_FORMAT " serialization failures transactions, " INT64_FORMAT " deadlock failures transactions, lat %.3f ms stddev %.3f" ,
4655
+ tbuf ,
4656
+ tps ,
4657
+ (cur .serialization_failures -
4658
+ last .serialization_failures ),
4659
+ (cur .deadlock_failures - last .deadlock_failures ),
4660
+ latency ,
4661
+ stdev );
4656
4662
4657
4663
if (throttle_delay )
4658
4664
{
@@ -4661,12 +4667,6 @@ threadRun(void *arg)
4661
4667
fprintf (stderr ,", " INT64_FORMAT " skipped" ,
4662
4668
cur .skipped - last .skipped );
4663
4669
}
4664
- fprintf (stderr ,", " INT64_FORMAT " serialization failures" ,
4665
- (cur .serialization_failures -
4666
- last .serialization_failures ));
4667
- fprintf (stderr ,", " INT64_FORMAT " deadlock failures" ,
4668
- (cur .deadlock_failures - last .deadlock_failures ));
4669
-
4670
4670
fprintf (stderr ,"\n" );
4671
4671
4672
4672
last = cur ;