X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=3b0d6e5f5ee05146aff5d2e31b61517577eed62b;hp=a8fd844d961d06dc41a2dae3450839039fa157a6;hb=096102bd1f0665d96f75ad12410ea23189fbf861;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index a8fd844d9..3b0d6e5f5 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -24,11 +24,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
-#include <common/lttngerr.h>
-#include <common/lttng-share.h>
 
 #include "kernel.h"
+#include "kern-modules.h"
 
 /*
  * Add context on a kernel channel.
@@ -574,15 +574,15 @@ ssize_t kernel_list_events(int tracer_fd, struct lttng_event **events)
 	 * Init memory size counter
 	 * See kernel-ctl.h for explanation of this value
 	 */
-	nbmem = KERNEL_EVENT_LIST_SIZE;
+	nbmem = KERNEL_EVENT_INIT_LIST_SIZE;
 	elist = zmalloc(sizeof(struct lttng_event) * nbmem);
 
 	while ((size = fscanf(fp, "event { name = %m[^;]; };%n\n", &event, &pos)) == 1) {
-		if (count > nbmem) {
+		if (count >= nbmem) {
 			DBG("Reallocating event list from %zu to %zu bytes", nbmem,
-					nbmem + KERNEL_EVENT_LIST_SIZE);
-			/* Adding the default size again */
-			nbmem += KERNEL_EVENT_LIST_SIZE;
+					nbmem * 2);
+			/* Double the size */
+			nbmem <<= 1;
 			elist = realloc(elist, nbmem * sizeof(struct lttng_event));
 			if (elist == NULL) {
 				perror("realloc list events");
@@ -607,3 +607,47 @@ error_fp:
 error:
 	return -1;
 }
+
+/*
+ * Get kernel version and validate it.
+ */
+int kernel_validate_version(int tracer_fd)
+{
+	int ret;
+	struct lttng_kernel_tracer_version version;
+
+	ret = kernctl_tracer_version(tracer_fd, &version);
+	if (ret < 0) {
+		ERR("Failed at getting the lttng-modules version");
+		goto error;
+	}
+
+	/* Validate version */
+	if (version.version > KERN_MODULES_VERSION) {
+		goto error_version;
+	} else {
+		if (version.patchlevel > KERN_MODULES_PATCHLEVEL) {
+			goto error_version;
+		}
+		else {
+			if (version.sublevel > KERN_MODULES_SUBLEVEL) {
+				goto error_version;
+			}
+		}
+	}
+
+	DBG2("Kernel tracer version validated (%d.%d.%d)", version.version,
+			version.patchlevel, version.sublevel);
+
+	return 0;
+
+error_version:
+	ERR("Kernel version is not compatible %d.%d.%d (supporting <= %d.%d.%d)",
+			version.version, version.patchlevel, version.sublevel,
+			KERN_MODULES_VERSION, KERN_MODULES_PATCHLEVEL,
+			KERN_MODULES_SUBLEVEL);
+	ret = -1;
+
+error:
+	return ret;
+}