X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=8d162857f6ae88eeec547857d96baf055db99b63;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=28385ea39e6affd19e30627b97411c8fa2817a99;hpb=50e0fa5f7abf4f70ffaafc65309f3509897d84c4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 28385ea39..8d162857f 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -56,6 +56,14 @@ struct kern_modules_param kern_modules_control_core[] = {
 		.name = (char *) "lttng-ring-buffer-event_notifier-client",
 		.load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
 	},
+	{
+		.name = (char *) "lttng-counter-client-percpu-64-modular",
+		.load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+	},
+	{
+		.name = (char *) "lttng-counter-client-percpu-32-modular",
+		.load_policy = KERNEL_MODULE_PROPERTY_LOAD_POLICY_OPTIONAL,
+	},
 };
 
 /* LTTng kerneltracer probe modules list */
@@ -506,14 +514,23 @@ static void modprobe_remove_lttng(const struct kern_modules_param *modules,
 		modprobe[sizeof(modprobe) - 1] = '\0';
 		ret = system(modprobe);
 		if (ret == -1) {
-			ERR("Unable to launch modprobe -r for module %s",
-					modules[i].name);
-		} else if (modules[i].load_policy == KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED && WEXITSTATUS(ret) != 0) {
-			ERR("Unable to remove module %s",
-					modules[i].name);
+			if (modules[i].load_policy == KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED) {
+				ERR("Unable to launch modprobe -r for required module %s",
+						modules[i].name);
+			} else {
+				DBG("Unable to launch modprobe -r for optional module %s",
+						modules[i].name);
+			}
+		} else if (WEXITSTATUS(ret) != 0) {
+			if (modules[i].load_policy == KERNEL_MODULE_PROPERTY_LOAD_POLICY_REQUIRED) {
+				ERR("Unable to remove required module %s",
+						modules[i].name);
+			} else {
+				DBG("Unable to remove optional module %s",
+						modules[i].name);
+			}
 		} else {
-			DBG("Modprobe removal successful %s",
-					modules[i].name);
+			DBG("Modprobe removal successful %s", modules[i].name);
 		}
 	}
 }