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

improved cpu usage

Browse Source
This commit is contained in:
Mohamed Boussaffa
2016-03-05 00:52:57 +08:00
parent 872c4649fa
commit 245e152854
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libnethogs.cpp
View File

@@ -24,8 +24,8 @@ static NethogsMonitor::Callback monitor_udpate_callback;
typedef std::map<int, NethogsAppUpdate> NethogsAppUpdateMap; typedef std::map<int, NethogsAppUpdate> NethogsAppUpdateMap;
static NethogsAppUpdateMap monitor_update_data; static NethogsAppUpdateMap monitor_update_data;
bool NethogsMonitor::_trace = false; static int monitor_refresh_delay = 1;
bool NethogsMonitor::_promisc = false; static time_t monitor_last_refresh_time = 0;
void NethogsMonitor::threadProc() void NethogsMonitor::threadProc()
{ {
@@ -41,16 +41,18 @@ void NethogsMonitor::threadProc()
handle * handles = NULL; handle * handles = NULL;
device * current_dev = devices; device * current_dev = devices;
bool promiscuous = false;
while (current_dev != NULL) while (current_dev != NULL)
{ {
if( !getLocal(current_dev->name, _trace) ) if( !getLocal(current_dev->name, false) )
{ {
std::cerr << "getifaddrs failed while establishing local IP." << std::endl; std::cerr << "getifaddrs failed while establishing local IP." << std::endl;
continue; continue;
} }
char errbuf[PCAP_ERRBUF_SIZE]; char errbuf[PCAP_ERRBUF_SIZE];
dp_handle * newhandle = dp_open_live(current_dev->name, BUFSIZ, _promisc, 100, errbuf); dp_handle * newhandle = dp_open_live(current_dev->name, BUFSIZ, promiscuous, 100, errbuf);
if (newhandle != NULL) if (newhandle != NULL)
{ {
dp_addcb (newhandle, dp_packet_ip, process_ip); dp_addcb (newhandle, dp_packet_ip, process_ip);
@@ -79,9 +81,6 @@ void NethogsMonitor::threadProc()
current_dev = current_dev->next; current_dev = current_dev->next;
} }
signal (SIGALRM, &alarm_cb);
alarm (refreshdelay);
fprintf(stderr, "Waiting for first packet to arrive (see sourceforge.net bug 1019381)\n"); fprintf(stderr, "Waiting for first packet to arrive (see sourceforge.net bug 1019381)\n");
struct dpargs * userdata = (dpargs *) malloc (sizeof (struct dpargs)); struct dpargs * userdata = (dpargs *) malloc (sizeof (struct dpargs));
@@ -109,18 +108,18 @@ void NethogsMonitor::threadProc()
current_handle = current_handle->next; current_handle = current_handle->next;
} }
time_t const now = ::time(NULL);
if (needrefresh) if( monitor_last_refresh_time + monitor_refresh_delay <= now )
{ {
needrefresh = false; monitor_last_refresh_time = now;
handleUpdate(); handleUpdate();
} }
// If no packets were read at all this iteration, pause to prevent 100%
// CPU utilisation;
if (!packets_read) if (!packets_read)
{ {
usleep(100); // If no packets were read at all this iteration, pause to prevent 100%
// Pause 10 milliseconds
usleep(10000);
} }
} }
} }
@@ -230,6 +229,11 @@ void NethogsMonitor::registerUpdateCallback(Callback const& cb)
} }
} }
void NethogsMonitor::setRefreshDelay(int seconds)
{
monitor_refresh_delay = seconds;
}
void NethogsMonitor::start() void NethogsMonitor::start()
{ {
bool expected = false; bool expected = false;

5
libnethogs.h
View File

@@ -37,6 +37,8 @@ public:
//have to be called before start //have to be called before start
static void registerUpdateCallback(Callback const& cb); static void registerUpdateCallback(Callback const& cb);
static void setRefreshDelay(int seconds);
//start the monitor //start the monitor
static void start(); static void start();
@@ -46,9 +48,6 @@ public:
private: private:
static void threadProc(); static void threadProc();
static void handleUpdate(); static void handleUpdate();
static bool _trace;
static bool _promisc;
}; };
#undef NETHOGS_DSO_VISIBLE #undef NETHOGS_DSO_VISIBLE