pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/consolekit Support OpenBSD
details: https://anonhg.NetBSD.org/pkgsrc/rev/83a6e32702a0
branches: trunk
changeset: 633971:83a6e32702a0
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon May 05 21:19:40 2014 +0000
description:
Support OpenBSD
* Borrow code from OpenBSD Ports
diffstat:
sysutils/consolekit/Makefile | 3 +-
sysutils/consolekit/distinfo | 10 +-
sysutils/consolekit/files/ck-sysdeps-openbsd.c | 471 +++++++++++++++++++++++++
sysutils/consolekit/patches/patch-aa | 22 +-
sysutils/consolekit/patches/patch-ab | 13 +-
sysutils/consolekit/patches/patch-ac | 10 +-
sysutils/consolekit/patches/patch-ae | 26 +-
7 files changed, 530 insertions(+), 25 deletions(-)
diffs (truncated from 690 to 300 lines):
diff -r 83e563048813 -r 83a6e32702a0 sysutils/consolekit/Makefile
--- a/sysutils/consolekit/Makefile Mon May 05 21:16:28 2014 +0000
+++ b/sysutils/consolekit/Makefile Mon May 05 21:19:40 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2013/05/31 12:41:59 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/05/05 21:19:40 ryoon Exp $
#
CONSOLEKIT_VER= 0.3.0
@@ -40,6 +40,7 @@
post-extract:
${CP} ${FILESDIR}/ck-sysdeps-netbsd.c ${WRKSRC}/src/
+ ${CP} ${FILESDIR}/ck-sysdeps-openbsd.c ${WRKSRC}/src/
pre-configure:
cd ${WRKSRC} && autoreconf -vi ${AUTORECONF_ARGS}
diff -r 83e563048813 -r 83a6e32702a0 sysutils/consolekit/distinfo
--- a/sysutils/consolekit/distinfo Mon May 05 21:16:28 2014 +0000
+++ b/sysutils/consolekit/distinfo Mon May 05 21:19:40 2014 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2010/12/26 20:53:14 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/05/05 21:19:40 ryoon Exp $
SHA1 (ConsoleKit-0.3.0.tar.bz2) = e3b6156622cc14ebca7382a55b8ed15f2f2bad98
RMD160 (ConsoleKit-0.3.0.tar.bz2) = 7a1ebd2f4bfb65690e70138c9923c3fd2fcaf671
Size (ConsoleKit-0.3.0.tar.bz2) = 393694 bytes
-SHA1 (patch-aa) = a1589faf05d5358a0820da6d7da20f09ce4cec1b
-SHA1 (patch-ab) = 2e9fe9de1f27c635a4eefa77af8322cb8a02ab35
-SHA1 (patch-ac) = 0595a9cd1c4013eb4761e044b4b4b01b613f7d2b
+SHA1 (patch-aa) = f6b56bcb12d89ad794feaf345bef04e8a2edbfb0
+SHA1 (patch-ab) = 9ba984009ee9424b35fcb2c3454df4063dbbd953
+SHA1 (patch-ac) = 42a098a1210ad17f992713b03b834ea355c9b06d
SHA1 (patch-ad) = a1c1a1d0452945550065da3eac2390318c1eb7be
-SHA1 (patch-ae) = 8a9612cd35d1ec86240fd17dfa6963c20edc0ad0
+SHA1 (patch-ae) = 775a3b460db0f2cd305882fcb782d666b8670d8a
SHA1 (patch-af) = e86c63147798d61f7560cfe7547b0d06d18d5583
SHA1 (patch-ag) = 724e2eb95f7ca78c5659fde1eec2f2c5c6bc5002
SHA1 (patch-ah) = f62d8c661732a4ea47e29b99f883b539fb5c7468
diff -r 83e563048813 -r 83a6e32702a0 sysutils/consolekit/files/ck-sysdeps-openbsd.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/consolekit/files/ck-sysdeps-openbsd.c Mon May 05 21:19:40 2014 +0000
@@ -0,0 +1,471 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2006 William Jon McCann <mccann%jhu.edu@localhost>
+ * Copyright (C) 2007 Joe Marcus Clarke <marcus%FreeBSD.org@localhost>
+ * Copyright (C) 2008 Jared D. McNeill <jmcneill%NetBSD.org@localhost>
+ * Copyright (C) 2009 Robert Nagy <robert%openbsd.org@localhost>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <paths.h>
+#include <ttyent.h>
+#include <kvm.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+#include <sys/ioctl.h>
+
+#ifdef __OpenBSD__
+#include <sys/stdint.h>
+#endif
+
+#include <dev/wscons/wsdisplay_usl_io.h>
+
+#define DEV_ENCODE(M,m) ( \
+ ( (M&0xfff) << 8) | ( (m&0xfff00) << 12) | (m&0xff) \
+)
+
+#include "ck-sysdeps.h"
+
+#ifndef ERROR
+#define ERROR -1
+#endif
+
+/* adapted from procps */
+struct _CkProcessStat
+{
+ int pid;
+ int ppid; /* stat,status pid of parent process */
+ char state; /* stat,status single-char code for process state (S=sleeping) */
+ char cmd[16]; /* stat,status basename of executable file in call to exec(2) */
+ unsigned long long utime; /* stat user-mode CPU time accumulated by process */
+ unsigned long long stime; /* stat kernel-mode CPU time accumulated by process */
+ unsigned long long cutime; /* stat cumulative utime of process and reaped children */
+ unsigned long long cstime; /* stat cumulative stime of process and reaped children */
+ unsigned long long start_time; /* stat start time of process -- seconds since 1-1-70 */
+ unsigned long start_code; /* stat address of beginning of code segment */
+ unsigned long end_code; /* stat address of end of code segment */
+ unsigned long start_stack; /* stat address of the bottom of stack for the process */
+ unsigned long kstk_esp; /* stat kernel stack pointer */
+ unsigned long kstk_eip; /* stat kernel instruction pointer */
+ unsigned long wchan; /* stat (special) address of kernel wait channel proc is sleeping in */
+ long priority; /* stat kernel scheduling priority */
+ long nice; /* stat standard unix nice level of process */
+ long rss; /* stat resident set size from /proc/#/stat (pages) */
+ long alarm; /* stat ? */
+ unsigned long rtprio; /* stat real-time priority */
+ unsigned long sched; /* stat scheduling class */
+ unsigned long vsize; /* stat number of pages of virtual memory ... */
+ unsigned long rss_rlim; /* stat resident set size limit? */
+ unsigned long flags; /* stat kernel flags for the process */
+ unsigned long min_flt; /* stat number of minor page faults since process start */
+ unsigned long maj_flt; /* stat number of major page faults since process start */
+ unsigned long cmin_flt; /* stat cumulative min_flt of process and child processes */
+ unsigned long cmaj_flt; /* stat cumulative maj_flt of process and child processes */
+ int pgrp; /* stat process group id */
+ int session; /* stat session id */
+ int nlwp; /* stat number of threads, or 0 if no clue */
+ int tty; /* stat full device number of controlling terminal */
+ int tpgid; /* stat terminal process group id */
+ int exit_signal; /* stat might not be SIGCHLD */
+ int processor; /* stat current (or most recent?) CPU */
+ uintptr_t penv; /* stat address of initial environment vector */
+ char tty_text[11]; /* stat device name */
+
+};
+
+pid_t
+ck_process_stat_get_ppid (CkProcessStat *stat)
+{
+ g_return_val_if_fail (stat != NULL, -1);
+
+ return stat->ppid;
+}
+
+char *
+ck_process_stat_get_cmd (CkProcessStat *stat)
+{
+ g_return_val_if_fail (stat != NULL, NULL);
+
+ return g_strdup (stat->cmd);
+}
+
+char *
+ck_process_stat_get_tty (CkProcessStat *stat)
+{
+ g_return_val_if_fail (stat != NULL, NULL);
+
+ return g_strdup (stat->tty_text);
+}
+
+static gboolean
+get_kinfo_proc (pid_t pid,
+ struct kinfo_proc *p)
+{
+ size_t len;
+
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
+ sizeof(struct kinfo_proc), 0 };
+
+#ifndef nitems
+#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
+ if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) < 0)
+ return FALSE;
+
+ mib[5] = (len / sizeof(struct kinfo_proc));
+
+ if (sysctl(mib, nitems(mib), p, &len, NULL, 0) < 0)
+ return FALSE;
+
+ return TRUE;
+}
+
+/* return 1 if it works, or 0 for failure */
+static gboolean
+stat2proc (pid_t pid,
+ CkProcessStat *P)
+{
+ struct kinfo_proc p;
+ char *ttname;
+ int num;
+ int tty_maj;
+ int tty_min;
+
+ if (! get_kinfo_proc (pid, &p)) {
+ return FALSE;
+ }
+
+ num = KI_MAXCOMLEN;
+ if (num >= sizeof P->cmd) {
+ num = sizeof P->cmd - 1;
+ }
+
+ memcpy (P->cmd, p.p_comm, num);
+
+ P->cmd[num] = '\0';
+ P->pid = p.p_pid;
+ P->ppid = p.p_ppid;
+ P->pgrp = p.p__pgid;
+ P->session = p.p_sid;
+ P->rss = p.p_vm_rssize;
+ P->vsize = p.p_vm_dsize + p.p_vm_dsize + p.p_vm_ssize; /* XXX */
+ P->start_time = p.p_ustart_sec;
+ P->wchan = (unsigned long) p.p_wchan;
+ P->state = p.p_stat;
+ P->nice = p.p_nice;
+ P->flags = p.p_psflags;
+ P->tpgid = p.p_tpgid;
+ P->processor = p.p_cpuid;
+
+ /* we like it Linux-encoded :-) */
+ tty_maj = major (p.p_tdev);
+ tty_min = minor (p.p_tdev);
+ P->tty = DEV_ENCODE (tty_maj,tty_min);
+
+ snprintf (P->tty_text, sizeof P->tty_text, "%3d,%-3d", tty_maj, tty_min);
+
+ if (p.p_tdev != NODEV && (ttname = devname (p.p_tdev, S_IFCHR)) != NULL) {
+ memcpy (P->tty_text, ttname, sizeof P->tty_text);
+ }
+
+ if (p.p_tdev == NODEV) {
+ /* XXX how do we associate X with its tty? */
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+ memcpy (P->tty_text, "/dev/ttyC4", sizeof P->tty_text);
+#else
+ memcpy (P->tty_text, "/dev/ttyC0", sizeof P->tty_text);
+#endif
+ }
+
+ if (P->pid != pid) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+gboolean
+ck_process_stat_new_for_unix_pid (pid_t pid,
+ CkProcessStat **stat,
+ GError **error)
+{
+ gboolean res;
+ CkProcessStat *proc;
+
+ g_return_val_if_fail (pid > 1, FALSE);
+
+ if (stat == NULL) {
+ return FALSE;
+ }
+
+ proc = g_new0 (CkProcessStat, 1);
+ proc->pid = pid;
+ res = stat2proc (pid, proc);
+ if (res) {
+ *stat = proc;
+ } else {
+ *stat = NULL;
+ }
+
+ return res;
+}
+
+void
+ck_process_stat_free (CkProcessStat *stat)
+{
+ g_free (stat);
+}
+
+GHashTable *
+ck_unix_pid_get_env_hash (pid_t pid)
+{
+ GHashTable *hash = NULL;
+ char **penv;
+ char errbuf[_POSIX2_LINE_MAX];
+ kvm_t *kd;
+ struct kinfo_proc p;
+ int i;
+
+ kd = kvm_openfiles (NULL, NULL, NULL, O_RDONLY, errbuf);
+ if (kd == NULL) {
+ g_warning ("kvm_openfiles failed: %s", errbuf);
Home |
Main Index |
Thread Index |
Old Index