FOSS/nethogs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes issue #110 - dynamic DEV column length, MIN=5, MAX=15

Browse Source
This commit is contained in:
PAVAN
2018-05-03 19:42:04 +05:30
parent 0984d92d90
commit a251024bff
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/cui.cpp
View File

@@ -176,7 +176,7 @@ static void mvaddstr_truncate_cmdline(int row, int col, const char *progname,
}
}
void Line::show(int row, unsigned int proglen,unsigned int devlen) {
void Line::show(int row, unsigned int proglen, unsigned int devlen) {
assert(m_pid >= 0);
assert(m_pid <= PID_MAX);
@@ -225,6 +225,25 @@ void Line::log() {
std::cout << '/' << m_pid << '/' << m_uid << "\t" << sent_value << "\t" << recv_value << std::endl;
}
int get_devlen(Line *lines[], int nproc, int rows)
{
int devlen = MIN_COLUMN_WIDTH_DEV; int curlen;
for (int i = 0; i < nproc; i++) {
if (i + 3 < rows)
{
curlen = strlen(lines[i]->devicename);
if(curlen > devlen)
curlen = devlen;
}
}
if(devlen > MAX_COLUMN_WIDTH_DEV)
devlen = MAX_COLUMN_WIDTH_DEV;
return devlen;
}
int GreatestFirst(const void *ma, const void *mb) {
Line **pa = (Line **)ma;
Line **pb = (Line **)mb;
@@ -336,21 +355,8 @@ void show_ncurses(Line *lines[], int nproc) {
cols = PROGNAME_WIDTH;
//issue #110 - dynamic length devicename
int devlen = MIN_COLUMN_WIDTH_DEV; int curlen;
for (int i = 0; i < nproc; i++) {
if (i + 3 < rows)
{
curlen = strlen(lines[i]->devicename);
if(curlen > devlen)
curlen = devlen;
}
}
if(devlen > MAX_COLUMN_WIDTH_DEV)
devlen = MAX_COLUMN_WIDTH_DEV;
//issue #110 - maximum devicename length min=5, max=15
int devlen = get_devlen(lines, nproc, rows);
proglen = cols - 50 - devlen;