Formatted printa() is broken

A few tests were failing due simply to this bug. Their XFAIL annotations should be removed. Add stddev and llquantize to tst.basics.d so that all aggregation functions are tested; each function causes a specific callback to be used. #5 Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com> Signed-off-by: Eugene Loh <eugene.loh@oracle.com> Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>
oracle · Jan 14, 2021 · 4413e6d · 4413e6d
1 parent 8068b2c
commit 4413e6d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/libdtrace/dt_printf.c b/libdtrace/dt_printf.c
@@ -1381,9 +1381,10 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
 				curagg++;
 
 			rec = &agg->dtagd_recs[aggrec];
-			addr = aggdata->dtada_data + rec->dtrd_offset;
+			addr = aggdata->dtada_data;
 			limit = addr + aggdata->dtada_size;
 			normal = aggdata->dtada_normal;
+			size = agg->dtagd_size;
 			sig = agg->dtagd_sig;
 			flags = DTRACE_BUFDATA_AGGVAL;
 		} else {
@@ -1408,11 +1409,10 @@ dt_printf_format(dtrace_hdl_t *dtp, FILE *fp, const dt_pfargv_t *pfv,
 			addr = (caddr_t)buf + rec->dtrd_offset;
 			limit = lim;
 			normal = 1;
+			size = rec->dtrd_size;
 			sig = 0;
 		}
 
-		size = rec->dtrd_size;
-
 		if (addr + size > limit) {
 			dt_dprintf("bad size: addr=%p size=0x%x lim=%p\n",
 			    (void *)addr, rec->dtrd_size, (void *)lim);

diff --git a/test/unittest/aggs/tst.clearavg2.d b/test/unittest/aggs/tst.clearavg2.d
@@ -4,7 +4,6 @@
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
-/* @@xfail: dtv2 */
 
 /*
  * ASSERTION:

diff --git a/test/unittest/aggs/tst.multiaggs3.d b/test/unittest/aggs/tst.multiaggs3.d
@@ -4,7 +4,6 @@
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
-/* @@xfail: dtv2 */
 
 /*
  * ASSERTION:

diff --git a/test/unittest/printa/tst.basics.d b/test/unittest/printa/tst.basics.d
@@ -4,7 +4,6 @@
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
-/* @@xfail: dtv2 */
 
 /*
  * ASSERTION:
@@ -25,6 +24,9 @@ BEGIN
 	@e = min(1);
 	@f = sum(1);
 	@g = quantize(1);
+	@h = llquantize(320, 10, 0, 5, 5, 8);
+	@i = stddev(10);
+	@i = stddev(20);
 
 	printa("@a = %@u\n", @a);
 	printa("@b = %@u\n", @b);
@@ -33,6 +35,8 @@ BEGIN
 	printa("@e = %@u\n", @e);
 	printa("@f = %@u\n", @f);
 	printa("@g = %@d\n", @g);
+	printa("@h = %@d\n", @h);
+	printa("@i = %@d\n", @i);
 
 	exit(0);
 }
diff --git a/test/unittest/printa/tst.basics.r b/test/unittest/printa/tst.basics.r
@@ -15,4 +15,11 @@
                1 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 1        
                2 |                                         0        
 
+@h = 
+           value  ------------- Distribution ------------- count    
+             100 |                                         0        
+             200 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 8        
+             400 |                                         0        
+
+@i = 5