@@ -323,6 +323,10 @@ typedef struct
323323char * argv [MAX_ARGS ];/* command word list */
324324PgBenchExpr * expr ;/* parsed expression, if needed */
325325SimpleStats stats ;/* time spent in this command */
326+ int64 serialization_failures ;/* number of serialization failures in
327+ * this command */
328+ int64 deadlock_failures ;/* number of deadlock failures in this
329+ * command */
326330}Command ;
327331
328332typedef struct ParsedScript
@@ -1970,6 +1974,15 @@ doCustom(TState *thread, CState *st, StatsData *agg)
19701974INSTR_TIME_GET_DOUBLE (st -> stmt_begin ));
19711975}
19721976
1977+ /*
1978+ * accumulate per-command serialization / deadlock failures count in
1979+ * thread-local data structure
1980+ */
1981+ if (serialization_failure )
1982+ commands [st -> state ]-> serialization_failures ++ ;
1983+ if (deadlock_failure )
1984+ commands [st -> state ]-> deadlock_failures ++ ;
1985+
19731986/* transaction finished: calculate latency and log the transaction */
19741987if (commands [st -> state + 1 ]== NULL )
19751988{
@@ -2877,6 +2890,8 @@ process_sql_command(PQExpBuffer buf, const char *source)
28772890my_command -> type = SQL_COMMAND ;
28782891my_command -> argc = 0 ;
28792892initSimpleStats (& my_command -> stats );
2893+ my_command -> serialization_failures = 0 ;
2894+ my_command -> deadlock_failures = 0 ;
28802895
28812896/*
28822897 * If SQL command is multi-line, we only want to save the first line as
@@ -2946,6 +2961,8 @@ process_backslash_command(PsqlScanState sstate, const char *source)
29462961my_command -> type = META_COMMAND ;
29472962my_command -> argc = 0 ;
29482963initSimpleStats (& my_command -> stats );
2964+ my_command -> serialization_failures = 0 ;
2965+ my_command -> deadlock_failures = 0 ;
29492966
29502967/* Save first word (command name) */
29512968j = 0 ;
@@ -3462,6 +3479,7 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
34623479if (per_script_stats || latency_limit || is_latencies )
34633480{
34643481int i ;
3482+ Command * * commands ;
34653483
34663484for (i = 0 ;i < num_scripts ;i ++ )
34673485{
@@ -3497,20 +3515,26 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
34973515if (num_scripts > 1 )
34983516printSimpleStats (" - latency" ,& sql_script [i ].stats .latency );
34993517
3500- /* Report per-command latencies */
3518+ /*
3519+ * Report per-command serialization / deadlock failures and
3520+ * latencies (if needed). */
35013521if (is_latencies )
3502- {
3503- Command * * commands ;
3504-
3505- printf (" - statement latencies in milliseconds:\n" );
3522+ printf (" - statement serialization, deadlock failures and latencies in milliseconds:\n" );
3523+ else
3524+ printf (" - statement serialization and deadlock failures:\n" );
35063525
3507- for (commands = sql_script [i ].commands ;
3508- * commands != NULL ;
3509- commands ++ )
3510- printf (" %11.3f %s\n" ,
3526+ for (commands = sql_script [i ].commands ;
3527+ * commands != NULL ;
3528+ commands ++ )
3529+ {
3530+ printf (" %25" INT64_MODIFIER "d %25" INT64_MODIFIER "d" ,
3531+ (* commands )-> serialization_failures ,
3532+ (* commands )-> deadlock_failures );
3533+ if (is_latencies )
3534+ printf (" %11.3f" ,
351135351000.0 * (* commands )-> stats .sum /
3512- (* commands )-> stats .count ,
3513- * commands )-> line );
3536+ (* commands )-> stats .count );
3537+ printf ( " %s\n" , (* commands )-> line );
35143538}
35153539}
35163540}
@@ -3869,6 +3893,7 @@ main(int argc, char **argv)
38693893case 'I' :
38703894{
38713895benchmarking_option_set = true;
3896+ per_script_stats = true;
38723897
38733898for (default_isolation_level = 0 ;
38743899default_isolation_level < NUM_DEFAULT_ISOLATION_LEVEL ;
