cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling of p_wchan and drop useless mfs chunk.

Browse Source
This commit is contained in:
ajacoutot 2014-02-01 18:11:43 +00:00
parent 46adf458c6
commit 71534c3817
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/libgtop2/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.111 2014/01/23 14:06:34 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.112 2014/02/01 18:11:43 ajacoutot Exp $
COMMENT= portable library for obtaining system information
GNOME_VERSION= 2.28.5
GNOME_PROJECT= libgtop
PKGNAME= libgtop2-${VERSION}
REVISION= 7
REVISION= 8
SHARED_LIBS= gtop-2.0 9.0 # .9.0

16
devel/libgtop2/patches/patch-sysdeps_common_mountlist_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_common_mountlist_c,v 1.2 2011/09/18 11:24:59 jasper Exp $
--- sysdeps/common/mountlist.c.orig Wed Jun 1 17:40:47 2011
+++ sysdeps/common/mountlist.c Sun Sep 18 13:22:28 2011
$OpenBSD: patch-sysdeps_common_mountlist_c,v 1.3 2014/02/01 18:11:43 ajacoutot Exp $
--- sysdeps/common/mountlist.c.orig Sat Jul 27 14:40:23 2013
+++ sysdeps/common/mountlist.c Sat Feb 1 18:39:20 2014
@@ -52,7 +52,9 @@ static struct mount_entry *read_filesystem_list (void)
#if defined (MOUNTED_GETFSSTAT) /* __alpha running OSF_1 */
@ -37,13 +37,3 @@ $OpenBSD: patch-sysdeps_common_mountlist_c,v 1.2 2011/09/18 11:24:59 jasper Exp
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_next = NULL;
@@ -545,7 +556,9 @@ static gboolean ignore_mount_entry(const struct mount_
"devpts",
"fusectl",
"linprocfs",
+#ifndef __OpenBSD__
"mfs",
+#endif
"mntfs",
"mqueue",
"none",

21
devel/libgtop2/patches/patch-sysdeps_openbsd_prockernel_c
View File

@ -1,22 +1,31 @@
$OpenBSD: patch-sysdeps_openbsd_prockernel_c,v 1.10 2014/01/23 09:41:25 jasper Exp $
$OpenBSD: patch-sysdeps_openbsd_prockernel_c,v 1.11 2014/02/01 18:11:43 ajacoutot Exp $
From df1db430320c8646f809ef0224c2a620f7cadd1b Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@openbsd.org>
Date: Thu, 23 Jan 2014 09:39:39 +0000
Subject: Fix several issues related to process information on OpenBSD and drop lsof usage.
From c99ceeaa65a5482db2b5b3b677a8c4b40acc8eb8 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Sat, 01 Feb 2014 18:09:21 +0000
Subject: openbsd: better handling of p_wchan
--- sysdeps/openbsd/prockernel.c.orig Sat Jul 27 14:40:23 2013
+++ sysdeps/openbsd/prockernel.c Mon Dec 9 14:54:24 2013
@@ -78,9 +78,9 @@ glibtop_get_proc_kernel_p (glibtop *server,
+++ sysdeps/openbsd/prockernel.c Sat Feb 1 19:03:06 2014
@@ -78,11 +78,13 @@ glibtop_get_proc_kernel_p (glibtop *server,
return;
}
- if (pinfo->p_wmesg[0])
- g_strlcpy(buf->wchan, pinfo->p_wmesg[0], sizeof(buf->wchan));
-
+ if (pinfo->p_wmesg)
+ g_strlcpy(buf->wchan, pinfo->p_wmesg, sizeof(buf->wchan));
+
buf->min_flt = pinfo[0].p_uru_minflt;
buf->maj_flt = pinfo[0].p_uru_majflt;
+
+ buf->nwchan = pinfo[0].p_wchan;
+ if (pinfo[0].p_wchan && pinfo[0].p_wmesg)
+ g_strlcpy(buf->wchan, pinfo[0].p_wmesg,
+ sizeof buf->wchan);
buf->flags |= (_glibtop_sysdeps_proc_kernel_wchan
| _glibtop_sysdeps_proc_kernel_pstats);