70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
|
From 91ca85b8d8539992a6862a1a54c1e7b9d734b151 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Li Feng <lifeng2221dd1@zoho.com.cn>
|
||
|
|
Date: Thu, 8 Apr 2021 15:41:18 +0800
|
||
|
|
Subject: [PATCH 071/104] stats: show cpu usage normal when stats with
|
||
|
|
--no-stream
|
||
|
|
|
||
|
|
Signed-off-by: Li Feng <lifeng2221dd1@zoho.com.cn>
|
||
|
|
---
|
||
|
|
src/cmd/isula/extend/stats.c | 22 +++++++++++++++-------
|
||
|
|
1 file changed, 15 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cmd/isula/extend/stats.c b/src/cmd/isula/extend/stats.c
|
||
|
|
index 724cf381..b35156a6 100644
|
||
|
|
--- a/src/cmd/isula/extend/stats.c
|
||
|
|
+++ b/src/cmd/isula/extend/stats.c
|
||
|
|
@@ -192,13 +192,15 @@ static void stats_output(const struct client_arguments *args, struct isula_stats
|
||
|
|
{
|
||
|
|
size_t i;
|
||
|
|
|
||
|
|
- printf(TERMCLEAR);
|
||
|
|
- stats_print_header();
|
||
|
|
- for (i = 0; i < (*response)->container_num; i++) {
|
||
|
|
- stats_print(&((*response)->container_stats[i]));
|
||
|
|
- printf("\n");
|
||
|
|
+ if (g_oldstats != NULL) {
|
||
|
|
+ printf(TERMCLEAR);
|
||
|
|
+ stats_print_header();
|
||
|
|
+ for (i = 0; i < (*response)->container_num; i++) {
|
||
|
|
+ stats_print(&((*response)->container_stats[i]));
|
||
|
|
+ printf("\n");
|
||
|
|
+ }
|
||
|
|
+ fflush(stdout);
|
||
|
|
}
|
||
|
|
- fflush(stdout);
|
||
|
|
|
||
|
|
isula_stats_response_free(g_oldstats);
|
||
|
|
g_oldstats = *response;
|
||
|
|
@@ -222,6 +224,7 @@ static int client_stats_mainloop(const struct client_arguments *args, const stru
|
||
|
|
config = get_connect_config(args);
|
||
|
|
|
||
|
|
while (1) {
|
||
|
|
+ bool first_frame = false;
|
||
|
|
struct isula_stats_response *response = NULL;
|
||
|
|
response = util_common_calloc_s(sizeof(struct isula_stats_response));
|
||
|
|
if (response == NULL) {
|
||
|
|
@@ -239,6 +242,10 @@ static int client_stats_mainloop(const struct client_arguments *args, const stru
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (g_oldstats == NULL) {
|
||
|
|
+ first_frame = true;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
if (args->original) {
|
||
|
|
stats_output_original(args, &response);
|
||
|
|
isula_stats_response_free(response);
|
||
|
|
@@ -247,7 +254,8 @@ static int client_stats_mainloop(const struct client_arguments *args, const stru
|
||
|
|
|
||
|
|
stats_output(args, &response);
|
||
|
|
isula_stats_response_free(response);
|
||
|
|
- if (args->nostream) {
|
||
|
|
+
|
||
|
|
+ if (args->nostream && !first_frame) {
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|