print_affinitylist: use tprint_bitset_* helpers to print bitsets

* src/affinity.c (print_affinitylist): Replace tprint_array_* helpers
with the corresponding tprint_bitset_* helpers.
* tests/io_uring_register.c (main): Update expected output.
* tests/sched_xetaffinity.c (main): Likewise.

3 files changed, 19 insertions, 24 deletions

diff --git a/src/affinity.c b/src/affinity.c
index a64e58a15..c69ffee71 100644
--- a/src/affinity.c
+++ b/src/affinity.c
@@ -71,28 +71,23 @@ print_affinitylist(struct tcb *const tcp, const kernel_ulong_t addr,
 	if (!umoven_or_printaddr(tcp, addr, umove_size, cpu)) {
 		bool printed = false;
 
-		/*
-		 * XXX: this is a bitset printed as if it was an array,
-		 * should be fixed as soon as we decide on the right way
-		 * of printing such bitsets.
-		 */
-		tprint_array_begin();
+		tprint_bitset_begin();
 		for (int i = 0;; i++) {
 			i = next_set_bit(cpu, i, ncpu);
 			if (i < 0)
 				break;
 			if (printed)
-				tprint_array_next();
+				tprint_bitset_next();
 			else
 				printed = true;
 			PRINT_VAL_D(i);
 		}
 		if (size < len) {
 			if (printed)
-				tprint_array_next();
+				tprint_bitset_next();
 			tprint_more_data_follows();
 		}
-		tprint_array_end();
+		tprint_bitset_end();
 	}
 
 	free(cpu);
diff --git a/tests/io_uring_register.c b/tests/io_uring_register.c
index b95d06546..3b7879ae0 100644
--- a/tests/io_uring_register.c
+++ b/tests/io_uring_register.c
@@ -890,12 +890,12 @@ main(void)
 	       XLAT_KNOWN(0x11, "IORING_REGISTER_IOWQ_AFF")
 #ifdef WORDS_BIGENDIAN
 # if SIZEOF_LONG > 4
-	       ", [49, 50, 51, 54, 55, 57, 59, 60, 61, 62, 63]" /* face */
+	       ", [49 50 51 54 55 57 59 60 61 62 63]" /* face */
 # else
-	       ", [16, 18, 19, 21, 23, 25, 26, 27, 28, 30, 31]" /* dead */
+	       ", [16 18 19 21 23 25 26 27 28 30 31]" /* dead */
 # endif
 #else
-	       ", [0, 1, 2, 3, 5, 6, 7, 9, 10, 11, 12, 13, 15]" /* beef */
+	       ", [0 1 2 3 5 6 7 9 10 11 12 13 15]" /* beef */
 #endif /* WORDS_BIGENDIAN */
 	       ", 2) = %s\n",
 	       fd_null, path_null, errstr);
@@ -909,18 +909,18 @@ main(void)
 	sys_io_uring_register(fd_null, 17, arg_aff, sizeof(aff));
 	printf("io_uring_register(%u<%s>, "
 	       XLAT_KNOWN(0x11, "IORING_REGISTER_IOWQ_AFF") ", "
-	       "[0, 2, 3, 5, 6, 7, 10, 11, 13, 15" /* aced */
-	       ", 16, 17, 18, 19, 20, 22, 23, 25, 27, 28, 30, 31" /* dadf */
+	       "[0 2 3 5 6 7 10 11 13 15" /* aced */
+	       " 16 17 18 19 20 22 23 25 27 28 30 31" /* dadf */
 #if SIZEOF_LONG > 4
-	       ", 32, 34, 35, 37, 38, 39, 40, 42, 43" /* 0ded */
-	       ", 50, 51, 52, 54, 55, 57, 59, 60, 61, 63" /* badc */
-	       ", 64, 65, 66, 67, 69, 70, 71, 73, 74, 75, 76, 77, 79" /* beef */
-	       ", 80, 82, 83, 85, 87, 89, 90, 91, 92, 94, 95" /* dead feed */
-	       ", 96, 98, 99, 101, 102, 103, 105, 106, 107, 108, 109, 110, 111"
-	       ", 113, 114, 115, 118, 119, 121, 123, 124, 125, 126, 127"/*face*/
+	       " 32 34 35 37 38 39 40 42 43" /* 0ded */
+	       " 50 51 52 54 55 57 59 60 61 63" /* badc */
+	       " 64 65 66 67 69 70 71 73 74 75 76 77 79" /* beef */
+	       " 80 82 83 85 87 89 90 91 92 94 95" /* dead feed */
+	       " 96 98 99 101 102 103 105 106 107 108 109 110 111"
+	       " 113 114 115 118 119 121 123 124 125 126 127"/*face*/
 #else
-	       ", 32, 33, 34, 35, 37, 38, 39, 41, 42, 43, 44, 45, 47" /* beef */
-	       ", 48, 50, 51, 53, 55, 57, 58, 59, 60, 62, 63" /* dead */
+	       " 32 33 34 35 37 38 39 41 42 43 44 45 47" /* beef */
+	       " 48 50 51 53 55 57 58 59 60 62 63" /* dead */
 #endif
 	       "], %zu) = %s\n",
 	       fd_null, path_null, sizeof(aff), errstr);
diff --git a/tests/sched_xetaffinity.c b/tests/sched_xetaffinity.c
index 4cd9895c4..f1691beab 100644
--- a/tests/sched_xetaffinity.c
+++ b/tests/sched_xetaffinity.c
@@ -84,7 +84,7 @@ main(void)
 	for (i = 0, cpu = 0, sep = ""; i < (unsigned) ret_size * 8; ++i) {
 		if (CPU_ISSET_S(i, (unsigned) ret_size, cpuset)) {
 			printf("%s%u", sep, i);
-			sep = ", ";
+			sep = " ";
 			cpu = i;
 			if (first_cpu == -1U)
 				first_cpu = i;
@@ -136,7 +136,7 @@ main(void)
 	for (i = 0, sep = ""; i < (unsigned) ret_size * 8; ++i) {
 		if (CPU_ISSET_S(i, (unsigned) ret_size, cpuset)) {
 			printf("%s%u", sep, i);
-			sep = ", ";
+			sep = " ";
 		}
 	}
 	printf("]) = %s\n", errstr);