X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmodprobe.c;h=b3f2e57018ece61ce85bafa9f86f16b5712c776b;hp=5ff42223143f504baad2514818d52e6b2e6daaaf;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hpb=096102bd1f0665d96f75ad12410ea23189fbf861

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 5ff422231..b3f2e5701 100644
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -27,7 +27,7 @@
 
 /* MUST be loaded first */
 const struct kern_modules_param kern_modules_control[] = {
-	{ "ltt-relay", 1 },
+	{ "lttng-tracer", 1 },
 };
 
 /* LTTng kernel tracer modules list */
@@ -35,19 +35,22 @@ const struct kern_modules_param kern_modules_list[] = {
 	{ "lttng-ftrace", 0 },
 	{ "lttng-kprobes", 0 },
 	{ "lttng-kretprobes", 0 },
-	{ "lib-ring-buffer", 1 },
-	{ "ltt-ring-buffer-client-discard", 1 },
-	{ "ltt-ring-buffer-client-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-client", 1 },
-	{ "ltt-ring-buffer-client-mmap-discard", 1 },
-	{ "ltt-ring-buffer-client-mmap-overwrite", 1 },
-	{ "ltt-ring-buffer-metadata-mmap-client", 1 },
+	{ "lttng-lib-ring-buffer", 1 },
+	{ "lttng-ring-buffer-client-discard", 1 },
+	{ "lttng-ring-buffer-client-overwrite", 1 },
+	{ "lttng-ring-buffer-metadata-client", 1 },
+	{ "lttng-ring-buffer-client-mmap-discard", 1 },
+	{ "lttng-ring-buffer-client-mmap-overwrite", 1 },
+	{ "lttng-ring-buffer-metadata-mmap-client", 1 },
 	{ "lttng-probe-lttng", 1 },
 	{ "lttng-types", 0 },
 	{ "lttng-probe-block", 0 },
 	{ "lttng-probe-irq", 0 },
 	{ "lttng-probe-kvm", 0 },
 	{ "lttng-probe-sched", 0 },
+	{ "lttng-probe-signal", 0 },
+	{ "lttng-probe-statedump", 0 },
+	{ "lttng-probe-timer", 0 },
 };
 
 /*
@@ -98,7 +101,7 @@ void modprobe_remove_lttng_data(void)
 				"/sbin/modprobe -r -q %s",
 				kern_modules_list[i].name);
 		if (ret < 0) {
-			perror("snprintf modprobe -r");
+			PERROR("snprintf modprobe -r");
 			goto error;
 		}
 		modprobe[sizeof(modprobe) - 1] = '\0';
@@ -179,7 +182,7 @@ int modprobe_lttng_data(void)
 				kern_modules_list[i].required ? "" : "-q ",
 				kern_modules_list[i].name);
 		if (ret < 0) {
-			perror("snprintf modprobe");
+			PERROR("snprintf modprobe");
 			goto error;
 		}
 		modprobe[sizeof(modprobe) - 1] = '\0';