[DTrace-devel] [PATCH 55/61] Eliminate dtagd_id

[eugene.loh at oracle.com]

From: Eugene Loh <eugene.loh at oracle.com>

In the port to BPF, dtagd_varid and dtagd_id are identical.
The longer name better reflects the current meaning.

Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
---
 cmd/dtrace.c              | 1 -
 include/dtrace/metadesc.h | 1 -
 libdtrace/dt_map.c        | 3 +--
 libdtrace/dt_printf.c     | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cmd/dtrace.c b/cmd/dtrace.c
index 7e43e0f1..172882a5 100644
--- a/cmd/dtrace.c
+++ b/cmd/dtrace.c
@@ -681,7 +681,6 @@ bufhandler(const dtrace_bufdata_t *bufdata, void *arg)
 		BUFDUMPHDR("  dtrace_aggdesc");
 		BUFDUMPSTR(desc, dtagd_name);
 		BUFDUMP(desc, dtagd_varid);
-		BUFDUMP(desc, dtagd_id);
 		BUFDUMP(desc, dtagd_nrecs);
 		BUFDUMPHDR("");
 	}
diff --git a/include/dtrace/metadesc.h b/include/dtrace/metadesc.h
index 97c11b7a..61d5fc97 100644
--- a/include/dtrace/metadesc.h
+++ b/include/dtrace/metadesc.h
@@ -54,7 +54,6 @@ typedef struct dtrace_aggdesc {
 	DTRACE_PTR(char, dtagd_name);		/* aggregation name */
 	dtrace_aggid_t dtagd_varid;		/* aggregation varID */
 	int dtagd_flags;			/* aggregation flags */
-	dtrace_aggid_t dtagd_id;		/* aggregation ID */
 	uint64_t dtagd_sig;			/* aggregation signature */
 	uint64_t dtagd_normal;			/* aggregation normalization */
 	uint32_t dtagd_size;			/* size in bytes */
diff --git a/libdtrace/dt_map.c b/libdtrace/dt_map.c
index d6c87ad2..7e97f42a 100644
--- a/libdtrace/dt_map.c
+++ b/libdtrace/dt_map.c
@@ -271,11 +271,10 @@ dt_aggid_add(dtrace_hdl_t *dtp, const dt_ident_t *aid, int nrecs)
 	if (agg == NULL)
 		return dt_set_errno(dtp, EDT_NOMEM);
 
-	agg->dtagd_id = id;
+	agg->dtagd_varid = id;
 	agg->dtagd_name = aid->di_name;
 	agg->dtagd_sig = ((dt_idsig_t *)aid->di_data)->dis_auxinfo;
 	agg->dtagd_normal = 1;
-	agg->dtagd_varid = aid->di_id;
 	agg->dtagd_size = -1;		/* to be set in dt_aggid_add_rec_data() */
 	agg->dtagd_nrecs = nrecs;
 
diff --git a/libdtrace/dt_printf.c b/libdtrace/dt_printf.c
index 825c9883..c1497de7 100644
--- a/libdtrace/dt_printf.c
+++ b/libdtrace/dt_printf.c
@@ -1814,7 +1814,7 @@ dt_fprinta(const dtrace_aggdata_t *adp, void *arg)
 	dt_pfwalk_t		*pfw = arg;
 	dtrace_hdl_t		*dtp = pfw->pfw_argv->pfv_dtp;
 
-	if (pfw->pfw_aid != agg->dtagd_id)
+	if (pfw->pfw_aid != agg->dtagd_varid)
 		return 0;	/* id does not match */
 
 	if (dt_printf_format(dtp, pfw->pfw_fp, pfw->pfw_argv, ++rec, --nrecs,
-- 
2.18.4