projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Data pending message is printed when unnecessary
[lttng-tools.git]
/
src
/
bin
/
lttng
/
commands
/
destroy.c
diff --git
a/src/bin/lttng/commands/destroy.c
b/src/bin/lttng/commands/destroy.c
index aad4bdd23f07db2ac8a9b53eaab6044a0abdf54e..e0bafc475b6451cd4e3d0c8cd6b79583609936f4 100644
(file)
--- a/
src/bin/lttng/commands/destroy.c
+++ b/
src/bin/lttng/commands/destroy.c
@@
-70,8
+70,8
@@
static int destroy_session(struct lttng_session *session)
}
session_was_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED;
if (!opt_no_wait) {
}
session_was_stopped = ret == -LTTNG_ERR_TRACE_ALREADY_STOPPED;
if (!opt_no_wait) {
-
_MSG("Waiting for data availability")
;
- fflush(stdout);
+
bool printed_wait_msg = false
;
+
do {
ret = lttng_data_pending(session->name);
if (ret < 0) {
do {
ret = lttng_data_pending(session->name);
if (ret < 0) {
@@
-84,12
+84,20
@@
static int destroy_session(struct lttng_session *session)
* returned value indicates availability.
*/
if (ret) {
* returned value indicates availability.
*/
if (ret) {
+ if (!printed_wait_msg) {
+ _MSG("Waiting for data availability");
+ fflush(stdout);
+ }
+
+ printed_wait_msg = true;
usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
_MSG(".");
fflush(stdout);
}
} while (ret != 0);
usleep(DEFAULT_DATA_AVAILABILITY_WAIT_TIME);
_MSG(".");
fflush(stdout);
}
} while (ret != 0);
- MSG("");
+ if (printed_wait_msg) {
+ MSG("");
+ }
}
if (!session_was_stopped) {
/*
}
if (!session_was_stopped) {
/*
This page took
0.040968 seconds
and
4
git commands to generate.