Module Name: src
Committed By: riz
Date: Sun Jan 12 17:49:30 UTC 2014
Modified Files:
src/external/cddl/osnet/dev/systrace: systrace.c
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_consume.c
dt_dis.c dt_handle.c dt_link.c dt_options.c dt_parser.c dt_subr.c
Log Message:
Replace llx with PRIx64 and some llu with PRIu64 in format strings.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/cddl/osnet/dev/systrace/systrace.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dev/systrace/systrace.c
diff -u src/external/cddl/osnet/dev/systrace/systrace.c:1.3 src/external/cddl/osnet/dev/systrace/systrace.c:1.4
--- src/external/cddl/osnet/dev/systrace/systrace.c:1.3 Sun Jul 17 20:54:33 2011
+++ src/external/cddl/osnet/dev/systrace/systrace.c Sun Jan 12 17:49:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace.c,v 1.3 2011/07/17 20:54:33 joerg Exp $ */
+/* $NetBSD: systrace.c,v 1.4 2014/01/12 17:49:30 riz Exp $ */
/*
* CDDL HEADER START
@@ -38,7 +38,9 @@
#include <sys/cpuvar.h>
#include <sys/fcntl.h>
#include <sys/filio.h>
+#ifdef __FreeBSD__
#include <sys/kdb.h>
+#endif
#include <sys/kernel.h>
#include <sys/kmem.h>
#include <sys/kthread.h>
@@ -51,9 +53,12 @@
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/selinfo.h>
+#ifdef __FreeBSD__
#include <sys/smp.h>
#include <sys/sysproto.h>
#include <sys/sysent.h>
+#endif
+#include <sys/syscallargs.h>
#include <sys/uio.h>
#include <sys/unistd.h>
@@ -78,7 +83,7 @@ extern struct sysent linux_sysent[];
*/
#include <sys/syscall.h>
#include <kern/systrace_args.c>
-extern const char *syscallnames[];
+extern const char * const syscallnames[];
#define DEVNAME "dtrace/systrace"
#define PROVNAME "syscall"
#define MAXSYSCALL SYS_MAXSYSCALL
@@ -98,15 +103,18 @@ extern const char *syscallnames[];
#error 1 << SYSTRACE_SHIFT must exceed number of system calls
#endif
+#ifdef __FreeBSD__
static d_open_t systrace_open;
+#endif
static int systrace_unload(void);
static void systrace_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *);
-static void systrace_provide(void *, dtrace_probedesc_t *);
+static void systrace_provide(void *, const dtrace_probedesc_t *);
static void systrace_destroy(void *, dtrace_id_t, void *);
-static void systrace_enable(void *, dtrace_id_t, void *);
+static int systrace_enable(void *, dtrace_id_t, void *);
static void systrace_disable(void *, dtrace_id_t, void *);
static void systrace_load(void *);
+#ifdef __FreeBSD__
static struct cdevsw systrace_cdevsw = {
.d_version = D_VERSION,
.d_open = systrace_open,
@@ -116,9 +124,10 @@ static struct cdevsw systrace_cdevsw = {
.d_name = "systrace",
#endif
};
+#endif
static union {
- const char **p_constnames;
+ const char * const *p_constnames;
char **pp_syscallnames;
} uglyhack = { SYSCALLNAMES };
@@ -143,7 +152,9 @@ static dtrace_pops_t systrace_pops = {
systrace_destroy
};
+#ifdef __FreeBSD__
static struct cdev *systrace_cdev;
+#endif
static dtrace_provider_id_t systrace_id;
#if !defined(LINUX_SYSTRACE)
@@ -155,21 +166,21 @@ static dtrace_provider_id_t systrace_id;
* compat syscall from something like Linux.
*/
static void
-systrace_probe(u_int32_t id, int sysnum, struct sysent *sysent, void *params)
+systrace_probe(u_int32_t id, int sysnum, struct sysent *se, void *params)
{
int n_args = 0;
- u_int64_t uargs[8];
+ union systrace_probe_args_un uargs[SYS_MAXSYSARGS];
/*
* Check if this syscall has an argument conversion function
* registered.
*/
- if (sysent->sy_systrace_args_func != NULL)
+ if (se->sy_systrace_args_func != NULL)
/*
* Convert the syscall parameters using the registered
* function.
*/
- (*sysent->sy_systrace_args_func)(sysnum, params, uargs, &n_args);
+ (*se->sy_systrace_args_func)(sysnum, params, uargs, &n_args);
else
/*
* Use the built-in system call argument conversion
@@ -180,7 +191,8 @@ systrace_probe(u_int32_t id, int sysnum,
systrace_args(sysnum, params, uargs, &n_args);
/* Process the probe using the converted argments. */
- dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]);
+ dtrace_probe(id, uargs[0].u, uargs[1].u, uargs[2].u, uargs[3].u,
+ uargs[4].u);
}
#endif
@@ -199,7 +211,7 @@ systrace_getargdesc(void *arg, dtrace_id
}
static void
-systrace_provide(void *arg, dtrace_probedesc_t *desc)
+systrace_provide(void *arg, const dtrace_probedesc_t *desc)
{
int i;
@@ -238,7 +250,7 @@ systrace_destroy(void *arg, dtrace_id_t
#endif
}
-static void
+static int
systrace_enable(void *arg, dtrace_id_t id, void *parg)
{
int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
@@ -250,6 +262,7 @@ systrace_enable(void *arg, dtrace_id_t i
SYSENT[sysnum].sy_entry = id;
else
SYSENT[sysnum].sy_return = id;
+ return 0;
}
static void
@@ -264,16 +277,18 @@ systrace_disable(void *arg, dtrace_id_t
static void
systrace_load(void *dummy)
{
+#ifdef __FreeBSD__
/* Create the /dev/dtrace/systrace entry. */
systrace_cdev = make_dev(&systrace_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
DEVNAME);
+#endif
if (dtrace_register(PROVNAME, &systrace_attr, DTRACE_PRIV_USER,
NULL, &systrace_pops, NULL, &systrace_id) != 0)
return;
#if !defined(LINUX_SYSTRACE)
- systrace_probe_func = systrace_probe;
+ systrace_probe_func = (systrace_probe_func_t)systrace_probe;
#endif
}
@@ -290,11 +305,14 @@ systrace_unload()
systrace_probe_func = NULL;
#endif
+#ifdef __FreeBSD__
destroy_dev(systrace_cdev);
+#endif
return (error);
}
+#ifdef __FreeBSD__
static int
systrace_modevent(module_t mod __unused, int type, void *data __unused)
{
@@ -340,3 +358,27 @@ MODULE_VERSION(systrace, 1);
MODULE_DEPEND(systrace, dtrace, 1, 1, 1);
MODULE_DEPEND(systrace, opensolaris, 1, 1, 1);
#endif
+#endif /* __FreeBSD__ */
+
+#ifdef __NetBSD__
+
+static int
+systrace_modcmd(modcmd_t cmd, void *data)
+{
+ switch (cmd) {
+ case MODULE_CMD_INIT:
+ systrace_load(NULL);
+ return 0;
+
+ case MODULE_CMD_FINI:
+ systrace_unload();
+ return 0;
+
+ default:
+ return ENOTTY;
+ }
+}
+
+MODULE(MODULE_CLASS_MISC, systrace, "dtrace");
+
+#endif
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.5
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c:1.4 Sat Feb 27 23:43:52 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c Sun Jan 12 17:49:30 2014
@@ -868,9 +868,9 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *
if (dtrace_lookup_by_addr(dtp, pc, &sym, &dts) == 0) {
if (pc > sym.st_value) {
- (void) snprintf(c, sizeof (c), "%s`%s+0x%llx",
- dts.dts_object, dts.dts_name,
- pc - sym.st_value);
+ (void) snprintf(c, sizeof (c),
+ "%s`%s+0x%" PRIx64, dts.dts_object,
+ dts.dts_name, pc - sym.st_value);
} else {
(void) snprintf(c, sizeof (c), "%s`%s",
dts.dts_object, dts.dts_name);
@@ -882,10 +882,11 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *
* interested in the containing module.
*/
if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) {
- (void) snprintf(c, sizeof (c), "%s`0x%llx",
+ (void) snprintf(c, sizeof (c), "%s`0x%" PRIx64,
dts.dts_object, pc);
} else {
- (void) snprintf(c, sizeof (c), "0x%llx", pc);
+ (void) snprintf(c, sizeof (c),
+ "0x%" PRIx64, pc);
}
}
@@ -967,8 +968,8 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE
if (pc[i] > sym.st_value) {
(void) snprintf(c, sizeof (c),
- "%s`%s+0x%llx", dt_basename(objname), name,
- (u_longlong_t)(pc[i] - sym.st_value));
+ "%s`%s+0x%" PRIx64, dt_basename(objname),
+ name, (pc[i] - sym.st_value));
} else {
(void) snprintf(c, sizeof (c),
"%s`%s", dt_basename(objname), name);
@@ -1001,11 +1002,11 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE
if (P != NULL && proc_objname(P, pc[i], objname,
#endif
sizeof (objname)) != 0) {
- (void) snprintf(c, sizeof (c), "%s`0x%llx",
- dt_basename(objname), (u_longlong_t)pc[i]);
+ (void) snprintf(c, sizeof (c), "%s`0x%" PRIx64,
+ dt_basename(objname), pc[i]);
} else {
- (void) snprintf(c, sizeof (c), "0x%llx",
- (u_longlong_t)pc[i]);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64,
+ pc[i]);
}
}
@@ -1133,7 +1134,7 @@ dt_print_umod(dtrace_hdl_t *dtp, FILE *f
#endif
(void) snprintf(c, sizeof (c), "%s", dt_basename(objname));
} else {
- (void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64, pc);
}
err = dt_printf(dtp, fp, format, c);
@@ -1480,11 +1481,10 @@ dt_print_sym(dtrace_hdl_t *dtp, FILE *fp
* the containing module.
*/
if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) {
- (void) snprintf(c, sizeof (c), "%s`0x%llx",
- dts.dts_object, (u_longlong_t)pc);
+ (void) snprintf(c, sizeof (c), "%s`0x%" PRIx64,
+ dts.dts_object, pc);
} else {
- (void) snprintf(c, sizeof (c), "0x%llx",
- (u_longlong_t)pc);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64, pc);
}
}
@@ -1508,7 +1508,7 @@ dt_print_mod(dtrace_hdl_t *dtp, FILE *fp
if (dtrace_lookup_by_addr(dtp, pc, NULL, &dts) == 0) {
(void) snprintf(c, sizeof (c), "%s", dts.dts_object);
} else {
- (void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64, pc);
}
if (dt_printf(dtp, fp, format, c) < 0)
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c:1.5
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c:1.4 Tue Jul 26 12:28:39 2011
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c Sun Jan 12 17:49:30 2014
@@ -655,7 +655,7 @@ dt_opt_rate(dtrace_hdl_t *dtp, const cha
}
}
- if (suffix[i].name == NULL && *end != '\0' || val < 0)
+ if ((suffix[i].name == NULL && *end != '\0') || val < 0)
return (dt_set_errno(dtp, EDT_BADOPTVAL));
if (mul == 0) {
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c:1.1.1.1 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c:1.2
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c:1.1.1.1 Sat Feb 20 04:33:42 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c Sun Jan 12 17:49:30 2014
@@ -171,8 +171,8 @@ dt_dis_setx(const dtrace_difo_t *dp, con
intptr, DIF_INSTR_RD(in));
if (intptr < dp->dtdo_intlen) {
- (void) fprintf(fp, "\t\t! 0x%llx",
- (u_longlong_t)dp->dtdo_inttab[intptr]);
+ (void) fprintf(fp, "\t\t! 0x%" PRIx64,
+ dp->dtdo_inttab[intptr]);
}
}
@@ -318,9 +318,8 @@ dt_dis_rtab(const char *rtag, const dtra
rtag, "OFFSET", "DATA", "NAME");
for (; len != 0; len--, rp++) {
- (void) fprintf(fp, "%-4u %-8llu %-8llu %s\n",
- rp->dofr_type, (u_longlong_t)rp->dofr_offset,
- (u_longlong_t)rp->dofr_data,
+ (void) fprintf(fp, "%-4u %-8" PRIu64 "%-8" PRIu64 "%s\n",
+ rp->dofr_type, rp->dofr_offset, rp->dofr_data,
&dp->dtdo_strtab[rp->dofr_name]);
}
}
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c:1.2 Sun Feb 21 00:49:54 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c Sun Jan 12 17:49:30 2014
@@ -207,8 +207,7 @@ dt_handle_err(dtrace_hdl_t *dtp, dtrace_
case DTRACEFLT_BADADDR:
case DTRACEFLT_BADALIGN:
case DTRACEFLT_BADSTACK:
- (void) sprintf(details, " (0x%llx)",
- (u_longlong_t)err.dteda_addr);
+ (void) sprintf(details, " (0x%" PRIx64 ")", err.dteda_addr);
break;
default:
@@ -334,7 +333,7 @@ dt_handle_cpudrop(dtrace_hdl_t *dtp, pro
size = sizeof (str);
}
- (void) snprintf(s, size, "%llu %sdrop%s on CPU %d\n",
+ (void) snprintf(s, size, "%" PRIu64 "%sdrop%s on CPU %ld\n",
howmany, what == DTRACEDROP_PRINCIPAL ? "" : "aggregation ",
howmany > 1 ? "s" : "", cpu);
@@ -427,7 +426,7 @@ dt_handle_status(dtrace_hdl_t *dtp, dtra
size = sizeof (str);
}
- (void) snprintf(s, size, "%llu %s%s%s\n", nval - oval,
+ (void) snprintf(s, size, "%" PRIu64 "%s%s%s\n", nval - oval,
_dt_droptab[i].dtdrt_str, (nval - oval > 1) ? "s" : "",
_dt_droptab[i].dtdrt_msg != NULL ?
_dt_droptab[i].dtdrt_msg : "");
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c:1.2 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c:1.3
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c:1.2 Sun Feb 21 00:49:55 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c Sun Jan 12 17:49:30 2014
@@ -404,8 +404,8 @@ dt_node_name(const dt_node_t *dnp, char
switch (dnp->dn_kind) {
case DT_NODE_INT:
- (void) snprintf(buf, len, "integer constant 0x%llx",
- (u_longlong_t)dnp->dn_value);
+ (void) snprintf(buf, len, "integer constant 0x%" PRIx64,
+ dnp->dn_value);
break;
case DT_NODE_STRING:
s = strchr2esc(dnp->dn_string, strlen(dnp->dn_string));
@@ -1234,8 +1234,8 @@ dt_node_int(uintmax_t value)
}
}
- xyerror(D_INT_OFLOW, "integer constant 0x%llx cannot be represented "
- "in any built-in integral type\n", (u_longlong_t)value);
+ xyerror(D_INT_OFLOW, "integer constant 0x%" PRIx64
+ "cannot be represented in any built-in integral type\n", value);
/*NOTREACHED*/
return (NULL); /* keep gcc happy */
}
@@ -4572,8 +4572,8 @@ dt_node_printr(dt_node_t *dnp, FILE *fp,
break;
case DT_NODE_INT:
- (void) fprintf(fp, "INT 0x%llx (%s)\n",
- (u_longlong_t)dnp->dn_value, buf);
+ (void) fprintf(fp, "INT 0x%" PRIx64 "(%s)\n",
+ dnp->dn_value, buf);
break;
case DT_NODE_STRING:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.3 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.4
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c:1.3 Sat Apr 3 18:43:34 2010
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c Sun Jan 12 17:49:30 2014
@@ -1108,7 +1108,7 @@ process_obj(dtrace_hdl_t *dtp, const cha
static const char dt_prefix[] = "__dtrace";
static const char dt_enabled[] = "enabled";
static const char dt_symprefix[] = "$dtrace";
- static const char dt_symfmt[] = "%s%d.%s";
+ static const char dt_symfmt[] = "%s%ld.%s";
int fd, i, ndx, eprobe, mod = 0;
Elf *elf = NULL;
GElf_Ehdr ehdr;
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.7
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.6 Wed Jan 2 21:19:13 2013
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c Sun Jan 12 17:49:30 2014
@@ -888,8 +888,8 @@ dtrace_addr2str(dtrace_hdl_t *dtp, uint6
s = alloca(n);
if (err == 0 && addr != sym.st_value) {
- (void) snprintf(s, n, "%s`%s+0x%llx", dts.dts_object,
- dts.dts_name, (u_longlong_t)addr - sym.st_value);
+ (void) snprintf(s, n, "%s`%s+0x%" PRIx64, dts.dts_object,
+ dts.dts_name, addr - sym.st_value);
} else if (err == 0) {
(void) snprintf(s, n, "%s`%s",
dts.dts_object, dts.dts_name);
@@ -900,10 +900,10 @@ dtrace_addr2str(dtrace_hdl_t *dtp, uint6
* containing module.
*/
if (dtrace_lookup_by_addr(dtp, addr, NULL, &dts) == 0) {
- (void) snprintf(s, n, "%s`0x%llx", dts.dts_object,
- (u_longlong_t)addr);
+ (void) snprintf(s, n, "%s`0x%" PRIx64, dts.dts_object,
+ addr);
} else {
- (void) snprintf(s, n, "0x%llx", (u_longlong_t)addr);
+ (void) snprintf(s, n, "0x%" PRIx64, addr);
}
}
@@ -924,7 +924,7 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_
P = dt_proc_grab(dtp, pid, PGRAB_RDONLY | PGRAB_FORCE, 0);
if (P == NULL) {
- (void) snprintf(c, sizeof (c), "0x%llx", addr);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64, addr);
return (dt_string2str(c, str, nbytes));
}
@@ -941,8 +941,8 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_
obj = dt_basename(objname);
if (addr > sym.st_value) {
- (void) snprintf(c, sizeof (c), "%s`%s+0x%llx", obj,
- name, (u_longlong_t)(addr - sym.st_value));
+ (void) snprintf(c, sizeof (c), "%s`%s+0x%" PRIx64,
+ obj, name, (addr - sym.st_value));
} else {
(void) snprintf(c, sizeof (c), "%s`%s", obj, name);
}
@@ -951,10 +951,10 @@ dtrace_uaddr2str(dtrace_hdl_t *dtp, pid_
#else
} else if (proc_objname(P, addr, objname, sizeof (objname)) != 0) {
#endif
- (void) snprintf(c, sizeof (c), "%s`0x%llx",
+ (void) snprintf(c, sizeof (c), "%s`0x%" PRIx64,
dt_basename(objname), addr);
} else {
- (void) snprintf(c, sizeof (c), "0x%llx", addr);
+ (void) snprintf(c, sizeof (c), "0x%" PRIx64, addr);
}
dt_proc_unlock(dtp, P);
