projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: unchecked return value in trace_clock_read64_monotonic
[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 9a766e4ab68e628cbdec4d9f0432ec0b83dea547..1bb183d5c68dfe7d4e5d56125f1dfbac26492a3a 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-5726,7
+5726,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
uint64_t nb_packets_per_stream)
{
int ret = 0;
uint64_t nb_packets_per_stream)
{
int ret = 0;
- unsigned int snapshot_done = 0;
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];
@@
-5778,7
+5777,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
- snapshot_done = 1;
}
break;
}
}
break;
}
@@
-5831,7
+5829,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
- snapshot_done = 1;
}
break;
}
}
break;
}
@@
-5840,15
+5837,6
@@
int ust_app_snapshot_record(struct ltt_ust_session *usess,
break;
}
break;
}
- if (!snapshot_done) {
- /*
- * If no snapshot was made and we are not in the error path, this means
- * that there are no buffers thus no (prior) application to snapshot
- * data from so we have simply NO data.
- */
- ret = -ENODATA;
- }
-
error:
rcu_read_unlock();
return ret;
error:
rcu_read_unlock();
return ret;
@@
-5945,9
+5933,11
@@
int ust_app_uid_get_channel_runtime_stats(uint64_t ust_session_id,
if (overwrite) {
ret = consumer_get_lost_packets(ust_session_id,
consumer_chan_key, consumer, lost);
if (overwrite) {
ret = consumer_get_lost_packets(ust_session_id,
consumer_chan_key, consumer, lost);
+ *discarded = 0;
} else {
ret = consumer_get_discarded_events(ust_session_id,
consumer_chan_key, consumer, discarded);
} else {
ret = consumer_get_discarded_events(ust_session_id,
consumer_chan_key, consumer, discarded);
+ *lost = 0;
}
end:
}
end:
@@
-5990,10
+5980,12
@@
int ust_app_pid_get_channel_runtime_stats(struct ltt_ust_session *usess,
if (overwrite) {
ret = consumer_get_lost_packets(usess->id, ua_chan->key,
consumer, lost);
if (overwrite) {
ret = consumer_get_lost_packets(usess->id, ua_chan->key,
consumer, lost);
+ *discarded = 0;
goto end;
} else {
ret = consumer_get_discarded_events(usess->id,
ua_chan->key, consumer, discarded);
goto end;
} else {
ret = consumer_get_discarded_events(usess->id,
ua_chan->key, consumer, discarded);
+ *lost = 0;
goto end;
}
}
goto end;
}
}
This page took
0.024496 seconds
and
4
git commands to generate.