projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stream-ssl: Use out_of_memory() to abort due to lack of memory.
[openvswitch]
/
vswitchd
/
system-stats.c
diff --git
a/vswitchd/system-stats.c
b/vswitchd/system-stats.c
index 45b8cce64cf002145a427d4d7376e92cdc2f2f18..b8f8d7e33036e0956a90cfe5c4bc1f233078c7c1 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>
@@
-387,9
+386,9
@@
get_process_stats(struct shash *stats)
struct dirent *de;
DIR *dir;
struct dirent *de;
DIR *dir;
- dir = opendir(ovs_rundir);
+ dir = opendir(ovs_rundir
()
);
if (!dir) {
if (!dir) {
- VLOG_ERR_ONCE("%s: open failed (%s)", ovs_rundir, strerror(errno));
+ VLOG_ERR_ONCE("%s: open failed (%s)", ovs_rundir
()
, strerror(errno));
return;
}
return;
}
@@
-411,10
+410,10
@@
get_process_stats(struct shash *stats)
continue;
}
continue;
}
- file_name = xasprintf("%s/%s", ovs_rundir, de->d_name);
+ file_name = xasprintf("%s/%s", ovs_rundir
()
, de->d_name);
pid = read_pidfile(file_name);
free(file_name);
pid = read_pidfile(file_name);
free(file_name);
- if (pid < 0
|| kill(pid, 0)
) {
+ if (pid < 0) {
continue;
}
continue;
}