In D41745#983815, @markj wrote:If I compile usr.sbin/dtrace with this patch applied, I get:
In file included from /home/markj/src/freebsd/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c:59: /usr/include/libxo/xo.h:31:9: error: 'NORETURN' macro redefined [-Werror,-Wmacro-redefined] 31 | #define NORETURN __dead2 | ^ /home/markj/src/freebsd/sys/contrib/openzfs/lib/libspl/include/assert.h:44:9: note: previous definition is here 44 | #define NORETURN __attribute__((__noreturn__)) | ^ 1 error generated. *** Error code 1 Stop. make: stopped in /home/markj/src/freebsd/cddl/usr.sbin/dtraceI tend to think that xo.h should undefine those symbols (NORETURN and PRINTFLIKE) at the end, or give them a XO_ namespace prefix. I'll fix it up locally and keep testing, but we need some solution for this before committing. (Or am I doing something wrong?)
- Queries
- All Stories
- Search
- Advanced Search
- Transactions
- Transaction Logs
Feed Advanced Search
Advanced Search
Advanced Search
Dec 28 2023
Dec 28 2023
Nov 1 2023
Nov 1 2023
$ sudo dtrace -n 'BEGIN { mod(0xffffffff8261a000); exit(0); }'
dtrace: description 'BEGIN ' matched 1 probe
CPU ID FUNCTION:NAME6 1 :BEGIN opensolaris.ko
Oct 20 2023
Oct 20 2023
Oct 18 2023
Oct 18 2023
In D41745#951971, @domagoj.stolfa_gmail.com wrote:In D41745#951858, @stephane.rochoy_stormshield.eu wrote:I suggest to think about adding --libxo foo as an alias to -x oformat=foo to make things more inline with what is actually done for, e.g., netstat(1).
Thanks for the feedback! I don't take a strong view on whether or not xo_parse_args() should be called at the start, though it might require some finessing to make it work happily with libdtrace because xo_parse_args() sets a number of flags for libxo that I don't with -x oformat (such as colored output in some cases). Another thing worth pondering is that this is also an argument to libdtrace rather than dtrace(1), so one would inevitably need to still call dtrace_setopt(). Now, however libxo configuration would be performed twice: once in dtrace(1), and once in libdtrace. dtrace(1) itself would explicitly need to include libxo and link against it, but this isn't a big issue IMO, it just "feels" cleaner to me for it to only link against libdtrace and for libdtrace to provide all the libxo handling and configuration and for any consumer code (including dtrace(1)) to simply request it.
However I do agree with the general point that there is an inconsistency with the rest of the base system when it comes to libxo integration (though it's inconsistent in a fair bit of other ways too). One way to work around the issue without xo_parse_args() would be perhaps to add a - flag and manually parse out the -libxo ... that follows? I'm not sure what the best approach would be that doesn't get slightly messy.
Jun 27 2023
Jun 27 2023
Looks good. FWIW, the fix in the repo is in commit de776ab1a8985fbeb510af8e39777fa9db69d3d9:
Feb 2 2023
Feb 2 2023
Jan 30 2023
Jan 30 2023
Add missing check for xo_parse_args return code.
Sorry for the delay.
Import Juniper libxo-1.6.0
phil committed rG34b867ca3047: Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge (authored by phil).
Merge commit '7087c8de43b0d5d27c52da6ba2ba4957b7e336ff' into new_merge
Vendor import of Juniper libxo at 1.6.0
Jan 27 2023
Jan 27 2023
Vendor import of NetBSD's mtree at 2020-12-11
Apr 4 2022
Apr 4 2022
While I have fond memories of snobol, I'm thinking you've got the wrong "phil".
Mar 25 2022
Mar 25 2022
These are in the libxo sources on github:
Mar 1 2022
Mar 1 2022
Looks good. I do see an error on this site that says some nameless file is missing a terminating newline.
Sep 29 2021
Sep 29 2021
One more thing: Does libxo need an xo_exit() function? It would be just xo_finish + exit, like your EXIT macro, but might help minimize diffs like this.
xo_parse_args gives error messages for invalid arguments; no further error is needed.
Aug 24 2021
Aug 24 2021
Cameron,
You said "it seems that most check"; did you find ones that didn't?
Yes, you need to check it. See xo_parse_args(3):
Aug 4 2021
Aug 4 2021
phil committed rGcd2401cdd550: add blank line between variables (testing git commit) (authored by phil).
add blank line between variables (testing git commit)
Jun 2 2021
Jun 2 2021
In D30350#687710, @me_cameronkatri.com wrote:I could swear I tried this, I’ll update the patch shortly.
In D30350#681699, @me_cameronkatri.com wrote:Run xo_finish(3) after all instances of xo_errx(3)
FYI: I've just added docs for this, so it will be in the next release, which I'll import shortly, but the functionality's already there.
Looks good. You can use {L:} for strings that include slashes by escaping them with double backslashes (one for C, one for me):
Apr 21 2021
Apr 21 2021
Correction: for your patch the test would be opposite:
Apologies, I missed your reply to my question, but it's still something I'm not following:
Aug 25 2020
Aug 25 2020
Looks good. I'll mirror these fixes in github.
Jun 8 2020
Jun 8 2020
The "%hs" bits look good, but why do you add the call to xo_no_setlocale()?
May 27 2020
May 27 2020
Just knowing that the "--libxo" was used is not sufficient, since there are options that should not affect output (e.g. color, no-humanize, warn).
Jan 25 2020
Jan 25 2020
Dec 16 2019
Dec 16 2019
Allow proper builds of libxo's CSV encoder:
Nov 7 2019
Nov 7 2019
Remove oxtradoc version of documentation; move to RST/Sphinx
Back out encoder compilation to unbreak HEAD.
Oct 29 2019
Oct 29 2019
Looks great! Thanks....
May 7 2019
May 7 2019
Strange error; libtool related. On some platforms it seems to remove the ".test" extension. I'll add a fix to libxo to force removal of the extension (using xo_program() to set it to the basename), but for now, the fix here will be fine.
May 6 2019
May 6 2019
Apr 5 2019
Apr 5 2019
Emergency fix for NULL deref in xo_xml_leader_len
Apr 3 2019
Apr 3 2019
Add "MAKE=gmake" to "configure" invocations in libxo import script
Jan 1 2019
Jan 1 2019
The responsibility for valid tags should rest with the caller, but under the "never do the wrong thing", I'll pick up this fix, along with a "warning" call to help coders notice the breakage.
May 23 2018
May 23 2018
May 14 2018
May 14 2018
Handle thread-local storage (TLS) segments correctly when
Sep 25 2017
Sep 25 2017
Looks good. Thanks....
Sep 24 2017
Sep 24 2017
FWIW, this bug is mine, from the original patch sets:
Aug 7 2017
Aug 7 2017
Import libxo-0.8.4 from HEAD into stable/11
Aug 3 2017
Aug 3 2017
Update from libxo-0.8.1 to 0.8.4:
Jun 30 2017
Jun 30 2017
Fix functional_test.sh to use --libxo options instead of the deprecated
Jun 16 2017
Jun 16 2017
Update libxo's import shell for xohtml
Jun 13 2017
Jun 13 2017
Use {T:Capacity} for header so html output looks tidy
Jun 9 2017
Jun 9 2017
Fix import.sh w/ new $BUILDWORLD
Import libxo-0.8.1 with official fix to today's build break.
Jun 8 2017
Jun 8 2017
remove xo_color_t dup typedef
May 16 2017
May 16 2017
Import libxo-0.7.2; add xo_options.7.
Jul 26 2016
Jul 26 2016
Fix start date to not be in the future.
Jul 2 2016
Jul 2 2016
May 29 2016
May 29 2016
May 28 2016
May 28 2016
phil committed rS300912: Undo meaningless local changes to libxo so we're in sync with the github repo..
Undo meaningless local changes to libxo so we're in sync with the github repo.
Apr 15 2016
Apr 15 2016
Apr 12 2016
Apr 12 2016
add FreeBSD header to copied files