Re: svn commit: r267937 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
On Aug 3, 2014, at 9:47 AM, Warner Losh wrote: > > On Jul 28, 2014, at 9:23 PM, John Baldwin wrote: > >> On Thursday 26 June 2014 21:45:49 Rui Paulo wrote: >>> Author: rpaulo >>> Date: Thu Jun 26 21:45:49 2014 >>> New Revision: 267937 >>> URL: http://svnweb.freebsd.org/changeset/base/267937 >>> >>> Log: >>> MFV illumos >>> >>> 4477 DTrace should speak JSON >>> >>> MFC after: 2 weeks >> >> This makes kernel builds depend on userland sources. This breaks a lot of >> my >> work trees where I only checkout 'sys', and breaks a generally long-standing >> feature that the kernel was self-contained (recent bmake breakage to require >> the '-m /usr/src/share/mk' hack aside). Perhaps you could copy strtolctype.h >> to sys/cddl/contrib/opensolaris/common/util? We already duplicate >> sys/cddl/contrib/opensolaris/common/avl/avl.c in a like manner, presumably >> for >> the same reason. > > Just FYI: my intention is to remove that hack requirement, at least for host > != kernel > version cases.. I’ve had some issues with the “fix” that wound up with a > different > set of hacks once the initial MAKESYSPATH is fixed. Ah, the modules issue… I didn’t understand the breakage until I tried it myself... https://phabric.freebsd.org/D529 will fix it, if anybody wants to comment on it. Warner signature.asc Description: Message signed with OpenPGP using GPGMail
Re: svn commit: r267937 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
On Jul 28, 2014, at 9:23 PM, John Baldwin wrote: > On Thursday 26 June 2014 21:45:49 Rui Paulo wrote: >> Author: rpaulo >> Date: Thu Jun 26 21:45:49 2014 >> New Revision: 267937 >> URL: http://svnweb.freebsd.org/changeset/base/267937 >> >> Log: >> MFV illumos >> >> 4477 DTrace should speak JSON >> >> MFC after: 2 weeks > > This makes kernel builds depend on userland sources. This breaks a lot of my > work trees where I only checkout 'sys', and breaks a generally long-standing > feature that the kernel was self-contained (recent bmake breakage to require > the '-m /usr/src/share/mk' hack aside). Perhaps you could copy strtolctype.h > to sys/cddl/contrib/opensolaris/common/util? We already duplicate > sys/cddl/contrib/opensolaris/common/avl/avl.c in a like manner, presumably > for > the same reason. Just FYI: my intention is to remove that hack requirement, at least for host != kernel version cases.. I’ve had some issues with the “fix” that wound up with a different set of hacks once the initial MAKESYSPATH is fixed. Warner ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r267937 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
> On 28 Jul 2014, at 20:23, John Baldwin wrote: > >> On Thursday 26 June 2014 21:45:49 Rui Paulo wrote: >> Author: rpaulo >> Date: Thu Jun 26 21:45:49 2014 >> New Revision: 267937 >> URL: http://svnweb.freebsd.org/changeset/base/267937 >> >> Log: >> MFV illumos >> >> 4477 DTrace should speak JSON >> >> MFC after:2 weeks > > This makes kernel builds depend on userland sources. This breaks a lot of my > work trees where I only checkout 'sys', and breaks a generally long-standing > feature that the kernel was self-contained (recent bmake breakage to require > the '-m /usr/src/share/mk' hack aside). Perhaps you could copy strtolctype.h > to sys/cddl/contrib/opensolaris/common/util? We already duplicate > sys/cddl/contrib/opensolaris/common/avl/avl.c in a like manner, presumably > for > the same reason. I didn't know that was a long standing feature. I'll copy the file. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r267937 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
On Thursday 26 June 2014 21:45:49 Rui Paulo wrote: > Author: rpaulo > Date: Thu Jun 26 21:45:49 2014 > New Revision: 267937 > URL: http://svnweb.freebsd.org/changeset/base/267937 > > Log: > MFV illumos > > 4477 DTrace should speak JSON > > MFC after: 2 weeks This makes kernel builds depend on userland sources. This breaks a lot of my work trees where I only checkout 'sys', and breaks a generally long-standing feature that the kernel was self-contained (recent bmake breakage to require the '-m /usr/src/share/mk' hack aside). Perhaps you could copy strtolctype.h to sys/cddl/contrib/opensolaris/common/util? We already duplicate sys/cddl/contrib/opensolaris/common/avl/avl.c in a like manner, presumably for the same reason. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r267937 - in head: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/...
Author: rpaulo
Date: Thu Jun 26 21:45:49 2014
New Revision: 267937
URL: http://svnweb.freebsd.org/changeset/base/267937
Log:
MFV illumos
4477 DTrace should speak JSON
MFC after:2 weeks
Added:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/json/
- copied from r266987, vendor/illumos/dist/cmd/dtrace/test/tst/common/json/
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/strtoll/
- copied from r266987,
vendor/illumos/dist/cmd/dtrace/test/tst/common/strtoll/
head/cddl/contrib/opensolaris/common/util/
- copied from r267931, vendor/illumos/dist/common/util/
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
head/cddl/contrib/opensolaris/common/util/strtolctype.h
head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
head/sys/modules/dtrace/dtrace/Makefile
Directory Properties:
head/cddl/contrib/opensolaris/ (props changed)
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
==
--- head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
Thu Jun 26 21:44:30 2014(r267936)
+++ head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d
Thu Jun 26 21:45:49 2014(r267937)
@@ -22,6 +22,7 @@
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright (c) 2012, Joyent, Inc. All rights reserved.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
@@ -98,6 +99,8 @@ STRFUNC(inet_ntoa((ipaddr_t *)alloca(siz
STRFUNC(inet_ntoa6((in6_addr_t *)alloca(sizeof (in6_addr_t
STRFUNC(inet_ntop(AF_INET, (void *)alloca(sizeof (ipaddr_t
INTFUNC(getf(0))
+INTFUNC(strtoll("0x12EE5D5", 16))
+STRFUNC(json("{\"systemtap\": false}", "systemtap"))
BEGIN
/subr == DIF_SUBR_MAX + 1/
Modified:
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
==
---
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
Thu Jun 26 21:44:30 2014(r267936)
+++
head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh
Thu Jun 26 21:45:49 2014(r267937)
@@ -22,8 +22,8 @@
#
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
+# Copyright (c) 2012, Joyent, Inc. All rights reserved.
#
-#ident "%Z%%M% %I% %E% SMI"
ppriv -s A=basic,dtrace_proc,dtrace_user $$
@@ -31,7 +31,7 @@ ppriv -s A=basic,dtrace_proc,dtrace_user
BEGIN {
errorcount = 0;
- expected_errorcount = 23;
+ expected_errorcount = 27;
}
BEGIN { trace(mutex_owned(&`pidlock)); }
@@ -55,6 +55,8 @@ BEGIN { trace(strtok(`initname, "/")); }
BEGIN { trace(strtok(NULL, "/")); }
BEGIN { trace(strtok("foo/bar", `initname)); }
BEGIN { trace(strtok(NULL, `initname)); }
+BEGIN { trace(strtoll(`initname)); }
+BEGIN { trace(strtoll(`initname, 10)); }
BEGIN { trace(substr(`initname, 2, 3)); }
BEGIN { trace(ddi_pathname(`top_devinfo, 1)); }
@@ -63,6 +65,9 @@ BEGIN { trace(strjoin("foo", `initname))
BEGIN { trace(dirname(`initname)); }
BEGIN { trace(cleanpath(`initname)); }
+BEGIN { j = "{\"/sbin/init\":\"uh oh\"}"; trace(json(j, `initname)); }
+BEGIN { trace(json(`initname, "x")); }
+
ERROR {
errorcount++;
}
Modified: head/cddl/contrib/opensolaris/common/util/strtolctype.h
==
--- vendor/illumos/dist/common/util/strtolctype.h Thu Jun 26 19:48:59
2014(r267931)
+++ head/cddl/contrib/opensolaris/common/util/strtolctype.h Thu Jun 26
21:45:49 2014(r267937)
@@ -44,7 +44,7 @@ extern "C" {
* safe in probe context.
*/
-#ifdefined(_KERNEL) || defined(_BOOT)
+#if defined(sun) &&(defined(_KERNEL) || defined(_BOOT))
#defineisalnum(ch) (isalpha(ch) || isdigit(ch))
#defineisalpha(ch) (isupper(ch) || islower(ch))
Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cThu Jun
26 21:44:30 2014(r267936)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cThu Jun
26 21:45:49 2014(r267937)
@@ -123,8 +123,9 @@
#defineDT_VERS_1_9 DT_VERSION_NUMBER(1, 9, 0)
#defineDT_VERS_1_9_1 DT_VERSION_NUMBER(1, 9, 1)
#defineDT_VERS_1_10DT_VERSION_NUMBER(1, 10, 0)
-#defineDT_VERS_LATEST DT_VERS_1_10
-#
