Module Name: src
Committed By: christos
Date: Fri Sep 29 12:57:05 UTC 2017
Modified Files:
src/sys/miscfs/procfs: procfs_status.c
Log Message:
Split the status printing routines (one for NetBSD and one for Linux) for
simplicity (Robert Swindelis)
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/miscfs/procfs/procfs_status.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/procfs/procfs_status.c
diff -u src/sys/miscfs/procfs/procfs_status.c:1.37 src/sys/miscfs/procfs/procfs_status.c:1.38
--- src/sys/miscfs/procfs/procfs_status.c:1.37 Mon Nov 14 03:55:51 2016
+++ src/sys/miscfs/procfs/procfs_status.c Fri Sep 29 08:57:05 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_status.c,v 1.37 2016/11/14 08:55:51 kre Exp $ */
+/* $NetBSD: procfs_status.c,v 1.38 2017/09/29 12:57:05 christos Exp $ */
/*
* Copyright (c) 1993
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_status.c,v 1.37 2016/11/14 08:55:51 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_status.c,v 1.38 2017/09/29 12:57:05 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,13 +88,8 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_statu
#include <miscfs/procfs/procfs.h>
-int
-procfs_dostatus(
- struct lwp *curl,
- struct lwp *l,
- struct pfsnode *pfs,
- struct uio *uio
-)
+static int
+procfs_status_netbsd(struct lwp *l, struct uio *uio)
{
struct session *sess;
struct tty *tp;
@@ -102,13 +97,12 @@ procfs_dostatus(
struct proc *p = l->l_proc;
char *ps;
const char *sep;
+ const char *emulname = curlwp->l_proc->p_emul->e_name;
int pid, ppid, pgid, sid;
u_int i;
char psbuf[256+MAXHOSTNAMELEN]; /* XXX - conservative */
uint16_t ngroups;
- if (uio->uio_rw != UIO_READ)
- return (EOPNOTSUPP);
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
@@ -119,67 +113,149 @@ procfs_dostatus(
sess = p->p_pgrp->pg_session;
sid = sess->s_sid;
+ ps = psbuf;
+ if (strncmp(emulname, "linux", 5) == 0) {
+ ps += snprintf(ps, sizeof(psbuf), "Name:\t%s\n", p->p_comm);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "Pid:\t%d\n", pid);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "PPid:\t%d\n", ppid);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "TracerPid:\t%d\n", 0);
+
+ cr = p->p_cred;
+ ngroups = kauth_cred_ngroups(cr);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "Groups:\t");
+ for (i = 0; i < ngroups; i++)
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%d ",
+ kauth_cred_group(cr, i));
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "\n");
+
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmPeak:\t%8lu kB\n", p->p_rlimit[RLIMIT_DATA].rlim_cur / 1024);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmSize:\t%8lu kB\n", p->p_rlimit[RLIMIT_DATA].rlim_cur / 1024);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmRSS:\t%8lu kB\n", p->p_rlimit[RLIMIT_RSS].rlim_cur / 1024);
+
+ } else {
/* comm pid ppid pgid sid maj,min ctty,sldr start ut st wmsg uid gid groups ... */
- ps = psbuf;
- memcpy(ps, p->p_comm, MAXCOMLEN);
- ps[MAXCOMLEN] = '\0';
- ps += strlen(ps);
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d %d %d %d ",
- pid, ppid, pgid, sid);
-
- if ((p->p_lflag & PL_CONTROLT) && (tp = sess->s_ttyp))
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%llu,%llu ",
- (unsigned long long)major(tp->t_dev),
- (unsigned long long)minor(tp->t_dev));
- else
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%d,%d ",
- -1, -1);
-
- sep = "";
- if (sess->s_ttyvp) {
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%sctty", sep);
- sep = ",";
- }
- if (SESS_LEADER(p)) {
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%ssldr", sep);
- sep = ",";
+ memcpy(ps, p->p_comm, MAXCOMLEN);
+ ps[MAXCOMLEN] = '\0';
+ ps += strlen(ps);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d %d %d %d ",
+ pid, ppid, pgid, sid);
+
+ if ((p->p_lflag & PL_CONTROLT) && (tp = sess->s_ttyp))
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%llu,%llu ",
+ (unsigned long long)major(tp->t_dev),
+ (unsigned long long)minor(tp->t_dev));
+ else
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%d,%d ",
+ -1, -1);
+
+ sep = "";
+ if (sess->s_ttyvp) {
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%sctty", sep);
+ sep = ",";
+ }
+ if (SESS_LEADER(p)) {
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%ssldr", sep);
+ sep = ",";
+ }
+ if (*sep != ',')
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "noflags");
+
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %lld,%ld",
+ (long long)p->p_stats->p_start.tv_sec,
+ (long)p->p_stats->p_start.tv_usec);
+
+ {
+ struct timeval ut, st;
+
+ calcru(p, &ut, &st, (void *) 0, NULL);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ " %lld,%ld %lld,%ld", (long long)ut.tv_sec,
+ (long)ut.tv_usec, (long long)st.tv_sec, (long)st.tv_usec);
+ }
+
+ lwp_lock(l);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %s",
+ (l->l_wchan && l->l_wmesg) ? l->l_wmesg : "nochan");
+ lwp_unlock(l);
+
+ cr = p->p_cred;
+
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d",
+ kauth_cred_geteuid(cr));
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d",
+ kauth_cred_getegid(cr));
+ ngroups = kauth_cred_ngroups(cr);
+ for (i = 0; i < ngroups; i++)
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), ",%d",
+ kauth_cred_group(cr, i));
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "\n");
}
- if (*sep != ',')
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "noflags");
+ mutex_exit(p->p_lock);
+ mutex_exit(proc_lock);
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %lld,%ld",
- (long long)p->p_stats->p_start.tv_sec,
- (long)p->p_stats->p_start.tv_usec);
+ return (uiomove_frombuf(psbuf, ps - psbuf, uio));
+}
- {
- struct timeval ut, st;
+static int
+procfs_status_linux(struct lwp *l, struct uio *uio)
+{
+ kauth_cred_t cr;
+ struct proc *p = l->l_proc;
+ char *ps;
+ int pid, ppid;
+ u_int i;
+ char psbuf[256+MAXHOSTNAMELEN]; /* XXX - conservative */
+ uint16_t ngroups;
- calcru(p, &ut, &st, (void *) 0, NULL);
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
- " %lld,%ld %lld,%ld", (long long)ut.tv_sec,
- (long)ut.tv_usec, (long long)st.tv_sec, (long)st.tv_usec);
- }
+ mutex_enter(proc_lock);
+ mutex_enter(p->p_lock);
- lwp_lock(l);
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %s",
- (l->l_wchan && l->l_wmesg) ? l->l_wmesg : "nochan");
- lwp_unlock(l);
+ pid = p->p_pid;
+ ppid = p->p_ppid;
- cr = p->p_cred;
+ ps = psbuf;
+ ps += snprintf(ps, sizeof(psbuf), "Name:\t%s\n", p->p_comm);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "Pid:\t%d\n", pid);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "PPid:\t%d\n", ppid);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "TracerPid:\t%d\n", 0);
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d",
- kauth_cred_geteuid(cr));
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), " %d",
- kauth_cred_getegid(cr));
+ cr = p->p_cred;
ngroups = kauth_cred_ngroups(cr);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "Groups:\t");
for (i = 0; i < ngroups; i++)
- ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), ",%d",
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "%d ",
kauth_cred_group(cr, i));
ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf), "\n");
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmPeak:\t%8" PRIu64 " kB\n", p->p_rlimit[RLIMIT_DATA].rlim_cur / 1024);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmSize:\t%8" PRIu64 " kB\n", p->p_rlimit[RLIMIT_DATA].rlim_cur / 1024);
+ ps += snprintf(ps, sizeof(psbuf) - (ps - psbuf),
+ "VmRSS:\t%8" PRIu64 " kB\n", p->p_rlimit[RLIMIT_RSS].rlim_cur / 1024);
+
mutex_exit(p->p_lock);
mutex_exit(proc_lock);
return (uiomove_frombuf(psbuf, ps - psbuf, uio));
}
+
+int
+procfs_dostatus(struct lwp *curl, struct lwp *l, struct pfsnode *pfs,
+ struct uio *uio)
+{
+ const char *emulname = curlwp->l_proc->p_emul->e_name;
+
+ if (uio->uio_rw != UIO_READ)
+ return (EOPNOTSUPP);
+
+ if (strncmp(emulname, "linux", 5) == 0) {
+ return procfs_status_linux(l, uio);
+ } else {
+ return procfs_status_netbsd(l, uio);
+ }
+}
