[Midnightbsd-cvs] src [10730] trunk/usr.sbin/kgmon/kgmon.c: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 17:59:46 EDT 2018
Revision: 10730
http://svnweb.midnightbsd.org/src/?rev=10730
Author: laffer1
Date: 2018-06-09 17:59:46 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/usr.sbin/kgmon/Makefile
trunk/usr.sbin/kgmon/kgmon.8
trunk/usr.sbin/kgmon/kgmon.c
Property Changed:
----------------
trunk/usr.sbin/kgmon/kgmon.8
Modified: trunk/usr.sbin/kgmon/Makefile
===================================================================
--- trunk/usr.sbin/kgmon/Makefile 2018-06-09 21:59:22 UTC (rev 10729)
+++ trunk/usr.sbin/kgmon/Makefile 2018-06-09 21:59:46 UTC (rev 10730)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD: src/usr.sbin/kgmon/Makefile,v 1.6 2004/08/30 03:12:49 marcel Exp $
+# $FreeBSD: stable/10/usr.sbin/kgmon/Makefile 134506 2004-08-30 03:12:49Z marcel $
PROG= kgmon
MAN= kgmon.8
Modified: trunk/usr.sbin/kgmon/kgmon.8
===================================================================
--- trunk/usr.sbin/kgmon/kgmon.8 2018-06-09 21:59:22 UTC (rev 10729)
+++ trunk/usr.sbin/kgmon/kgmon.8 2018-06-09 21:59:46 UTC (rev 10730)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -26,7 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)kgmon.8 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.sbin/kgmon/kgmon.8,v 1.16 2005/01/18 20:02:36 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/kgmon/kgmon.8 140442 2005-01-18 20:02:45Z ru $
.\"
.Dd June 6, 1993
.Dt KGMON 8
Property changes on: trunk/usr.sbin/kgmon/kgmon.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/kgmon/kgmon.c
===================================================================
--- trunk/usr.sbin/kgmon/kgmon.c 2018-06-09 21:59:22 UTC (rev 10729)
+++ trunk/usr.sbin/kgmon/kgmon.c 2018-06-09 21:59:46 UTC (rev 10730)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1983, 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -37,10 +38,11 @@
#if 0
static char sccsid[] = "@(#)kgmon.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] =
- "$FreeBSD: src/usr.sbin/kgmon/kgmon.c,v 1.15 2006/06/29 09:18:16 delphij Exp $";
#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: stable/10/usr.sbin/kgmon/kgmon.c 246792 2013-02-14 14:44:08Z charnier $");
+
#include <sys/param.h>
#include <sys/file.h>
#include <sys/time.h>
@@ -77,7 +79,7 @@
int getprof(struct kvmvars *);
int getprofhz(struct kvmvars *);
void kern_readonly(int);
-int openfiles(char *, char *, struct kvmvars *);
+int openfiles(const char *, char *, struct kvmvars *);
void setprof(struct kvmvars *kvp, int state);
void dumpstate(struct kvmvars *kvp);
void reset(struct kvmvars *kvp);
@@ -88,13 +90,14 @@
{
int ch, mode, disp, accessmode;
struct kvmvars kvmvars;
- char *system, *kmemf;
+ const char *systemname;
+ char *kmemf;
if (seteuid(getuid()) != 0) {
err(1, "seteuid failed\n");
}
kmemf = NULL;
- system = NULL;
+ systemname = NULL;
while ((ch = getopt(argc, argv, "M:N:Bbhpr")) != -1) {
switch((char)ch) {
@@ -104,7 +107,7 @@
break;
case 'N':
- system = optarg;
+ systemname = optarg;
break;
case 'B':
@@ -137,7 +140,7 @@
#define BACKWARD_COMPATIBILITY
#ifdef BACKWARD_COMPATIBILITY
if (*argv) {
- system = *argv;
+ systemname = *argv;
if (*++argv) {
kmemf = *argv;
++kflag;
@@ -144,9 +147,9 @@
}
}
#endif
- if (system == NULL)
- system = (char *)getbootfile();
- accessmode = openfiles(system, kmemf, &kvmvars);
+ if (systemname == NULL)
+ systemname = getbootfile();
+ accessmode = openfiles(systemname, kmemf, &kvmvars);
mode = getprof(&kvmvars);
if (hflag)
disp = GMON_PROF_OFF;
@@ -173,7 +176,7 @@
}
static void
-usage()
+usage(void)
{
fprintf(stderr, "usage: kgmon [-Bbhrp] [-M core] [-N system]\n");
exit(1);
@@ -183,10 +186,7 @@
* Check that profiling is enabled and open any necessary files.
*/
int
-openfiles(system, kmemf, kvp)
- char *system;
- char *kmemf;
- struct kvmvars *kvp;
+openfiles(const char *systemname, char *kmemf, struct kvmvars *kvp)
{
size_t size;
int mib[3], state, openmode;
@@ -212,11 +212,11 @@
}
openmode = (Bflag || bflag || hflag || pflag || rflag)
? O_RDWR : O_RDONLY;
- kvp->kd = kvm_openfiles(system, kmemf, NULL, openmode, errbuf);
+ kvp->kd = kvm_openfiles(systemname, kmemf, NULL, openmode, errbuf);
if (kvp->kd == NULL) {
if (openmode == O_RDWR) {
openmode = O_RDONLY;
- kvp->kd = kvm_openfiles(system, kmemf, NULL, O_RDONLY,
+ kvp->kd = kvm_openfiles(systemname, kmemf, NULL, O_RDONLY,
errbuf);
}
if (kvp->kd == NULL)
@@ -224,7 +224,7 @@
kern_readonly(GMON_PROF_ON);
}
if (kvm_nlist(kvp->kd, nl) < 0)
- errx(3, "%s: no namelist", system);
+ errx(3, "%s: no namelist", systemname);
if (!nl[N_GMONPARAM].n_value)
errx(20, "profiling not defined in kernel");
return (openmode);
@@ -234,8 +234,7 @@
* Suppress options that require a writable kernel.
*/
void
-kern_readonly(mode)
- int mode;
+kern_readonly(int mode)
{
(void)fprintf(stderr, "kgmon: kernel read-only: ");
@@ -242,13 +241,13 @@
if (pflag && (mode == GMON_PROF_HIRES || mode == GMON_PROF_ON))
(void)fprintf(stderr, "data may be inconsistent\n");
if (rflag)
- (void)fprintf(stderr, "-r supressed\n");
+ (void)fprintf(stderr, "-r suppressed\n");
if (Bflag)
- (void)fprintf(stderr, "-B supressed\n");
+ (void)fprintf(stderr, "-B suppressed\n");
if (bflag)
- (void)fprintf(stderr, "-b supressed\n");
+ (void)fprintf(stderr, "-b suppressed\n");
if (hflag)
- (void)fprintf(stderr, "-h supressed\n");
+ (void)fprintf(stderr, "-h suppressed\n");
rflag = Bflag = bflag = hflag = 0;
}
@@ -256,8 +255,7 @@
* Get the state of kernel profiling.
*/
int
-getprof(kvp)
- struct kvmvars *kvp;
+getprof(struct kvmvars *kvp)
{
size_t size;
int mib[3];
@@ -311,9 +309,7 @@
* Enable or disable kernel profiling according to the state variable.
*/
void
-setprof(kvp, state)
- struct kvmvars *kvp;
- int state;
+setprof(struct kvmvars *kvp, int state)
{
struct gmonparam *p = (struct gmonparam *)nl[N_GMONPARAM].n_value;
size_t sz;
@@ -335,7 +331,7 @@
}
(void)seteuid(getuid());
} else if (kvm_write(kvp->kd, (u_long)&p->state, (void *)&state, sz)
- == sz)
+ == (ssize_t)sz)
return;
bad:
warnx("warning: cannot turn profiling %s",
@@ -346,8 +342,7 @@
* Build the gmon.out file.
*/
void
-dumpstate(kvp)
- struct kvmvars *kvp;
+dumpstate(struct kvmvars *kvp)
{
register FILE *fp;
struct rawarc rawarc;
@@ -463,8 +458,7 @@
* Get the profiling rate.
*/
int
-getprofhz(kvp)
- struct kvmvars *kvp;
+getprofhz(struct kvmvars *kvp)
{
size_t size;
int mib[2], profrate;
@@ -490,8 +484,7 @@
* Reset the kernel profiling date structures.
*/
void
-reset(kvp)
- struct kvmvars *kvp;
+reset(struct kvmvars *kvp)
{
char *zbuf;
u_long biggest;
@@ -509,13 +502,13 @@
bzero(zbuf, biggest);
if (kflag) {
if (kvm_write(kvp->kd, (u_long)kvp->gpm.kcount, zbuf,
- kvp->gpm.kcountsize) != kvp->gpm.kcountsize)
+ kvp->gpm.kcountsize) != (ssize_t)kvp->gpm.kcountsize)
errx(13, "tickbuf zero: %s", kvm_geterr(kvp->kd));
if (kvm_write(kvp->kd, (u_long)kvp->gpm.froms, zbuf,
- kvp->gpm.fromssize) != kvp->gpm.fromssize)
+ kvp->gpm.fromssize) != (ssize_t)kvp->gpm.fromssize)
errx(14, "froms zero: %s", kvm_geterr(kvp->kd));
if (kvm_write(kvp->kd, (u_long)kvp->gpm.tos, zbuf,
- kvp->gpm.tossize) != kvp->gpm.tossize)
+ kvp->gpm.tossize) != (ssize_t)kvp->gpm.tossize)
errx(15, "tos zero: %s", kvm_geterr(kvp->kd));
return;
}
More information about the Midnightbsd-cvs
mailing list