projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tracepoint API namespacing 'TRACEPOINT_LOGLEVEL'
[lttng-ust.git]
/
src
/
lib
/
lttng-ust
/
lttng-events.c
diff --git
a/src/lib/lttng-ust/lttng-events.c
b/src/lib/lttng-ust/lttng-events.c
index e4e255904fbfe5f3d0212efbf8f8e6d4dfaa0bf6..386106136bf4ca08c15ada7913c6c32179d5576b 100644
(file)
--- a/
src/lib/lttng-ust/lttng-events.c
+++ b/
src/lib/lttng-ust/lttng-events.c
@@
-49,7
+49,6
@@
#include "lttng-ust-statedump.h"
#include "context-internal.h"
#include "lib/lttng-ust/events.h"
#include "lttng-ust-statedump.h"
#include "context-internal.h"
#include "lib/lttng-ust/events.h"
-#include "wait.h"
#include "common/ringbuffer/shm.h"
#include "common/ringbuffer/frontend_types.h"
#include "common/ringbuffer/frontend.h"
#include "common/ringbuffer/shm.h"
#include "common/ringbuffer/frontend_types.h"
#include "common/ringbuffer/frontend.h"
@@
-121,23
+120,23
@@
int lttng_loglevel_match(int loglevel,
int req_loglevel)
{
if (!has_loglevel)
int req_loglevel)
{
if (!has_loglevel)
- loglevel =
TRACE
_DEFAULT;
+ loglevel =
LTTNG_UST_TRACEPOINT_LOGLEVEL
_DEFAULT;
switch (req_type) {
case LTTNG_UST_ABI_LOGLEVEL_RANGE:
if (loglevel <= req_loglevel
switch (req_type) {
case LTTNG_UST_ABI_LOGLEVEL_RANGE:
if (loglevel <= req_loglevel
- || (req_loglevel == -1 && loglevel <=
TRACE
_DEBUG))
+ || (req_loglevel == -1 && loglevel <=
LTTNG_UST_TRACEPOINT_LOGLEVEL
_DEBUG))
return 1;
else
return 0;
case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
if (loglevel == req_loglevel
return 1;
else
return 0;
case LTTNG_UST_ABI_LOGLEVEL_SINGLE:
if (loglevel == req_loglevel
- || (req_loglevel == -1 && loglevel <=
TRACE
_DEBUG))
+ || (req_loglevel == -1 && loglevel <=
LTTNG_UST_TRACEPOINT_LOGLEVEL
_DEBUG))
return 1;
else
return 0;
case LTTNG_UST_ABI_LOGLEVEL_ALL:
default:
return 1;
else
return 0;
case LTTNG_UST_ABI_LOGLEVEL_ALL:
default:
- if (loglevel <=
TRACE
_DEBUG)
+ if (loglevel <=
LTTNG_UST_TRACEPOINT_LOGLEVEL
_DEBUG)
return 1;
else
return 0;
return 1;
else
return 0;
@@
-249,7
+248,7
@@
struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
static
void _lttng_channel_unmap(struct lttng_ust_channel_buffer *lttng_chan)
{
static
void _lttng_channel_unmap(struct lttng_ust_channel_buffer *lttng_chan)
{
- struct lttng_ust_
lib_
ring_buffer_channel *chan;
+ struct lttng_ust_ring_buffer_channel *chan;
struct lttng_ust_shm_handle *handle;
cds_list_del(<tng_chan->priv->node);
struct lttng_ust_shm_handle *handle;
cds_list_del(<tng_chan->priv->node);
@@
-267,12
+266,11
@@
void register_event(struct lttng_ust_event_common *event)
{
int ret;
const struct lttng_ust_event_desc *desc;
{
int ret;
const struct lttng_ust_event_desc *desc;
- char name[LTTNG_UST_ABI_SYM_NAME_LEN];
assert(event->priv->registered == 0);
desc = event->priv->desc;
assert(event->priv->registered == 0);
desc = event->priv->desc;
- lttng_ust_format_event_name(desc, name);
-
ret = lttng_ust_tp_probe_register_queue_release(
name,
+ ret = lttng_ust_tp_probe_register_queue_release(desc->probe_desc->provider_name,
+
desc->event_
name,
desc->probe_callback,
event, desc->signature);
WARN_ON_ONCE(ret);
desc->probe_callback,
event, desc->signature);
WARN_ON_ONCE(ret);
@@
-285,12
+283,11
@@
void unregister_event(struct lttng_ust_event_common *event)
{
int ret;
const struct lttng_ust_event_desc *desc;
{
int ret;
const struct lttng_ust_event_desc *desc;
- char name[LTTNG_UST_ABI_SYM_NAME_LEN];
assert(event->priv->registered == 1);
desc = event->priv->desc;
assert(event->priv->registered == 1);
desc = event->priv->desc;
- lttng_ust_format_event_name(desc, name);
-
ret = lttng_ust_tp_probe_unregister_queue_release(
name,
+ ret = lttng_ust_tp_probe_unregister_queue_release(desc->probe_desc->provider_name,
+
desc->event_
name,
desc->probe_callback,
event);
WARN_ON_ONCE(ret);
desc->probe_callback,
event);
WARN_ON_ONCE(ret);
@@
-517,7
+514,7
@@
int lttng_create_enum_check(const struct lttng_ust_type_common *type,
static
int lttng_create_all_event_enums(size_t nr_fields,
static
int lttng_create_all_event_enums(size_t nr_fields,
- const struct lttng_ust_event_field **event_fields,
+ const struct lttng_ust_event_field *
const
*event_fields,
struct lttng_ust_session *session)
{
size_t i;
struct lttng_ust_session *session)
{
size_t i;
@@
-782,7
+779,7
@@
int lttng_event_recorder_create(const struct lttng_ust_event_desc *desc,
if (desc->loglevel)
loglevel = *(*desc->loglevel);
else
if (desc->loglevel)
loglevel = *(*desc->loglevel);
else
- loglevel =
TRACE
_DEFAULT;
+ loglevel =
LTTNG_UST_TRACEPOINT_LOGLEVEL
_DEFAULT;
if (desc->model_emf_uri)
uri = *(desc->model_emf_uri);
else
if (desc->model_emf_uri)
uri = *(desc->model_emf_uri);
else
@@
-2001,7
+1998,7
@@
void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session)
*/
void lttng_ust_context_set_session_provider(const char *name,
size_t (*get_size)(void *priv, size_t offset),
*/
void lttng_ust_context_set_session_provider(const char *name,
size_t (*get_size)(void *priv, size_t offset),
- void (*record)(void *priv, struct lttng_ust_
lib_
ring_buffer_ctx *ctx,
+ void (*record)(void *priv, struct lttng_ust_ring_buffer_ctx *ctx,
struct lttng_ust_channel_buffer *chan),
void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
void *priv)
struct lttng_ust_channel_buffer *chan),
void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
void *priv)
@@
-2041,7
+2038,7
@@
void lttng_ust_context_set_session_provider(const char *name,
*/
void lttng_ust_context_set_event_notifier_group_provider(const char *name,
size_t (*get_size)(void *priv, size_t offset),
*/
void lttng_ust_context_set_event_notifier_group_provider(const char *name,
size_t (*get_size)(void *priv, size_t offset),
- void (*record)(void *priv, struct lttng_ust_
lib_
ring_buffer_ctx *ctx,
+ void (*record)(void *priv, struct lttng_ust_ring_buffer_ctx *ctx,
struct lttng_ust_channel_buffer *chan),
void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
void *priv)
struct lttng_ust_channel_buffer *chan),
void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
void *priv)
This page took
0.026134 seconds
and
4
git commands to generate.