diff options
| author | Rui Paulo <rpaulo@FreeBSD.org> | 2014-06-26 23:21:11 +0000 |
|---|---|---|
| committer | Rui Paulo <rpaulo@FreeBSD.org> | 2014-06-26 23:21:11 +0000 |
| commit | 8e648814b040d481f0429a2675e62af92b23bdd0 (patch) | |
| tree | 6a80286a487fba6384a58aad25d078d5681e0abf /cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c | |
| parent | 09779aae33753abb43560827746abd9a1bdb8072 (diff) | |
| parent | b9aa9b1022156f2e88698b583e4daa93de7316a6 (diff) | |
| download | src-8e648814b040d481f0429a2675e62af92b23bdd0.tar.gz src-8e648814b040d481f0429a2675e62af92b23bdd0.zip | |
MFV illumos
4474 DTrace Userland CTF Support
4475 DTrace userland Keyword
4476 DTrace tests should be better citizens
4479 pid provider types
4480 dof emulation is missing checks
MFC after: 2 weeks
Notes
Notes:
svn path=/head/; revision=267941
Diffstat (limited to 'cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c index 871fdd530487..d717d569629d 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c @@ -21,7 +21,8 @@ */ /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright (c) 2013 Joyent, Inc. All rights reserved. * Use is subject to license terms. */ @@ -779,7 +780,7 @@ dt_decl_enumerator(char *s, dt_node_t *dnp) yyintdecimal = 0; dnp = dt_node_int(value); - dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type); + dt_node_type_assign(dnp, dsp->ds_ctfp, dsp->ds_type, B_FALSE); if ((inp = malloc(sizeof (dt_idnode_t))) == NULL) longjmp(yypcb->pcb_jmpbuf, EDT_NOMEM); @@ -821,6 +822,8 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip) char *name; int rv; + tip->dtt_flags = 0; + /* * Based on our current #include depth and decl stack depth, determine * which dynamic CTF module and scope to use when adding any new types. @@ -828,6 +831,9 @@ dt_decl_type(dt_decl_t *ddp, dtrace_typeinfo_t *tip) dmp = yypcb->pcb_idepth ? dtp->dt_cdefs : dtp->dt_ddefs; flag = yypcb->pcb_dstack.ds_next ? CTF_ADD_NONROOT : CTF_ADD_ROOT; + if (ddp->dd_attr & DT_DA_USER) + tip->dtt_flags = DTT_FL_USER; + /* * If we have already cached a CTF type for this decl, then we just * return the type information for the cached type. |