projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: timer/trace: Improve timer tracing (v5.2)
[lttng-modules.git]
/
lttng-abi.c
diff --git
a/lttng-abi.c
b/lttng-abi.c
index 901e58c0aa11ad95e5fda808e1e15e8c02b688b4..bee4255d47b4832d15dc2b48d2bc1514b7b41568 100644
(file)
--- a/
lttng-abi.c
+++ b/
lttng-abi.c
@@
-55,6
+55,7
@@
#include <lttng-abi-old.h>
#include <lttng-events.h>
#include <lttng-tracer.h>
#include <lttng-abi-old.h>
#include <lttng-events.h>
#include <lttng-tracer.h>
+#include <lttng-tp-mempool.h>
#include <lib/ringbuffer/frontend_types.h>
/*
#include <lib/ringbuffer/frontend_types.h>
/*
@@
-428,8
+429,8
@@
int lttng_abi_create_channel(struct file *session_file,
transport_name = "<unknown>";
break;
}
transport_name = "<unknown>";
break;
}
- if (
atomic_long_add_unless(&session_file->f_count,
- 1, INT_MAX) == INT_MAX) {
+ if (
!atomic_long_add_unless(&session_file->f_count, 1, LONG_MAX)) {
+ ret = -EOVERFLOW;
goto refcount_error;
}
/*
goto refcount_error;
}
/*
@@
-1037,8
+1038,7
@@
int lttng_abi_create_event(struct file *channel_file,
goto file_error;
}
/* The event holds a reference on the channel */
goto file_error;
}
/* The event holds a reference on the channel */
- if (atomic_long_add_unless(&channel_file->f_count,
- 1, INT_MAX) == INT_MAX) {
+ if (!atomic_long_add_unless(&channel_file->f_count, 1, LONG_MAX)) {
ret = -EOVERFLOW;
goto refcount_error;
}
ret = -EOVERFLOW;
goto refcount_error;
}
@@
-1722,6
+1722,12
@@
int __init lttng_abi_init(void)
wrapper_vmalloc_sync_all();
lttng_clock_ref();
wrapper_vmalloc_sync_all();
lttng_clock_ref();
+
+ ret = lttng_tp_mempool_init();
+ if (ret) {
+ goto error;
+ }
+
lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
<tng_fops, NULL);
lttng_proc_dentry = proc_create_data("lttng", S_IRUSR | S_IWUSR, NULL,
<tng_fops, NULL);
@@
-1734,6
+1740,7
@@
int __init lttng_abi_init(void)
return 0;
error:
return 0;
error:
+ lttng_tp_mempool_destroy();
lttng_clock_unref();
return ret;
}
lttng_clock_unref();
return ret;
}
@@
-1741,6
+1748,7
@@
error:
/* No __exit annotation because used by init error path too. */
void lttng_abi_exit(void)
{
/* No __exit annotation because used by init error path too. */
void lttng_abi_exit(void)
{
+ lttng_tp_mempool_destroy();
lttng_clock_unref();
if (lttng_proc_dentry)
remove_proc_entry("lttng", NULL);
lttng_clock_unref();
if (lttng_proc_dentry)
remove_proc_entry("lttng", NULL);
This page took
0.023681 seconds
and
4
git commands to generate.