Issue: #96 - Garbage collect inodeproc once every 50 ui refresh as default.

- Reduce default frequency to avoid performance issue.
- The frequency of it can be modified with `-g` option
  and can be disabled with `-g 0`.
This commit is contained in:
Kondo Takeo
2021-02-17 23:02:27 +09:00
parent 12dbf5e28a
commit b97fb4cfdf
3 changed files with 20 additions and 3 deletions

View File

@@ -19,6 +19,7 @@ nethogs \- Net top tool grouping bandwidth per process
.RB [ "\-l" ] .RB [ "\-l" ]
.RB [ "\-f filter" ] .RB [ "\-f filter" ]
.RB [ "\-C" ] .RB [ "\-C" ]
.RB [ "\-g period" ]
.RI [device(s)] .RI [device(s)]
.SH DESCRIPTION .SH DESCRIPTION
NetHogs is a small 'net top' tool. Instead of breaking the traffic down per protocol or per subnet, like most such tools do, it groups bandwidth by process - and does not rely on a special kernel module to be loaded. So if there's suddenly a lot of network traffic, you can fire up NetHogs and immediately see which PID is causing this, and if it's some kind of spinning process, kill it. NetHogs is a small 'net top' tool. Instead of breaking the traffic down per protocol or per subnet, like most such tools do, it groups bandwidth by process - and does not rely on a special kernel module to be loaded. So if there's suddenly a lot of network traffic, you can fire up NetHogs and immediately see which PID is causing this, and if it's some kind of spinning process, kill it.
@@ -61,6 +62,9 @@ monitor all devices, even loopback/stopped ones.
\fB-C\fP \fB-C\fP
capture TCP and UDP. capture TCP and UDP.
.TP .TP
\fB-g\fP
garbage collection period in number of refresh. default is 50.
.TP
\fB-f\fP \fB-f\fP
EXPERIMENTAL: specify string pcap filter (like tcpdump). This may be removed or changed in a future version. EXPERIMENTAL: specify string pcap filter (like tcpdump). This may be removed or changed in a future version.
.TP .TP

View File

@@ -235,7 +235,8 @@ static quad_t get_ms() {
static void get_pids(std::set<pid_t> *pids) { static void get_pids(std::set<pid_t> *pids) {
DIR *proc = opendir("/proc"); DIR *proc = opendir("/proc");
if (proc == 0) { if (proc == 0) {
std::cerr << "Error reading /proc, needed to get inode-to-pid-mapping" << std::endl; std::cerr << "Error reading /proc, needed to get inode-to-pid-mapping"
<< std::endl;
exit(1); exit(1);
} }
dirent *entry; dirent *entry;

View File

@@ -46,6 +46,8 @@ static void help(bool iserror) {
output << " -a : monitor all devices, even loopback/stopped " output << " -a : monitor all devices, even loopback/stopped "
"ones.\n"; "ones.\n";
output << " -C : capture TCP and UDP.\n"; output << " -C : capture TCP and UDP.\n";
output << " -g : garbage collection period in number of refresh. "
"default is 50.\n";
output << " -f : EXPERIMENTAL: specify string pcap filter (like " output << " -f : EXPERIMENTAL: specify string pcap filter (like "
"tcpdump)." "tcpdump)."
" This may be removed or changed in a future version.\n"; " This may be removed or changed in a future version.\n";
@@ -140,9 +142,10 @@ int main(int argc, char **argv) {
int promisc = 0; int promisc = 0;
bool all = false; bool all = false;
char *filter = NULL; char *filter = NULL;
int garbage_collection_period = 50;
int opt; int opt;
while ((opt = getopt(argc, argv, "Vhbtpsd:v:c:laf:C")) != -1) { while ((opt = getopt(argc, argv, "Vhbtpsd:v:c:laf:Cg:")) != -1) {
switch (opt) { switch (opt) {
case 'V': case 'V':
versiondisplay(); versiondisplay();
@@ -184,6 +187,9 @@ int main(int argc, char **argv) {
case 'C': case 'C':
catchall = true; catchall = true;
break; break;
case 'g':
garbage_collection_period = (time_t)atoi(optarg);
break;
default: default:
help(true); help(true);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@@ -294,6 +300,7 @@ int main(int argc, char **argv) {
struct dpargs *userdata = (dpargs *)malloc(sizeof(struct dpargs)); struct dpargs *userdata = (dpargs *)malloc(sizeof(struct dpargs));
// Main loop: // Main loop:
int refresh_count = 0;
while (1) { while (1) {
bool packets_read = false; bool packets_read = false;
@@ -322,7 +329,12 @@ int main(int argc, char **argv) {
ui_tick(); ui_tick();
} }
do_refresh(); do_refresh();
garbage_collect_processes(); ++refresh_count;
if ((garbage_collection_period > 0) &&
(refresh_count % garbage_collection_period == 0)) {
garbage_collect_processes();
}
} }
// if not packets, do a select() until next packet // if not packets, do a select() until next packet