summaryrefslogtreecommitdiff
path: root/www/py-uwsgi/patches/patch-logging.c
diff options
context:
space:
mode:
Diffstat (limited to 'www/py-uwsgi/patches/patch-logging.c')
-rw-r--r--www/py-uwsgi/patches/patch-logging.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/www/py-uwsgi/patches/patch-logging.c b/www/py-uwsgi/patches/patch-logging.c
index 0d5e52eeceb..b459d78467b 100644
--- a/www/py-uwsgi/patches/patch-logging.c
+++ b/www/py-uwsgi/patches/patch-logging.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-logging.c,v 1.1 2012/05/15 12:56:38 marino Exp $
+$NetBSD: patch-logging.c,v 1.2 2012/07/12 16:21:53 roy Exp $
---- logging.c.orig 2011-09-11 05:50:42.000000000 +0000
-+++ logging.c
-@@ -179,7 +179,7 @@ void get_memusage() {
+--- logging.c.orig 2012-05-14 06:58:20.000000000 +0100
++++ logging.c 2012-07-06 15:31:08.000000000 +0100
+@@ -263,7 +263,7 @@
kv = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL);
#endif
if (kv) {
@@ -11,17 +11,17 @@ $NetBSD: patch-logging.c,v 1.1 2012/05/15 12:56:38 marino Exp $
struct kinfo_proc *kproc;
kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
-@@ -187,6 +187,13 @@ void get_memusage() {
- uwsgi.workers[uwsgi.mywid].vsz_size = kproc->ki_size;
- uwsgi.workers[uwsgi.mywid].rss_size = kproc->ki_rssize * uwsgi.page_size;
+@@ -271,6 +271,13 @@
+ *vsz = kproc->ki_size;
+ *rss = kproc->ki_rssize * uwsgi.page_size;
}
+#elif defined(__DragonFly__)
+ struct kinfo_proc *kproc;
+ kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, &cnt);
+ if (kproc && cnt > 0) {
-+ uwsgi.workers[uwsgi.mywid].vsz_size = kproc->kp_vm_map_size;
-+ uwsgi.workers[uwsgi.mywid].rss_size = kproc->kp_vm_rssize * uwsgi.page_size;
++ *vsz = kproc->kp_vm_map_size;
++ *rss = kproc->kp_vm_rssize * uwsgi.page_size;
+ }
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- struct kinfo_proc2 *kproc2;
-
+ #elif defined(UWSGI_NEW_OPENBSD)
+ struct kinfo_proc *kproc;
+ kproc = kvm_getprocs(kv, KERN_PROC_PID, uwsgi.mypid, sizeof(struct kinfo_proc), &cnt);