projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: build on sles15sp4
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 5be4c9b8f4a999a432dca5b400ba6406f17793eb..410302818f819954559508ec853327fcd9327f57 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-41,10
+41,18
@@
#include <lttng-abi-old.h>
#include <lttng-endian.h>
#include <lttng-string-utils.h>
#include <lttng-abi-old.h>
#include <lttng-endian.h>
#include <lttng-string-utils.h>
+#include <wrapper/compiler_attributes.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/ringbuffer/frontend.h>
#include <wrapper/time.h>
#include <wrapper/ringbuffer/backend.h>
#include <wrapper/ringbuffer/frontend.h>
#include <wrapper/time.h>
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0) \
+ || LTTNG_RHEL_KERNEL_RANGE(5,14,0,162,0,0, 5,15,0,0,0,0))
+#include <linux/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
+
#define METADATA_CACHE_DEFAULT_SIZE 4096
static LIST_HEAD(sessions);
#define METADATA_CACHE_DEFAULT_SIZE 4096
static LIST_HEAD(sessions);
@@
-430,7
+438,8
@@
int lttng_event_enable(struct lttng_event *event)
case LTTNG_KERNEL_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 1);
break;
case LTTNG_KERNEL_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 1);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
@@
-466,7
+475,8
@@
int lttng_event_disable(struct lttng_event *event)
case LTTNG_KERNEL_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 0);
break;
case LTTNG_KERNEL_KRETPROBE:
ret = lttng_kretprobes_event_enable_state(event, 0);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
@@
-613,7
+623,8
@@
struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
case LTTNG_KERNEL_SYSCALL:
event_name = event_param->name;
break;
case LTTNG_KERNEL_SYSCALL:
event_name = event_param->name;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through. */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
@@
-796,7
+807,8
@@
struct lttng_event *_lttng_event_create(struct lttng_channel *chan,
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
default:
WARN_ON_ONCE(1);
ret = -EINVAL;
@@
-863,7
+875,8
@@
void register_event(struct lttng_event *event)
case LTTNG_KERNEL_NOOP:
ret = 0;
break;
case LTTNG_KERNEL_NOOP:
ret = 0;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-907,7
+920,8
@@
int _lttng_event_unregister(struct lttng_event *event)
lttng_uprobes_unregister(event);
ret = 0;
break;
lttng_uprobes_unregister(event);
ret = 0;
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-943,7
+957,8
@@
void _lttng_event_destroy(struct lttng_event *event)
module_put(event->desc->owner);
lttng_uprobes_destroy_private(event);
break;
module_put(event->desc->owner);
lttng_uprobes_destroy_private(event);
break;
- case LTTNG_KERNEL_FUNCTION: /* Fall-through */
+ case LTTNG_KERNEL_FUNCTION:
+ lttng_fallthrough;
default:
WARN_ON_ONCE(1);
}
default:
WARN_ON_ONCE(1);
}
@@
-2649,7
+2664,7
@@
int print_escaped_ctf_string(struct lttng_session *session, const char *string)
if (ret)
goto error;
/* We still print the current char */
if (ret)
goto error;
/* We still print the current char */
- /* Fallthrough */
+ lttng_fallthrough;
default:
ret = lttng_metadata_printf(session, "%c", cur);
break;
default:
ret = lttng_metadata_printf(session, "%c", cur);
break;
This page took
0.024901 seconds
and
4
git commands to generate.