X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-events.c;h=b2eeec71d556712fff83ffba13fae75d10be7b2d;hb=fa7ef831bfb4ec6a5dd7047b45efce768791bc5e;hp=aa0f2e2abc3fa9632f16353f374d5aa5bb2ad8dd;hpb=c50bdba26664558b966a324cd382bd2959f0444e;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index aa0f2e2a..b2eeec71 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -7,12 +7,6 @@
  * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-/*
- * This page_alloc.h wrapper needs to be included before gfpflags.h because it
- * overrides a function with a define.
- */
-#include "wrapper/page_alloc.h"
-
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
@@ -23,26 +17,23 @@
 #include <linux/seq_file.h>
 #include <linux/file.h>
 #include <linux/anon_inodes.h>
-#include <wrapper/file.h>
 #include <linux/jhash.h>
 #include <linux/uaccess.h>
 #include <linux/uuid.h>
 #include <linux/dmi.h>
 #include <linux/vmalloc.h>
+#include <linux/limits.h>
 
 #include <wrapper/random.h>
-#include <wrapper/tracepoint.h>
-#include <wrapper/list.h>
-#include <wrapper/types.h>
 #include <lttng-kernel-version.h>
 #include <lttng-events.h>
 #include <lttng-tracer.h>
 #include <lttng-abi-old.h>
 #include <lttng-endian.h>
 #include <lttng-string-utils.h>
+#include <lttng-tracepoint.h>
 #include <wrapper/ringbuffer/backend.h>
 #include <wrapper/ringbuffer/frontend.h>
-#include <wrapper/time.h>
 
 #define METADATA_CACHE_DEFAULT_SIZE 4096
 
@@ -619,7 +610,7 @@ struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
 	name_len = strlen(event_name);
 	hash = jhash(event_name, name_len, 0);
 	head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-	lttng_hlist_for_each_entry(event, head, hlist) {
+	hlist_for_each_entry(event, head, hlist) {
 		WARN_ON_ONCE(!event->desc);
 		if (!strncmp(event->desc->name, event_name,
 					LTTNG_KERNEL_SYM_NAME_LEN - 1)
@@ -823,9 +814,9 @@ void register_event(struct lttng_event *event)
 	desc = event->desc;
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_register(desc->kname,
-						  desc->probe_callback,
-						  event);
+		ret = lttng_tracepoint_probe_register(desc->kname,
+						desc->probe_callback,
+						event);
 		break;
 	case LTTNG_KERNEL_SYSCALL:
 		ret = lttng_syscall_filter_enable(event->chan,
@@ -859,7 +850,7 @@ int _lttng_event_unregister(struct lttng_event *event)
 	desc = event->desc;
 	switch (event->instrumentation) {
 	case LTTNG_KERNEL_TRACEPOINT:
-		ret = lttng_wrapper_tracepoint_probe_unregister(event->desc->kname,
+		ret = lttng_tracepoint_probe_unregister(event->desc->kname,
 						  event->desc->probe_callback,
 						  event);
 		break;
@@ -1005,7 +996,7 @@ void *id_list_start(struct seq_file *m, loff_t *pos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *pos)
 					return e;
 			}
@@ -1035,7 +1026,7 @@ void *id_list_next(struct seq_file *m, void *p, loff_t *ppos)
 		for (i = 0; i < LTTNG_ID_TABLE_SIZE; i++) {
 			struct hlist_head *head = &id_tracker_p->id_hash[i];
 
-			lttng_hlist_for_each_entry(e, head, hlist) {
+			hlist_for_each_entry(e, head, hlist) {
 				if (iter++ >= *ppos)
 					return e;
 			}
@@ -1140,7 +1131,7 @@ int lttng_session_list_tracker_ids(struct lttng_session *session,
 	struct seq_file *m;
 	int file_fd, ret;
 
-	file_fd = lttng_get_unused_fd();
+	file_fd = get_unused_fd_flags(0);
 	if (file_fd < 0) {
 		ret = file_fd;
 		goto fd_error;
@@ -1185,8 +1176,8 @@ static
 int lttng_match_enabler_star_glob(const char *desc_name,
 		const char *pattern)
 {
-	if (!strutils_star_glob_match(pattern, LTTNG_SIZE_MAX,
-			desc_name, LTTNG_SIZE_MAX))
+	if (!strutils_star_glob_match(pattern, SIZE_MAX,
+			desc_name, SIZE_MAX))
 		return 0;
 	return 1;
 }
@@ -1302,7 +1293,7 @@ void lttng_create_tracepoint_if_missing(struct lttng_enabler *enabler)
 			 */
 			hash = jhash(event_name, name_len, 0);
 			head = &session->events_ht.table[hash & (LTTNG_EVENT_HT_SIZE - 1)];
-			lttng_hlist_for_each_entry(event, head, hlist) {
+			hlist_for_each_entry(event, head, hlist) {
 				if (event->desc == desc
 						&& event->chan == enabler->chan)
 					found = 1;
@@ -2511,20 +2502,12 @@ int64_t measure_clock_offset(void)
 	uint64_t tcf = trace_clock_freq();
 	int64_t offset;
 	unsigned long flags;
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
 	struct timespec64 rts = { 0, 0 };
-#else
-	struct timespec rts = { 0, 0 };
-#endif
 
 	/* Disable interrupts to increase correlation precision. */
 	local_irq_save(flags);
 	monotonic[0] = trace_clock_read64();
-#ifdef LTTNG_KERNEL_HAS_TIMESPEC64
 	ktime_get_real_ts64(&rts);
-#else
-	getnstimeofday(&rts);
-#endif
 	monotonic[1] = trace_clock_read64();
 	local_irq_restore(flags);
 
@@ -2946,15 +2929,6 @@ static int __init lttng_events_init(void)
 {
 	int ret;
 
-	ret = wrapper_lttng_fixup_sig(THIS_MODULE);
-	if (ret)
-		return ret;
-	ret = wrapper_get_pfnblock_flags_mask_init();
-	if (ret)
-		return ret;
-	ret = wrapper_get_pageblock_flags_mask_init();
-	if (ret)
-		return ret;
 	ret = lttng_probes_init();
 	if (ret)
 		return ret;