X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fgetcpu-override%2Flttng-ust-getcpu-override-test.c;h=f86826ca47700eaf6220774a84063516014f37fe;hp=f098e2cf3a751272a405dda3bb9089aa0e936076;hb=de76faf845535b90c71a30b996b411348f81f6be;hpb=568d7e2db7370f57e9612eb9b8c1a6b0bf5213cd;ds=sidebyside

diff --git a/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c b/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c
index f098e2cf3..f86826ca4 100644
--- a/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c
+++ b/tests/regression/ust/getcpu-override/lttng-ust-getcpu-override-test.c
@@ -31,6 +31,8 @@
 #include <unistd.h>
 #include <lttng/ust-getcpu.h>
 
+static long nprocessors;
+
 int plugin_getcpu(void)
 {
 	/* Generate a sequence based on the number of configurated processor
@@ -42,26 +44,29 @@ int plugin_getcpu(void)
 	 * plugin but provide a strong argument of it's validity.
 	 */
 	static int i = 0;
-	static int seq_seed[256] = {100, 57, 232, 236, 42, 193, 224, 184, 216, 150,
-		92, 91, 108, 118, 55, 243, 65, 101, 209, 0, 147, 36, 29, 34, 49, 188,
-		174, 105, 253, 245, 227, 238, 112, 20, 222, 201, 102, 175, 119, 19, 132,
-		41, 78, 90, 114, 64, 138, 14, 48, 18, 162, 85, 204, 124, 133, 73, 172,
-		106, 241, 126, 28, 104, 111, 21, 127, 219, 9, 244, 237, 189, 59, 214,
-		52, 141, 107, 26, 25, 199, 3, 157, 117, 234, 33, 44, 46, 84, 69, 155,
-		122, 250, 231, 86, 239, 76, 190, 120, 1, 94, 206, 8, 148, 159, 167, 215,
-		164, 31, 217, 61, 71, 125, 68, 109, 195, 177, 95, 82, 142, 182, 129, 87,
-		37, 140, 134, 186, 173, 39, 116, 143, 254, 229, 131, 67, 121, 192, 240,
-		15, 221, 30, 242, 185, 80, 170, 135, 51, 187, 194, 246, 12, 225, 181,
-		137, 211, 228, 88, 218, 27, 233, 161, 77, 252, 123, 93, 220, 248, 205,
-		223, 144, 128, 196, 70, 247, 210, 178, 203, 154, 24, 169, 149, 163, 35,
-		7, 151, 103, 197, 139, 165, 158, 207, 72, 113, 145, 45, 183, 11, 198,
-		43, 81, 230, 97, 96, 2, 66, 213, 146, 179, 22, 58, 54, 38, 160, 200,
-		235, 226, 156, 56, 208, 249, 32, 176, 168, 110, 191, 79, 152, 115, 10,
-		74, 60, 251, 17, 83, 180, 171, 202, 40, 166, 255, 53, 212, 98, 5, 50,
-		99, 4, 89, 13, 63, 6, 136, 153, 23, 16, 47, 130, 75, 62};
-
+	static int seq_seed[256] = { 100, 57, 232, 236, 42, 193, 224, 184, 216,
+		150, 92, 91, 108, 118, 55, 243, 65, 101, 209, 0, 147, 36, 29,
+		34, 49, 188, 174, 105, 253, 245, 227, 238, 112, 20, 222, 201,
+		102, 175, 119, 19, 132, 41, 78, 90, 114, 64, 138, 14, 48, 18,
+		162, 85, 204, 124, 133, 73, 172, 106, 241, 126, 28, 104, 111,
+		21, 127, 219, 9, 244, 237, 189, 59, 214, 52, 141, 107, 26, 25,
+		199, 3, 157, 117, 234, 33, 44, 46, 84, 69, 155, 122, 250, 231,
+		86, 239, 76, 190, 120, 1, 94, 206, 8, 148, 159, 167, 215, 164,
+		31, 217, 61, 71, 125, 68, 109, 195, 177, 95, 82, 142, 182, 129,
+		87, 37, 140, 134, 186, 173, 39, 116, 143, 254, 229, 131, 67,
+		121, 192, 240, 15, 221, 30, 242, 185, 80, 170, 135, 51, 187,
+		194, 246, 12, 225, 181, 137, 211, 228, 88, 218, 27, 233, 161,
+		77, 252, 123, 93, 220, 248, 205, 223, 144, 128, 196, 70, 247,
+		210, 178, 203, 154, 24, 169, 149, 163, 35, 7, 151, 103, 197,
+		139, 165, 158, 207, 72, 113, 145, 45, 183, 11, 198, 43, 81, 230,
+		97, 96, 2, 66, 213, 146, 179, 22, 58, 54, 38, 160, 200, 235,
+		226, 156, 56, 208, 249, 32, 176, 168, 110, 191, 79, 152, 115,
+		10, 74, 60, 251, 17, 83, 180, 171, 202, 40, 166, 255, 53, 212,
+		98, 5, 50, 99, 4, 89, 13, 63, 6, 136, 153, 23, 16, 47, 130, 75,
+		62 };
 	int ret;
-	ret = seq_seed[i] % sysconf(_SC_NPROCESSORS_CONF);
+
+	ret = seq_seed[i] % nprocessors;
 	i++;
 	i = i % 256;
 	return ret;
@@ -71,6 +76,12 @@ void lttng_ust_getcpu_plugin_init(void)
 {
 	int ret;
 
+	nprocessors = sysconf(_SC_NPROCESSORS_CONF);
+	if (nprocessors < 0) {
+		perror("Failed to get _SC_NPROCESSORS_CONF");
+		goto error;
+	}
+
 	ret = lttng_ust_getcpu_override(plugin_getcpu);
 	if (ret) {
 		fprintf(stderr, "Error enabling getcpu override: %s\n",