projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Remove redundant newline.
[openvswitch]
/
vswitchd
/
system-stats.c
diff --git
a/vswitchd/system-stats.c
b/vswitchd/system-stats.c
index 9c5a25c5ef482096cd16755a9b8a6e84efa3e858..a3b4db44341c337cb94e2b65f83ed9726f1b4d79 100644
(file)
--- a/
vswitchd/system-stats.c
+++ b/
vswitchd/system-stats.c
@@
-22,7
+22,6
@@
#if HAVE_MNTENT_H
#include <mntent.h>
#endif
#if HAVE_MNTENT_H
#include <mntent.h>
#endif
-#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@
-96,7
+95,11
@@
get_memory_stats(struct shash *stats)
if (!LINUX) {
unsigned int pagesize = get_page_size();
long int phys_pages = sysconf(_SC_PHYS_PAGES);
if (!LINUX) {
unsigned int pagesize = get_page_size();
long int phys_pages = sysconf(_SC_PHYS_PAGES);
+#ifdef _SC_AVPHYS_PAGES
long int avphys_pages = sysconf(_SC_AVPHYS_PAGES);
long int avphys_pages = sysconf(_SC_AVPHYS_PAGES);
+#else
+ long int avphys_pages = 0;
+#endif
int mem_total, mem_used;
if (pagesize <= 0 || phys_pages <= 0 || avphys_pages <= 0) {
int mem_total, mem_used;
if (pagesize <= 0 || phys_pages <= 0 || avphys_pages <= 0) {
@@
-414,7
+417,7
@@
get_process_stats(struct shash *stats)
file_name = xasprintf("%s/%s", ovs_rundir(), de->d_name);
pid = read_pidfile(file_name);
free(file_name);
file_name = xasprintf("%s/%s", ovs_rundir(), de->d_name);
pid = read_pidfile(file_name);
free(file_name);
- if (pid < 0
|| kill(pid, 0)
) {
+ if (pid < 0) {
continue;
}
continue;
}