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

Add MB/s and GB/s view modes

Browse Source 
- Refactored units presentation into a lookup table
- Other minor refactoring
- Updated man page
- Cleaned up trailing white space in the vicinity
This commit is contained in:
Peter M. Petrakis
2018-12-02 11:47:33 -05:00
parent d5c5078b4a
commit 677baffe6a
6 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/nethogs.8
View File

@@ -58,7 +58,7 @@ to monitor. By default eth0 is being used
.SH "INTERACTIVE CONTROL"
.TP
m
cycle between display modes (KB/s, KB, B, MB)
cycle between display modes (KB/s, KB, B, MB, MB/s, GB/s)
.TP
l
display command line

29
src/cui.cpp
View File

@@ -64,6 +64,9 @@ const char *COLUMN_FORMAT_PID = "%7d";
const char *COLUMN_FORMAT_SENT = "%11.3f";
const char *COLUMN_FORMAT_RECEIVED = "%11.3f";
// All descriptions are padded to 6 characters in length with spaces
const char* const desc_view_mode[VIEWMODE_COUNT] = {"KB/sec", "KB ", "B ", "MB ", "MB/sec", "GB/sec"};
class Line {
public:
Line(const char *name, const char *cmdline, double n_recv_value,
@@ -207,15 +210,7 @@ void Line::show(int row, unsigned int proglen, unsigned int devlen) {
mvprintw(row, column_offset_sent, COLUMN_FORMAT_SENT, sent_value);
mvprintw(row, column_offset_received, COLUMN_FORMAT_RECEIVED, recv_value);
if (viewMode == VIEWMODE_KBPS) {
mvaddstr(row, column_offset_unit, "KB/sec");
} else if (viewMode == VIEWMODE_TOTAL_MB) {
mvaddstr(row, column_offset_unit, "MB ");
} else if (viewMode == VIEWMODE_TOTAL_KB) {
mvaddstr(row, column_offset_unit, "KB ");
} else if (viewMode == VIEWMODE_TOTAL_B) {
mvaddstr(row, column_offset_unit, "B ");
}
mvaddstr(row, column_offset_unit, desc_view_mode[viewMode]);
}
void Line::log() {
@@ -381,15 +376,7 @@ void show_ncurses(Line *lines[], int nproc) {
int totalrow = std::min(rows - 1, 3 + 1 + i);
mvprintw(totalrow, 0, " TOTAL %-*.*s %-*.*s %11.3f %11.3f ",
proglen, proglen, "", devlen,devlen, "", sent_global, recv_global);
if (viewMode == VIEWMODE_KBPS) {
mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, "KB/sec ");
} else if (viewMode == VIEWMODE_TOTAL_B) {
mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, "B ");
} else if (viewMode == VIEWMODE_TOTAL_KB) {
mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, "KB ");
} else if (viewMode == VIEWMODE_TOTAL_MB) {
mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, "MB ");
}
mvprintw(3 + 1 + i, cols - COLUMN_WIDTH_UNIT, desc_view_mode[viewMode]);
attroff(A_REVERSE);
mvprintw(totalrow + 1, 0, "");
refresh();
@@ -400,7 +387,7 @@ void do_refresh() {
refreshconninode();
refreshcount++;
if (viewMode == VIEWMODE_KBPS) {
if (viewMode == VIEWMODE_KBPS || viewMode == VIEWMODE_MBPS || viewMode == VIEWMODE_GBPS) {
remove_timed_out_processes();
}
@@ -425,6 +412,10 @@ void do_refresh() {
if (viewMode == VIEWMODE_KBPS) {
curproc->getVal()->getkbps(&value_recv, &value_sent);
} else if (viewMode == VIEWMODE_MBPS) {
curproc->getVal()->getmbps(&value_recv, &value_sent);
} else if (viewMode == VIEWMODE_GBPS) {
curproc->getVal()->getgbps(&value_recv, &value_sent);
} else if (viewMode == VIEWMODE_TOTAL_KB) {
curproc->getVal()->gettotalkb(&value_recv, &value_sent);
} else if (viewMode == VIEWMODE_TOTAL_MB) {

4
src/main.cpp
View File

@@ -35,7 +35,7 @@ static void help(bool iserror) {
output << " -d : delay for update refresh rate in seconds. default "
"is 1.\n";
output << " -v : view mode (0 = KB/s, 1 = total KB, 2 = total B, 3 "
"= total MB). default is 0.\n";
"= total MB, 4 = MB/s, 5 = GB/s). default is 0.\n";
output << " -c : number of updates. default is 0 (unlimited).\n";
output << " -t : tracemode.\n";
// output << " -f : format of packets on interface, default is
@@ -55,7 +55,7 @@ static void help(bool iserror) {
output << " s: sort by SENT traffic\n";
output << " r: sort by RECEIVE traffic\n";
output << " l: display command line\n";
output << " m: switch between total (KB, B, MB) and KB/s mode\n";
output << " m: switch between total (KB, B, MB) and throughput (KB/s, MB/s, GB/s) mode\n";
}
void quit_cb(int /* i */) {

14
src/nethogs.h
View File

@@ -63,11 +63,15 @@
#define PROGNAME_WIDTH 512
// viewMode: how to represent numbers
#define VIEWMODE_KBPS 0
#define VIEWMODE_TOTAL_KB 1
#define VIEWMODE_TOTAL_B 2
#define VIEWMODE_TOTAL_MB 3
#define VIEWMODE_COUNT 4
enum {
VIEWMODE_KBPS,
VIEWMODE_TOTAL_KB,
VIEWMODE_TOTAL_B,
VIEWMODE_TOTAL_MB,
VIEWMODE_MBPS,
VIEWMODE_GBPS,
VIEWMODE_COUNT
};
#define NORETURN __attribute__((__noreturn__))

55
src/process.cpp
View File

@@ -65,10 +65,16 @@ Process *unknownudp;
Process *unknownip;
ProcList *processes;
float tomb(u_int64_t bytes) { return ((double)bytes) / 1024 / 1024; }
float tokb(u_int64_t bytes) { return ((double)bytes) / 1024; }
#define KB (1UL << 10)
#define MB (1UL << 20)
#define GB (1UL << 30)
float tokbps(u_int64_t bytes) { return (((double)bytes) / PERIOD) / 1024; }
float tomb(u_int64_t bytes) { return ((double)bytes) / MB; }
float tokb(u_int64_t bytes) { return ((double)bytes) / KB; }
float tokbps(u_int64_t bytes) { return (((double)bytes) / PERIOD) / KB; }
float tombps(u_int64_t bytes) { return (((double)bytes) / PERIOD) / MB; }
float togbps(u_int64_t bytes) { return (((double)bytes) / PERIOD) / GB; }
void process_init() {
unknowntcp = new Process(0, "", "unknown TCP");
@@ -96,25 +102,23 @@ int Process::getLastPacket() {
return lastpacket;
}
/** Get the kb/s values for this process */
void Process::getkbps(float *recvd, float *sent) {
u_int64_t sum_sent = 0, sum_recv = 0;
/* walk though all this process's connections, and sum
/** get total values for this process for only active connections */
static void sum_active_connections(Process* process_ptr, u_int64_t& sum_sent, u_int64_t& sum_recv) {
/* walk though all process_ptr process's connections, and sum
* them up */
ConnList *curconn = this->connections;
ConnList *curconn = process_ptr->connections;
ConnList *previous = NULL;
while (curconn != NULL) {
if (curconn->getVal()->getLastPacket() <= curtime.tv_sec - CONNTIMEOUT) {
/* capture sent and received totals before deleting */
this->sent_by_closed_bytes += curconn->getVal()->sumSent;
this->rcvd_by_closed_bytes += curconn->getVal()->sumRecv;
process_ptr->sent_by_closed_bytes += curconn->getVal()->sumSent;
process_ptr->rcvd_by_closed_bytes += curconn->getVal()->sumRecv;
/* stalled connection, remove. */
ConnList *todelete = curconn;
Connection *conn_todelete = curconn->getVal();
curconn = curconn->getNext();
if (todelete == this->connections)
this->connections = curconn;
if (todelete == process_ptr->connections)
process_ptr->connections = curconn;
if (previous != NULL)
previous->setNext(curconn);
delete (todelete);
@@ -128,10 +132,35 @@ void Process::getkbps(float *recvd, float *sent) {
curconn = curconn->getNext();
}
}
}
/** Get the kb/s values for this process */
void Process::getkbps(float *recvd, float *sent) {
u_int64_t sum_sent = 0, sum_recv = 0;
sum_active_connections(this, sum_sent, sum_recv);
*recvd = tokbps(sum_recv);
*sent = tokbps(sum_sent);
}
/** Get the mb/s values for this process */
void Process::getmbps(float *recvd, float *sent) {
u_int64_t sum_sent = 0, sum_recv = 0;
sum_active_connections(this, sum_sent, sum_recv);
*recvd = tombps(sum_recv);
*sent = tombps(sum_sent);
}
/** Get the gb/s values for this process */
void Process::getgbps(float *recvd, float *sent) {
u_int64_t sum_sent = 0, sum_recv = 0;
sum_active_connections(this, sum_sent, sum_recv);
*recvd = togbps(sum_recv);
*sent = togbps(sum_sent);
}
/** get total values for this process */
void Process::gettotal(u_int64_t *recvd, u_int64_t *sent) {
u_int64_t sum_sent = 0, sum_recv = 0;

2
src/process.h
View File

@@ -93,6 +93,8 @@ public:
void gettotal(u_int64_t *recvd, u_int64_t *sent);
void getkbps(float *recvd, float *sent);
void getmbps(float *recvd, float *sent);
void getgbps(float *recvd, float *sent);
void gettotalmb(float *recvd, float *sent);
void gettotalkb(float *recvd, float *sent);
void gettotalb(float *recvd, float *sent);