projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: extra-version-git.sh redirect stderr to /dev/null
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 6aa994ca0925f38fd56d04c43c4937f0cf93a783..47431ca9360532d755083c38040ad1087c458188 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-132,7
+132,7
@@
struct lttng_session *lttng_session_create(void)
int i;
mutex_lock(&sessions_mutex);
int i;
mutex_lock(&sessions_mutex);
- session =
k
zalloc(sizeof(struct lttng_session), GFP_KERNEL);
+ session =
lttng_kv
zalloc(sizeof(struct lttng_session), GFP_KERNEL);
if (!session)
goto err;
INIT_LIST_HEAD(&session->chan);
if (!session)
goto err;
INIT_LIST_HEAD(&session->chan);
@@
-163,7
+163,7
@@
struct lttng_session *lttng_session_create(void)
err_free_cache:
kfree(metadata_cache);
err_free_session:
err_free_cache:
kfree(metadata_cache);
err_free_session:
-
k
free(session);
+
lttng_kv
free(session);
err:
mutex_unlock(&sessions_mutex);
return NULL;
err:
mutex_unlock(&sessions_mutex);
return NULL;
@@
-186,7
+186,7
@@
void lttng_session_destroy(struct lttng_session *session)
int ret;
mutex_lock(&sessions_mutex);
int ret;
mutex_lock(&sessions_mutex);
-
ACCESS_ONCE(session->active) = 0
;
+
WRITE_ONCE(session->active, 0)
;
list_for_each_entry(chan, &session->chan, list) {
ret = lttng_syscalls_unregister(chan);
WARN_ON(ret);
list_for_each_entry(chan, &session->chan, list) {
ret = lttng_syscalls_unregister(chan);
WARN_ON(ret);
@@
-212,7
+212,7
@@
void lttng_session_destroy(struct lttng_session *session)
kref_put(&session->metadata_cache->refcount, metadata_cache_destroy);
list_del(&session->list);
mutex_unlock(&sessions_mutex);
kref_put(&session->metadata_cache->refcount, metadata_cache_destroy);
list_del(&session->list);
mutex_unlock(&sessions_mutex);
-
k
free(session);
+
lttng_kv
free(session);
}
int lttng_session_statedump(struct lttng_session *session)
}
int lttng_session_statedump(struct lttng_session *session)
@@
-261,16
+261,16
@@
int lttng_session_enable(struct lttng_session *session)
lib_ring_buffer_clear_quiescent_channel(chan->chan);
}
lib_ring_buffer_clear_quiescent_channel(chan->chan);
}
-
ACCESS_ONCE(session->active) = 1
;
-
ACCESS_ONCE(session->been_active) = 1
;
+
WRITE_ONCE(session->active, 1)
;
+
WRITE_ONCE(session->been_active, 1)
;
ret = _lttng_session_metadata_statedump(session);
if (ret) {
ret = _lttng_session_metadata_statedump(session);
if (ret) {
-
ACCESS_ONCE(session->active) = 0
;
+
WRITE_ONCE(session->active, 0)
;
goto end;
}
ret = lttng_statedump_start(session);
if (ret)
goto end;
}
ret = lttng_statedump_start(session);
if (ret)
-
ACCESS_ONCE(session->active) = 0
;
+
WRITE_ONCE(session->active, 0)
;
end:
mutex_unlock(&sessions_mutex);
return ret;
end:
mutex_unlock(&sessions_mutex);
return ret;
@@
-286,7
+286,7
@@
int lttng_session_disable(struct lttng_session *session)
ret = -EBUSY;
goto end;
}
ret = -EBUSY;
goto end;
}
-
ACCESS_ONCE(session->active) = 0
;
+
WRITE_ONCE(session->active, 0)
;
/* Set transient enabler state to "disabled" */
session->tstate = 0;
/* Set transient enabler state to "disabled" */
session->tstate = 0;
@@
-361,7
+361,7
@@
int lttng_channel_enable(struct lttng_channel *channel)
channel->tstate = 1;
lttng_session_sync_enablers(channel->session);
/* Set atomically the state to "enabled" */
channel->tstate = 1;
lttng_session_sync_enablers(channel->session);
/* Set atomically the state to "enabled" */
-
ACCESS_ONCE(channel->enabled) = 1
;
+
WRITE_ONCE(channel->enabled, 1)
;
end:
mutex_unlock(&sessions_mutex);
return ret;
end:
mutex_unlock(&sessions_mutex);
return ret;
@@
-381,7
+381,7
@@
int lttng_channel_disable(struct lttng_channel *channel)
goto end;
}
/* Set atomically the state to "disabled" */
goto end;
}
/* Set atomically the state to "disabled" */
-
ACCESS_ONCE(channel->enabled) = 0
;
+
WRITE_ONCE(channel->enabled, 0)
;
/* Set transient enabler state to "enabled" */
channel->tstate = 0;
lttng_session_sync_enablers(channel->session);
/* Set transient enabler state to "enabled" */
channel->tstate = 0;
lttng_session_sync_enablers(channel->session);
@@
-411,7
+411,7
@@
int lttng_event_enable(struct lttng_event *event)
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_FUNCTION:
case LTTNG_KERNEL_NOOP:
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_FUNCTION:
case LTTNG_KERNEL_NOOP:
-
ACCESS_ONCE(event->enabled) = 1
;
+
WRITE_ONCE(event->enabled, 1)
;
break;
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);
@@
-446,7
+446,7
@@
int lttng_event_disable(struct lttng_event *event)
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_FUNCTION:
case LTTNG_KERNEL_NOOP:
case LTTNG_KERNEL_KPROBE:
case LTTNG_KERNEL_FUNCTION:
case LTTNG_KERNEL_NOOP:
-
ACCESS_ONCE(event->enabled) = 0
;
+
WRITE_ONCE(event->enabled, 0)
;
break;
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);
@@
-1517,7
+1517,7
@@
void lttng_session_sync_enablers(struct lttng_session *session)
*/
enabled = enabled && session->tstate && event->chan->tstate;
*/
enabled = enabled && session->tstate && event->chan->tstate;
-
ACCESS_ONCE(event->enabled) = enabled
;
+
WRITE_ONCE(event->enabled, enabled)
;
/*
* Sync tracepoint registration with event enabled
* state.
/*
* Sync tracepoint registration with event enabled
* state.
@@
-1643,7
+1643,7
@@
int lttng_metadata_printf(struct lttng_session *session,
va_list ap;
struct lttng_metadata_stream *stream;
va_list ap;
struct lttng_metadata_stream *stream;
- WARN_ON_ONCE(!
ACCESS
_ONCE(session->active));
+ WARN_ON_ONCE(!
READ
_ONCE(session->active));
va_start(ap, fmt);
str = kvasprintf(GFP_KERNEL, fmt, ap);
va_start(ap, fmt);
str = kvasprintf(GFP_KERNEL, fmt, ap);
@@
-2230,7
+2230,7
@@
int _lttng_event_metadata_statedump(struct lttng_session *session,
{
int ret = 0;
{
int ret = 0;
- if (event->metadata_dumped || !
ACCESS
_ONCE(session->active))
+ if (event->metadata_dumped || !
READ
_ONCE(session->active))
return 0;
if (chan->channel_type == METADATA_CHANNEL)
return 0;
return 0;
if (chan->channel_type == METADATA_CHANNEL)
return 0;
@@
-2297,7
+2297,7
@@
int _lttng_channel_metadata_statedump(struct lttng_session *session,
{
int ret = 0;
{
int ret = 0;
- if (chan->metadata_dumped || !
ACCESS
_ONCE(session->active))
+ if (chan->metadata_dumped || !
READ
_ONCE(session->active))
return 0;
if (chan->channel_type == METADATA_CHANNEL)
return 0;
if (chan->channel_type == METADATA_CHANNEL)
@@
-2454,7
+2454,7
@@
int _lttng_session_metadata_statedump(struct lttng_session *session)
struct lttng_event *event;
int ret = 0;
struct lttng_event *event;
int ret = 0;
- if (!
ACCESS
_ONCE(session->active))
+ if (!
READ
_ONCE(session->active))
return 0;
if (session->metadata_dumped)
goto skip_session;
return 0;
if (session->metadata_dumped)
goto skip_session;
@@
-2646,7
+2646,7
@@
void lttng_transport_unregister(struct lttng_transport *transport)
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
}
EXPORT_SYMBOL_GPL(lttng_transport_unregister);
-#if (
defined(CONFIG_HOTPLUG_CPU) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
))
+#if (
LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0
))
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
enum cpuhp_state lttng_hp_prepare;
enum cpuhp_state lttng_hp_online;
@@
-2762,7
+2762,7
@@
static void __exit lttng_exit_cpu_hotplug(void)
cpuhp_remove_multi_state(lttng_hp_prepare);
}
cpuhp_remove_multi_state(lttng_hp_prepare);
}
-#else /* #if (
CONFIG_HOTPLUG_CPU && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
)) */
+#else /* #if (
LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0
)) */
static int lttng_init_cpu_hotplug(void)
{
return 0;
static int lttng_init_cpu_hotplug(void)
{
return 0;
@@
-2770,7
+2770,7
@@
static int lttng_init_cpu_hotplug(void)
static void lttng_exit_cpu_hotplug(void)
{
}
static void lttng_exit_cpu_hotplug(void)
{
}
-#endif /* #else #if (
CONFIG_HOTPLUG_CPU && (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)
)) */
+#endif /* #else #if (
LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0
)) */
static int __init lttng_events_init(void)
static int __init lttng_events_init(void)
@@
-2809,12
+2809,22
@@
static int __init lttng_events_init(void)
ret = lttng_init_cpu_hotplug();
if (ret)
goto error_hotplug;
ret = lttng_init_cpu_hotplug();
if (ret)
goto error_hotplug;
- printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)\n",
+ printk(KERN_NOTICE "LTTng: Loaded modules v%s.%s.%s%s (%s)
%s%s
\n",
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
- LTTNG_VERSION_NAME);
+ LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+ LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+ "",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+ LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+ "");
+#endif
return 0;
error_hotplug:
return 0;
error_hotplug:
@@
-2827,12
+2837,22
@@
error_kmem:
lttng_tracepoint_exit();
error_tp:
lttng_context_exit();
lttng_tracepoint_exit();
error_tp:
lttng_context_exit();
- printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)\n",
+ printk(KERN_NOTICE "LTTng: Failed to load modules v%s.%s.%s%s (%s)
%s%s
\n",
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
- LTTNG_VERSION_NAME);
+ LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+ LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+ "",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+ LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+ "");
+#endif
return ret;
}
return ret;
}
@@
-2850,16
+2870,33
@@
static void __exit lttng_events_exit(void)
kmem_cache_destroy(event_cache);
lttng_tracepoint_exit();
lttng_context_exit();
kmem_cache_destroy(event_cache);
lttng_tracepoint_exit();
lttng_context_exit();
- printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)\n",
+ printk(KERN_NOTICE "LTTng: Unloaded modules v%s.%s.%s%s (%s)
%s%s
\n",
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
__stringify(LTTNG_MODULES_MAJOR_VERSION),
__stringify(LTTNG_MODULES_MINOR_VERSION),
__stringify(LTTNG_MODULES_PATCHLEVEL_VERSION),
LTTNG_MODULES_EXTRAVERSION,
- LTTNG_VERSION_NAME);
+ LTTNG_VERSION_NAME,
+#ifdef LTTNG_EXTRA_VERSION_GIT
+ LTTNG_EXTRA_VERSION_GIT[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_GIT,
+#else
+ "",
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+ LTTNG_EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " LTTNG_EXTRA_VERSION_NAME);
+#else
+ "");
+#endif
}
module_exit(lttng_events_exit);
}
module_exit(lttng_events_exit);
+#include "extra_version/patches.i"
+#ifdef LTTNG_EXTRA_VERSION_GIT
+MODULE_INFO(extra_version_git, LTTNG_EXTRA_VERSION_GIT);
+#endif
+#ifdef LTTNG_EXTRA_VERSION_NAME
+MODULE_INFO(extra_version_name, LTTNG_EXTRA_VERSION_NAME);
+#endif
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
MODULE_DESCRIPTION("LTTng Events");
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
MODULE_DESCRIPTION("LTTng Events");
This page took
0.026984 seconds
and
4
git commands to generate.