[DTrace-devel] [PATCH 45/61] Eliminate fun since it is always dt_agg_one_agg now

[eugene.loh at oracle.com]

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

---
 libdtrace/dt_aggregate.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libdtrace/dt_aggregate.c b/libdtrace/dt_aggregate.c
index e158bf50..ccd1934b 100644
--- a/libdtrace/dt_aggregate.c
+++ b/libdtrace/dt_aggregate.c
@@ -414,7 +414,6 @@ typedef struct dt_snapstate {
 	processorid_t	cpu;
 	char		*buf;
 	dt_aggregate_t	*agp;
-	agg_cpu_f	fun;
 } dt_snapstate_t;
 
 static void
@@ -483,12 +482,12 @@ dt_aggregate_snap_one(dt_idhash_t *dhp, dt_ident_t *aid, dt_snapstate_t *st)
 		agd = &h->dtahe_data;
 
 		rec = &agg->dtagd_recs[nrecs - 1];
-		st->fun(aid, (int64_t *)(agd->dtada_data + rec->dtrd_offset),
+		dt_agg_one_agg(aid, (int64_t *)(agd->dtada_data + rec->dtrd_offset),
 			       src, datasz);
 
 		/* If we keep per-CPU data - process that as well. */
 		if (agd->dtada_percpu != NULL)
-			st->fun(aid, (int64_t *)agd->dtada_percpu[st->cpu],
+			dt_agg_one_agg(aid, (int64_t *)agd->dtada_percpu[st->cpu],
 			    src, datasz);
 
 		return 0;
@@ -574,7 +573,7 @@ dt_aggregate_snap_one(dt_idhash_t *dhp, dt_ident_t *aid, dt_snapstate_t *st)
 }
 
 static int
-dt_aggregate_snap_cpu(dtrace_hdl_t *dtp, processorid_t cpu, agg_cpu_f fun)
+dt_aggregate_snap_cpu(dtrace_hdl_t *dtp, processorid_t cpu)
 {
 	dt_aggregate_t	*agp = &dtp->dt_aggregate;
 	char		*buf = agp->dtat_cpu_buf[cpu];
@@ -584,7 +583,6 @@ dt_aggregate_snap_cpu(dtrace_hdl_t *dtp, processorid_t cpu, agg_cpu_f fun)
 	st.cpu = cpu;
 	st.buf = buf;
 	st.agp = agp;
-	st.fun = fun;
 
 	return dt_idhash_iter(dtp->dt_aggs,
 			      (dt_idhash_f *)dt_aggregate_snap_one, &st);
@@ -614,8 +612,7 @@ dtrace_aggregate_snap(dtrace_hdl_t *dtp)
 		return dt_set_errno(dtp, -rval);
 
 	for (i = 0; i < dtp->dt_conf.num_online_cpus; i++) {
-		rval = dt_aggregate_snap_cpu(dtp, dtp->dt_conf.cpus[i].cpu_id,
-		    dt_agg_one_agg);
+		rval = dt_aggregate_snap_cpu(dtp, dtp->dt_conf.cpus[i].cpu_id);
 		if (rval != 0)
 			return rval;
 	}
-- 
2.18.4