projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Conditionally disable test requiring shared libs
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index f46183bd36da99afabc8dbd66eea619539f59e24..679cace8a79063a07368163b46d7def48704f7f0 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-554,7
+554,7
@@
int create_ust_channel_context(struct ust_app_channel *ua_chan,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_add_context(app->sock, &ua_ctx->ctx,
ua_chan->obj, &ua_ctx->obj);
ret = ustctl_add_context(app->sock, &ua_ctx->ctx,
ua_chan->obj, &ua_ctx->obj);
@@
-567,7
+567,7
@@
int create_ust_channel_context(struct ust_app_channel *ua_chan,
DBG2("UST app context created successfully for channel %s", ua_chan->name);
error:
DBG2("UST app context created successfully for channel %s", ua_chan->name);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-580,7
+580,7
@@
int set_ust_event_filter(struct ust_app_event *ua_event,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (!ua_event->filter) {
ret = 0;
if (!ua_event->filter) {
ret = 0;
@@
-596,7
+596,7
@@
int set_ust_event_filter(struct ust_app_event *ua_event,
DBG2("UST filter set successfully for event %s", ua_event->name);
error:
DBG2("UST filter set successfully for event %s", ua_event->name);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-608,7
+608,7
@@
static int disable_ust_event(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_disable(app->sock, ua_event->obj);
if (ret < 0) {
ret = ustctl_disable(app->sock, ua_event->obj);
if (ret < 0) {
@@
-622,7
+622,7
@@
static int disable_ust_event(struct ust_app *app,
ua_event->attr.name, app->pid);
error:
ua_event->attr.name, app->pid);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-634,7
+634,7
@@
static int disable_ust_channel(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_disable(app->sock, ua_chan->obj);
if (ret < 0) {
ret = ustctl_disable(app->sock, ua_chan->obj);
if (ret < 0) {
@@
-648,7
+648,7
@@
static int disable_ust_channel(struct ust_app *app,
ua_chan->name, app->pid);
error:
ua_chan->name, app->pid);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-660,7
+660,7
@@
static int enable_ust_channel(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_enable(app->sock, ua_chan->obj);
if (ret < 0) {
ret = ustctl_enable(app->sock, ua_chan->obj);
if (ret < 0) {
@@
-676,7
+676,7
@@
static int enable_ust_channel(struct ust_app *app,
ua_chan->name, app->pid);
error:
ua_chan->name, app->pid);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-688,7
+688,7
@@
static int enable_ust_event(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_enable(app->sock, ua_event->obj);
if (ret < 0) {
ret = ustctl_enable(app->sock, ua_event->obj);
if (ret < 0) {
@@
-702,7
+702,7
@@
static int enable_ust_event(struct ust_app *app,
ua_event->attr.name, app->pid);
error:
ua_event->attr.name, app->pid);
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-715,7
+715,7
@@
static int open_ust_metadata(struct ust_app *app,
int ret;
struct lttng_ust_channel_attr uattr;
int ret;
struct lttng_ust_channel_attr uattr;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
uattr.overwrite = ua_sess->metadata->attr.overwrite;
uattr.subbuf_size = ua_sess->metadata->attr.subbuf_size;
uattr.overwrite = ua_sess->metadata->attr.overwrite;
uattr.subbuf_size = ua_sess->metadata->attr.subbuf_size;
@@
-744,7
+744,7
@@
static int open_ust_metadata(struct ust_app *app,
ua_sess->metadata->handle = ua_sess->metadata->obj->handle;
error:
ua_sess->metadata->handle = ua_sess->metadata->obj->handle;
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-756,7
+756,7
@@
static int create_ust_metadata_stream(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
@@
-773,7
+773,7
@@
static int create_ust_metadata_stream(struct ust_app *app,
}
error:
}
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-794,7
+794,7
@@
static int create_ust_stream(struct ust_app *app,
assert(ua_chan->obj);
assert(stream);
assert(ua_chan->obj);
assert(stream);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
@@
-833,7
+833,7
@@
static int create_ust_stream(struct ust_app *app,
stream->handle = stream->obj->handle;
error:
stream->handle = stream->obj->handle;
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-845,7
+845,7
@@
static int create_ust_channel(struct ust_app *app,
{
int ret;
{
int ret;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
/* We are going to receive 2 fds, we need to reserve them. */
ret = lttng_fd_get(LTTNG_FD_APPS, 2);
@@
-854,7
+854,7
@@
static int create_ust_channel(struct ust_app *app,
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_create_channel(app->sock, ua_sess->handle, &ua_chan->attr,
&ua_chan->obj);
ret = ustctl_create_channel(app->sock, ua_sess->handle, &ua_chan->attr,
&ua_chan->obj);
@@
-872,7
+872,7
@@
static int create_ust_channel(struct ust_app *app,
DBG2("UST app channel %s created successfully for pid:%d and sock:%d",
ua_chan->name, app->pid, app->sock);
DBG2("UST app channel %s created successfully for pid:%d and sock:%d",
ua_chan->name, app->pid, app->sock);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* If channel is not enabled, disable it on the tracer */
if (!ua_chan->enabled) {
/* If channel is not enabled, disable it on the tracer */
if (!ua_chan->enabled) {
@@
-883,7
+883,7
@@
static int create_ust_channel(struct ust_app *app,
}
error:
}
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-896,7
+896,7
@@
int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
{
int ret = 0;
{
int ret = 0;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Create UST event on tracer */
ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
/* Create UST event on tracer */
ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
@@
-912,7
+912,7
@@
int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
DBG2("UST app event %s created successfully for pid:%d",
ua_event->attr.name, app->pid);
DBG2("UST app event %s created successfully for pid:%d",
ua_event->attr.name, app->pid);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Set filter if one is present. */
if (ua_event->filter) {
/* Set filter if one is present. */
if (ua_event->filter) {
@@
-947,7
+947,7
@@
int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
}
error:
}
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-1138,7
+1138,7
@@
static int create_ust_app_session(struct ltt_ust_session *usess,
assert(app);
assert(ua_sess_ptr);
assert(app);
assert(ua_sess_ptr);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
ua_sess = lookup_session_by_app(usess, app);
if (ua_sess == NULL) {
@@
-1154,7
+1154,7
@@
static int create_ust_app_session(struct ltt_ust_session *usess,
created = 1;
}
created = 1;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (ua_sess->handle == -1) {
ret = ustctl_create_session(app->sock);
if (ua_sess->handle == -1) {
ret = ustctl_create_session(app->sock);
@@
-1188,7
+1188,7
@@
static int create_ust_app_session(struct ltt_ust_session *usess,
ret = 0;
error:
ret = 0;
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-1714,7
+1714,7
@@
int ust_app_list_events(struct lttng_event **events)
cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
struct lttng_ust_tracepoint_iter uiter;
cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
struct lttng_ust_tracepoint_iter uiter;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (!app->compatible) {
/*
if (!app->compatible) {
/*
@@
-1732,7
+1732,7
@@
int ust_app_list_events(struct lttng_event **events)
while ((ret = ustctl_tracepoint_list_get(app->sock, handle,
&uiter)) != -LTTNG_UST_ERR_NOENT) {
while ((ret = ustctl_tracepoint_list_get(app->sock, handle,
&uiter)) != -LTTNG_UST_ERR_NOENT) {
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (count >= nbmem) {
/* In case the realloc fails, we free the memory */
void *ptr;
if (count >= nbmem) {
/* In case the realloc fails, we free the memory */
void *ptr;
@@
-1766,7
+1766,7
@@
int ust_app_list_events(struct lttng_event **events)
rcu_error:
rcu_read_unlock();
error:
rcu_error:
rcu_read_unlock();
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-1794,7
+1794,7
@@
int ust_app_list_event_fields(struct lttng_event_field **fields)
cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
struct lttng_ust_field_iter uiter;
cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
struct lttng_ust_field_iter uiter;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (!app->compatible) {
/*
if (!app->compatible) {
/*
@@
-1812,7
+1812,7
@@
int ust_app_list_event_fields(struct lttng_event_field **fields)
while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
&uiter)) != -LTTNG_UST_ERR_NOENT) {
while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
&uiter)) != -LTTNG_UST_ERR_NOENT) {
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
if (count >= nbmem) {
/* In case the realloc fails, we free the memory */
void *ptr;
if (count >= nbmem) {
/* In case the realloc fails, we free the memory */
void *ptr;
@@
-1851,7
+1851,7
@@
int ust_app_list_event_fields(struct lttng_event_field **fields)
rcu_error:
rcu_read_unlock();
error:
rcu_error:
rcu_read_unlock();
error:
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
@@
-2393,7
+2393,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = create_ust_stream(app, ua_chan, ustream);
if (ret < 0) {
ret = create_ust_stream(app, ua_chan, ustream);
if (ret < 0) {
@@
-2408,7
+2408,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Order is important this is why a list is used. */
cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
/* Order is important this is why a list is used. */
cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
@@
-2418,7
+2418,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
ustream->handle);
}
ustream->handle);
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
}
switch (app->bits_per_long) {
}
switch (app->bits_per_long) {
@@
-2447,7
+2447,7
@@
int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
skip_setup:
/* This start the UST tracing */
skip_setup:
/* This start the UST tracing */
@@
-2460,19
+2460,19
@@
skip_setup:
/* Indicate that the session has been started once */
ua_sess->started = 1;
/* Indicate that the session has been started once */
ua_sess->started = 1;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Quiescent wait after starting trace */
ustctl_wait_quiescent(app->sock);
end:
rcu_read_unlock();
/* Quiescent wait after starting trace */
ustctl_wait_quiescent(app->sock);
end:
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return 0;
error_rcu_unlock:
rcu_read_unlock();
return 0;
error_rcu_unlock:
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return -1;
}
return -1;
}
@@
-2509,7
+2509,7
@@
int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* This inhibits UST tracing */
ret = ustctl_stop_session(app->sock, ua_sess->handle);
/* This inhibits UST tracing */
ret = ustctl_stop_session(app->sock, ua_sess->handle);
@@
-2518,17
+2518,17
@@
int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Quiescent wait after stopping trace */
ustctl_wait_quiescent(app->sock);
/* Quiescent wait after stopping trace */
ustctl_wait_quiescent(app->sock);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Flushing buffers */
cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
node.node) {
/* Flushing buffers */
cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
node.node) {
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_sock_flush_buffer(app->sock, ua_chan->obj);
if (ret < 0) {
ERR("UST app PID %d channel %s flush failed with ret %d",
ret = ustctl_sock_flush_buffer(app->sock, ua_chan->obj);
if (ret < 0) {
ERR("UST app PID %d channel %s flush failed with ret %d",
@@
-2538,7
+2538,7
@@
int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
}
}
}
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Flush all buffers before stopping */
ret = ustctl_sock_flush_buffer(app->sock, ua_sess->metadata->obj);
/* Flush all buffers before stopping */
ret = ustctl_sock_flush_buffer(app->sock, ua_sess->metadata->obj);
@@
-2549,12
+2549,12
@@
int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
end:
rcu_read_unlock();
end:
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return 0;
error_rcu_unlock:
rcu_read_unlock();
return 0;
error_rcu_unlock:
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return -1;
}
return -1;
}
@@
-2594,10
+2594,10
@@
static int destroy_trace(struct ltt_ust_session *usess, struct ust_app *app)
obj.shm_fd = -1;
obj.wait_fd = -1;
obj.memory_map_size = 0;
obj.shm_fd = -1;
obj.wait_fd = -1;
obj.memory_map_size = 0;
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ustctl_release_object(app->sock, &obj);
ustctl_release_object(app->sock, &obj);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
delete_ust_app_session(app->sock, ua_sess);
/* Quiescent wait after stopping trace */
delete_ust_app_session(app->sock, ua_sess);
/* Quiescent wait after stopping trace */
@@
-2605,7
+2605,7
@@
static int destroy_trace(struct ltt_ust_session *usess, struct ust_app *app)
end:
rcu_read_unlock();
end:
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return 0;
}
return 0;
}
@@
-2958,7
+2958,7
@@
int ust_app_validate_version(int sock)
app = find_app_by_sock(sock);
assert(app);
app = find_app_by_sock(sock);
assert(app);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_tracer_version(sock, &app->version);
if (ret < 0) {
ret = ustctl_tracer_version(sock, &app->version);
if (ret < 0) {
@@
-2975,7
+2975,7
@@
int ust_app_validate_version(int sock)
UST_APP_MAJOR_VERSION);
app->compatible = 1;
rcu_read_unlock();
UST_APP_MAJOR_VERSION);
app->compatible = 1;
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return 0;
error:
return 0;
error:
@@
-2984,7
+2984,7
@@
error:
UST_APP_MAJOR_VERSION);
app->compatible = 0;
rcu_read_unlock();
UST_APP_MAJOR_VERSION);
app->compatible = 0;
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return -1;
}
return -1;
}
@@
-3008,7
+3008,7
@@
int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
continue;
}
continue;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = ustctl_calibrate(app->sock, calibrate);
if (ret < 0) {
ret = ustctl_calibrate(app->sock, calibrate);
if (ret < 0) {
@@
-3030,7
+3030,7
@@
int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
rcu_read_unlock();
rcu_read_unlock();
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
return ret;
}
return ret;
}
This page took
0.0319 seconds
and
4
git commands to generate.