Skip to content

Commit 03a3be5

Browse files
committed
The ff_traffic and ff_top's -P argument support bigger than 38.
1 parent c6b7b89 commit 03a3be5

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

tools/top/top.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ int main(int argc, char **argv)
5757
float sys, usr, idle;
5858
float psys, pusr, pidle;
5959
unsigned long loops, ploops;
60+
int title_line = 40;
6061

6162
ff_ipc_init();
6263

@@ -76,6 +77,8 @@ int main(int argc, char **argv)
7677
ff_ipc_exit();
7778
return -1;
7879
}
80+
if (max_proc_id > title_line - 2)
81+
title_line = max_proc_id + 2;
7982
break;
8083
case 'd':
8184
delay = atoi(optarg) ?: 1;
@@ -99,7 +102,7 @@ int main(int argc, char **argv)
99102
return -1;
100103
}
101104

102-
if (i % 40 == 0) {
105+
if (i % title_line == 0) {
103106
printf("|---------|---------|---------|---------------|\n");
104107
printf("|%9s|%9s|%9s|%15s|\n", "idle", "sys", "usr", "loop");
105108
printf("|---------|---------|---------|---------------|\n");
@@ -117,7 +120,7 @@ int main(int argc, char **argv)
117120
/*
118121
* get and show cpu usage from proc_id to max_proc_id.
119122
*/
120-
if (i % (40 / (max_proc_id - proc_id + 2)) == 0) {
123+
if (i % (title_line / (max_proc_id - proc_id + 2)) == 0) {
121124
printf("|---------|---------|---------|"
122125
"---------|---------------|\n");
123126
printf("|%9s|%9s|%9s|%9s|%15s|\n",

tools/traffic/traffic.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ int main(int argc, char **argv)
5757
int proc_id = 0, max_proc_id = -1;
5858
uint64_t rxp, rxb, txp, txb;
5959
uint64_t prxp, prxb, ptxp, ptxb;
60+
int title_line = 40;
6061

6162
ff_ipc_init();
6263

@@ -77,6 +78,8 @@ int main(int argc, char **argv)
7778
ff_ipc_exit();
7879
return -1;
7980
}
81+
if (max_proc_id > title_line - 2)
82+
title_line = max_proc_id + 2;
8083
break;
8184
case 'd':
8285
delay = atoi(optarg) ?: 1;
@@ -140,7 +143,7 @@ int main(int argc, char **argv)
140143
return -1;
141144
}
142145

143-
if (i % 40 == 0) {
146+
if (i % title_line == 0) {
144147
printf("|--------------------|--------------------|");
145148
printf("--------------------|--------------------|\n");
146149
printf("|%20s|%20s|%20s|%20s|\n", "rx packets", "rx bytes",
@@ -161,7 +164,7 @@ int main(int argc, char **argv)
161164
/*
162165
* get and show traffic from proc_id to max_proc_id.
163166
*/
164-
if (i % (40 / (max_proc_id - proc_id + 2)) == 0) {
167+
if (i % (title_line / (max_proc_id - proc_id + 2)) == 0) {
165168
printf("|---------|--------------------|--------------------|"
166169
"--------------------|--------------------|\n");
167170
printf("|%9s|%20s|%20s|%20s|%20s|\n",

0 commit comments

Comments
 (0)