X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Flttng-syscall.c;h=ccd8f25e679b51e2cb05265c315dcfa163dab299;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=9a45a8af7933ff232729d344779599887ff9cb41;hpb=0dbc2034c9571ec342d382bf87231775563f8624;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/lttng-syscall.c b/src/bin/lttng-sessiond/lttng-syscall.c
index 9a45a8af7..ccd8f25e6 100644
--- a/src/bin/lttng-sessiond/lttng-syscall.c
+++ b/src/bin/lttng-sessiond/lttng-syscall.c
@@ -1,24 +1,13 @@
 /*
- * Copyright (C) 2014 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2014 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, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
 #include <stdbool.h>
 
-#include <common/bitfield.h>
 #include <common/common.h>
 #include <common/kernel-ctl/kernel-ctl.h>
 
@@ -39,7 +28,7 @@ static size_t syscall_table_nb_entry;
  * Return 0 on success and the syscall table is allocated. On error, a negative
  * value is returned.
  */
-int syscall_init_table(void)
+int syscall_init_table(int tracer_fd)
 {
 	int ret, fd, err;
 	size_t nbmem;
@@ -52,7 +41,7 @@ int syscall_init_table(void)
 
 	DBG3("Syscall init system call table");
 
-	fd = kernctl_syscall_list(kernel_tracer_fd);
+	fd = kernctl_syscall_list(tracer_fd);
 	if (fd < 0) {
 		ret = fd;
 		PERROR("kernelctl syscall list");
@@ -173,7 +162,7 @@ static void destroy_syscall_ht(struct lttng_ht *ht)
 		int ret;
 
 		ret = lttng_ht_del(ht, &iter);
-		assert(!ret);
+		LTTNG_ASSERT(!ret);
 		free(ksyscall);
 	}
 	ht_cleanup_push(ht);
@@ -209,8 +198,8 @@ static struct syscall *lookup_syscall(struct lttng_ht *ht, const char *name)
 	struct lttng_ht_iter iter;
 	struct syscall *ksyscall = NULL;
 
-	assert(ht);
-	assert(name);
+	LTTNG_ASSERT(ht);
+	LTTNG_ASSERT(name);
 
 	lttng_ht_lookup(ht, (void *) name, &iter);
 	node = lttng_ht_iter_get_node_str(&iter);
@@ -228,7 +217,7 @@ static struct syscall *lookup_syscall(struct lttng_ht *ht, const char *name)
 static void update_event_syscall_bitness(struct lttng_event *events,
 		unsigned int index, unsigned int syscall_index)
 {
-	assert(events);
+	LTTNG_ASSERT(events);
 
 	if (syscall_table[index].bitness == 32) {
 		events[syscall_index].flags |= LTTNG_EVENT_FLAG_SYSCALL_32;
@@ -248,7 +237,7 @@ static int add_syscall_to_ht(struct lttng_ht *ht, unsigned int index,
 	int ret;
 	struct syscall *ksyscall;
 
-	assert(ht);
+	LTTNG_ASSERT(ht);
 
 	ksyscall = zmalloc(sizeof(*ksyscall));
 	if (!ksyscall) {
@@ -282,7 +271,7 @@ ssize_t syscall_table_list(struct lttng_event **_events)
 	/* Hash table used to filter duplicate out. */
 	struct lttng_ht *syscalls_ht = NULL;
 
-	assert(_events);
+	LTTNG_ASSERT(_events);
 
 	DBG("Syscall table listing.");