Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

kvm_proc needs synchronized access

Browse Source 
Signed-off-by: Nikos Ntarmos <ntarmos@cs.uoi.gr>
Signed-off-by: Pavel Labath <pavelo@centrum.sk>

Conflicts:

	src/conky.c
	src/freebsd.cc
	src/freebsd.h
This commit is contained in:
Pavel Labath 2010-12-09 19:22:34 +01:00
parent 187dc352c4
commit 44a30fac3d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/freebsd.cc
View File

@ -51,6 +51,8 @@
#include <dev/wi/if_wavelan_ieee.h> #include <dev/wi/if_wavelan_ieee.h>
#include <dev/acpica/acpiio.h> #include <dev/acpica/acpiio.h>
#include <mutex>
#include "conky.h" #include "conky.h"
#include "freebsd.h" #include "freebsd.h"
#include "logging.h" #include "logging.h"
@ -68,6 +70,8 @@
#endif #endif
kvm_t *kd; kvm_t *kd;
std::mutex kvm_proc_mutex;
__attribute__((gnu_inline)) inline void __attribute__((gnu_inline)) inline void
proc_find_top(struct process **cpu, struct process **mem, struct process **time); proc_find_top(struct process **cpu, struct process **mem, struct process **time);
@ -273,6 +277,7 @@ int update_total_processes(void)
{ {
int n_processes; int n_processes;
std::lock_guard<std::mutex> guard(kvm_proc_mutex);
kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes); kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
info.procs = n_processes; info.procs = n_processes;
@ -285,6 +290,7 @@ int update_running_processes(void)
int n_processes; int n_processes;
int i, cnt = 0; int i, cnt = 0;
std::lock_guard<std::mutex> guard(kvm_proc_mutex);
p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes); p = kvm_getprocs(kd, KERN_PROC_ALL, 0, &n_processes);
for (i = 0; i < n_processes; i++) { for (i = 0; i < n_processes; i++) {
#if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5) #if (__FreeBSD__ < 5) && (__FreeBSD_kernel__ < 5)
@ -712,6 +718,7 @@ void get_top_info(void)
int n_processes; int n_processes;
int i; int i;
std::lock_guard<std::mutex> guard(kvm_proc_mutex);
p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes); p = kvm_getprocs(kd, KERN_PROC_PROC, 0, &n_processes);
for (i = 0; i < n_processes; i++) { for (i = 0; i < n_processes; i++) {