projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: remove redundant exit labels from sessiond initialization
[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 ad6bc09f74cac51c2ab1ce349779d5f26d17b740..e2b7a083c0ecb33eb95db9c8789abe34c154f2f8 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-437,6
+437,9
@@
void save_per_pid_lost_discarded_counters(struct ust_app_channel *ua_chan)
end:
rcu_read_unlock();
end:
rcu_read_unlock();
+ if (session) {
+ session_put(session);
+ }
}
/*
}
/*
@@
-487,9
+490,16
@@
void delete_ust_app_channel(int sock, struct ust_app_channel *ua_chan,
registry = get_session_registry(ua_chan->session);
if (registry) {
ust_registry_channel_del_free(registry, ua_chan->key,
registry = get_session_registry(ua_chan->session);
if (registry) {
ust_registry_channel_del_free(registry, ua_chan->key,
- true);
+ sock >= 0);
+ }
+ /*
+ * A negative socket can be used by the caller when
+ * cleaning-up a ua_chan in an error path. Skip the
+ * accounting in this case.
+ */
+ if (sock >= 0) {
+ save_per_pid_lost_discarded_counters(ua_chan);
}
}
- save_per_pid_lost_discarded_counters(ua_chan);
}
if (ua_chan->obj != NULL) {
}
if (ua_chan->obj != NULL) {
@@
-2858,7
+2868,7
@@
static int create_channel_per_uid(struct ust_app *app,
int ret;
struct buffer_reg_uid *reg_uid;
struct buffer_reg_channel *reg_chan;
int ret;
struct buffer_reg_uid *reg_uid;
struct buffer_reg_channel *reg_chan;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
enum lttng_error_code notification_ret;
struct ust_registry_channel *chan_reg;
enum lttng_error_code notification_ret;
struct ust_registry_channel *chan_reg;
@@
-2961,6
+2971,9
@@
send_channel:
}
error:
}
error:
+ if (session) {
+ session_put(session);
+ }
return ret;
}
return ret;
}
@@
-2979,7
+2992,7
@@
static int create_channel_per_pid(struct ust_app *app,
int ret;
struct ust_registry_session *registry;
enum lttng_error_code cmd_ret;
int ret;
struct ust_registry_session *registry;
enum lttng_error_code cmd_ret;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
uint64_t chan_reg_key;
struct ust_registry_channel *chan_reg;
uint64_t chan_reg_key;
struct ust_registry_channel *chan_reg;
@@
-3017,7
+3030,7
@@
static int create_channel_per_pid(struct ust_app *app,
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
if (ret < 0) {
ERR("Error creating UST channel \"%s\" on the consumer daemon",
ua_chan->name);
- goto error;
+ goto error
_remove_from_registry
;
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
}
ret = send_channel_pid_to_ust(app, ua_sess, ua_chan);
@@
-3025,7
+3038,7
@@
static int create_channel_per_pid(struct ust_app *app,
if (ret != -ENOTCONN) {
ERR("Error sending channel to application");
}
if (ret != -ENOTCONN) {
ERR("Error sending channel to application");
}
- goto error;
+ goto error
_remove_from_registry
;
}
chan_reg_key = ua_chan->key;
}
chan_reg_key = ua_chan->key;
@@
-3045,11
+3058,18
@@
static int create_channel_per_pid(struct ust_app *app,
if (cmd_ret != LTTNG_OK) {
ret = - (int) cmd_ret;
ERR("Failed to add channel to notification thread");
if (cmd_ret != LTTNG_OK) {
ret = - (int) cmd_ret;
ERR("Failed to add channel to notification thread");
- goto error;
+ goto error
_remove_from_registry
;
}
}
+error_remove_from_registry:
+ if (ret) {
+ ust_registry_channel_del_free(registry, ua_chan->key, false);
+ }
error:
rcu_read_unlock();
error:
rcu_read_unlock();
+ if (session) {
+ session_put(session);
+ }
return ret;
}
return ret;
}
@@
-3240,7
+3260,7
@@
static int create_ust_app_metadata(struct ust_app_session *ua_sess,
struct ust_app_channel *metadata;
struct consumer_socket *socket;
struct ust_registry_session *registry;
struct ust_app_channel *metadata;
struct consumer_socket *socket;
struct ust_registry_session *registry;
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
assert(ua_sess);
assert(app);
assert(ua_sess);
assert(app);
@@
-3331,6
+3351,9
@@
error_consumer:
delete_ust_app_channel(-1, metadata, app);
error:
pthread_mutex_unlock(®istry->lock);
delete_ust_app_channel(-1, metadata, app);
error:
pthread_mutex_unlock(®istry->lock);
+ if (session) {
+ session_put(session);
+ }
return ret;
}
return ret;
}
@@
-5941,17
+5964,18
@@
void ust_app_destroy(struct ust_app *app)
* Take a snapshot for a given UST session. The snapshot is sent to the given
* output.
*
* Take a snapshot for a given UST session. The snapshot is sent to the given
* output.
*
- * Return
0 on success or else a negative valu
e.
+ * Return
s LTTNG_OK on success or a LTTNG_ERR error cod
e.
*/
*/
-
int
ust_app_snapshot_record(struct ltt_ust_session *usess,
+
enum lttng_error_code
ust_app_snapshot_record(struct ltt_ust_session *usess,
struct snapshot_output *output, int wait,
uint64_t nb_packets_per_stream)
{
int ret = 0;
struct snapshot_output *output, int wait,
uint64_t nb_packets_per_stream)
{
int ret = 0;
+ enum lttng_error_code status = LTTNG_OK;
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
struct lttng_ht_iter iter;
struct ust_app *app;
char pathname[PATH_MAX];
- struct ltt_session *session;
+ struct ltt_session *session
= NULL
;
uint64_t trace_archive_id;
assert(usess);
uint64_t trace_archive_id;
assert(usess);
@@
-5983,7
+6007,7
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
status = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-5993,27
+6017,28
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
reg->uid, reg->bits_per_long);
if (ret < 0) {
PERROR("snprintf snapshot path");
reg->uid, reg->bits_per_long);
if (ret < 0) {
PERROR("snprintf snapshot path");
+ status = LTTNG_ERR_INVALID;
goto error;
}
/* Add the UST default trace dir to path. */
cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
reg_chan, node.node) {
goto error;
}
/* Add the UST default trace dir to path. */
cds_lfht_for_each_entry(reg->registry->channels->ht, &iter.iter,
reg_chan, node.node) {
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
reg_chan->consumer_key,
output, 0, usess->uid,
usess->gid, pathname, wait,
nb_packets_per_stream,
trace_archive_id);
reg_chan->consumer_key,
output, 0, usess->uid,
usess->gid, pathname, wait,
nb_packets_per_stream,
trace_archive_id);
- if (
ret < 0
) {
+ if (
status != LTTNG_OK
) {
goto error;
}
}
goto error;
}
}
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
reg->registry->reg.ust->metadata_key, output, 1,
usess->uid, usess->gid, pathname, wait, 0,
trace_archive_id);
reg->registry->reg.ust->metadata_key, output, 1,
usess->uid, usess->gid, pathname, wait, 0,
trace_archive_id);
- if (
ret < 0
) {
+ if (
status != LTTNG_OK
) {
goto error;
}
}
goto error;
}
}
@@
-6038,7
+6063,7
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
socket = consumer_find_socket_by_bitness(app->bits_per_long,
output->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(app->bits_per_long,
output->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
status = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-6047,35
+6072,45
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
ret = snprintf(pathname, sizeof(pathname), DEFAULT_UST_TRACE_DIR "/%s",
ua_sess->path);
if (ret < 0) {
ret = snprintf(pathname, sizeof(pathname), DEFAULT_UST_TRACE_DIR "/%s",
ua_sess->path);
if (ret < 0) {
+ status = LTTNG_ERR_INVALID;
PERROR("snprintf snapshot path");
goto error;
}
cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
ua_chan, node.node) {
PERROR("snprintf snapshot path");
goto error;
}
cds_lfht_for_each_entry(ua_sess->channels->ht, &chan_iter.iter,
ua_chan, node.node) {
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
ua_chan->key, output,
0, ua_sess->euid, ua_sess->egid,
pathname, wait,
nb_packets_per_stream,
trace_archive_id);
ua_chan->key, output,
0, ua_sess->euid, ua_sess->egid,
pathname, wait,
nb_packets_per_stream,
trace_archive_id);
- if (ret < 0) {
+ switch (status) {
+ case LTTNG_OK:
+ break;
+ case LTTNG_ERR_CHAN_NOT_FOUND:
+ continue;
+ default:
goto error;
}
}
registry = get_session_registry(ua_sess);
if (!registry) {
goto error;
}
}
registry = get_session_registry(ua_sess);
if (!registry) {
- DBG("Application session is being torn down. Abort snapshot record.");
- ret = -1;
- goto error;
+ DBG("Application session is being torn down. Skip application.");
+ continue;
}
}
-
ret
= consumer_snapshot_channel(socket,
+
status
= consumer_snapshot_channel(socket,
registry->metadata_key, output,
1, ua_sess->euid, ua_sess->egid,
pathname, wait, 0,
trace_archive_id);
registry->metadata_key, output,
1, ua_sess->euid, ua_sess->egid,
pathname, wait, 0,
trace_archive_id);
- if (ret < 0) {
+ switch (status) {
+ case LTTNG_OK:
+ break;
+ case LTTNG_ERR_CHAN_NOT_FOUND:
+ continue;
+ default:
goto error;
}
}
goto error;
}
}
@@
-6088,7
+6123,10
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
error:
rcu_read_unlock();
error:
rcu_read_unlock();
- return ret;
+ if (session) {
+ session_put(session);
+ }
+ return status;
}
/*
}
/*
@@
-6325,11
+6363,12
@@
int ust_app_regenerate_statedump_all(struct ltt_ust_session *usess)
/*
* Rotate all the channels of a session.
*
/*
* Rotate all the channels of a session.
*
- * Return
0 on success or else a negative valu
e.
+ * Return
LTTNG_OK on success or else an LTTng error cod
e.
*/
*/
-
int
ust_app_rotate_session(struct ltt_session *session)
+
enum lttng_error_code
ust_app_rotate_session(struct ltt_session *session)
{
{
- int ret = 0;
+ int ret;
+ enum lttng_error_code cmd_ret = LTTNG_OK;
struct lttng_ht_iter iter;
struct ust_app *app;
struct ltt_ust_session *usess = session->ust_session;
struct lttng_ht_iter iter;
struct ust_app *app;
struct ltt_ust_session *usess = session->ust_session;
@@
-6352,7
+6391,7
@@
int ust_app_rotate_session(struct ltt_session *session)
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(reg->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
cmd_ret = LTTNG_ERR_INVALID
;
goto error;
}
goto error;
}
@@
-6361,6
+6400,7
@@
int ust_app_rotate_session(struct ltt_session *session)
reg->uid, reg->bits_per_long);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
reg->uid, reg->bits_per_long);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
+ cmd_ret = LTTNG_ERR_INVALID;
goto error;
}
goto error;
}
@@
-6374,6
+6414,7
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6387,6
+6428,7
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6411,6
+6453,7
@@
int ust_app_rotate_session(struct ltt_session *session)
ua_sess->path);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
ua_sess->path);
if (ret < 0 || ret == sizeof(pathname)) {
PERROR("Failed to format rotation path");
+ cmd_ret = LTTNG_ERR_INVALID;
goto error;
}
goto error;
}
@@
-6418,15
+6461,14
@@
int ust_app_rotate_session(struct ltt_session *session)
socket = consumer_find_socket_by_bitness(app->bits_per_long,
usess->consumer);
if (!socket) {
socket = consumer_find_socket_by_bitness(app->bits_per_long,
usess->consumer);
if (!socket) {
-
ret = -EINVAL
;
+
cmd_ret = LTTNG_ERR_INVALID
;
goto error;
}
registry = get_session_registry(ua_sess);
if (!registry) {
goto error;
}
registry = get_session_registry(ua_sess);
if (!registry) {
- DBG("Application session is being torn down. Abort session rotation.");
- ret = -1;
- goto error;
+ DBG("Application session is being torn down. Skip application.");
+ continue;
}
}
@@
-6439,6
+6481,10
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ false,
session->current_archive_id);
if (ret < 0) {
+ /* Per-PID buffer and application going away. */
+ if (ret == -LTTNG_ERR_CHAN_NOT_FOUND)
+ continue;
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6451,6
+6497,10
@@
int ust_app_rotate_session(struct ltt_session *session)
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
/* is_metadata_channel */ true,
session->current_archive_id);
if (ret < 0) {
+ /* Per-PID buffer and application going away. */
+ if (ret == -LTTNG_ERR_CHAN_NOT_FOUND)
+ continue;
+ cmd_ret = LTTNG_ERR_ROTATION_FAIL_CONSUMER;
goto error;
}
}
goto error;
}
}
@@
-6461,9
+6511,9
@@
int ust_app_rotate_session(struct ltt_session *session)
break;
}
break;
}
- ret = LTTNG_OK;
+
cmd_
ret = LTTNG_OK;
error:
rcu_read_unlock();
error:
rcu_read_unlock();
- return ret;
+ return
cmd_
ret;
}
}
This page took
0.032254 seconds
and
5
git commands to generate.