diff --git a/include/haproxy/activity-t.h b/include/haproxy/activity-t.h index a0b30d4b2..4dc377d91 100644 --- a/include/haproxy/activity-t.h +++ b/include/haproxy/activity-t.h @@ -144,6 +144,7 @@ struct sched_activity { uint64_t cpu_time; uint64_t lat_time; uint64_t lkw_time; /* lock waiting time */ + uint64_t lkd_time; /* locked time */ }; #endif /* _HAPROXY_ACTIVITY_T_H */ diff --git a/src/activity.c b/src/activity.c index ba1143d06..c174ae034 100644 --- a/src/activity.c +++ b/src/activity.c @@ -758,6 +758,7 @@ static int cli_parse_set_profiling(char **args, char *payload, struct appctx *ap HA_ATOMIC_STORE(&sched_activity[i].cpu_time, 0); HA_ATOMIC_STORE(&sched_activity[i].lat_time, 0); HA_ATOMIC_STORE(&sched_activity[i].lkw_time, 0); + HA_ATOMIC_STORE(&sched_activity[i].lkd_time, 0); HA_ATOMIC_STORE(&sched_activity[i].func, NULL); HA_ATOMIC_STORE(&sched_activity[i].caller, NULL); } @@ -980,6 +981,7 @@ static int cli_io_handler_show_profiling(struct appctx *appctx) tmp_activity[i].cpu_time += tmp_activity[j].cpu_time; tmp_activity[i].lat_time += tmp_activity[j].lat_time; tmp_activity[i].lkw_time += tmp_activity[j].lkw_time; + tmp_activity[i].lkd_time += tmp_activity[j].lkd_time; tmp_activity[j].calls = 0; } } @@ -992,7 +994,7 @@ static int cli_io_handler_show_profiling(struct appctx *appctx) if (!ctx->linenum) chunk_appendf(&trash, "Tasks activity over %.3f sec till %.3f sec ago:\n" - " function calls cpu_tot cpu_avg lkw_avg lat_avg\n", + " function calls cpu_tot cpu_avg lkw_avg lkd_avg lat_avg\n", (prof_task_start_ns ? (prof_task_stop_ns ? prof_task_stop_ns : now_ns) - prof_task_start_ns : 0) / 1000000000.0, (prof_task_stop_ns ? now_ns - prof_task_stop_ns : 0) / 1000000000.0); @@ -1030,6 +1032,7 @@ static int cli_io_handler_show_profiling(struct appctx *appctx) print_time_short(&trash, " ", tmp_activity[i].cpu_time, ""); print_time_short(&trash, " ", tmp_activity[i].cpu_time / tmp_activity[i].calls, ""); print_time_short(&trash, " ", tmp_activity[i].lkw_time / tmp_activity[i].calls, ""); + print_time_short(&trash, " ", tmp_activity[i].lkd_time / tmp_activity[i].calls, ""); print_time_short(&trash, " ", tmp_activity[i].lat_time / tmp_activity[i].calls, ""); if (caller && !ctx->aggr && caller->what <= WAKEUP_TYPE_APPCTX_WAKEUP)