projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng list command with network path
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index 9ff4eceb2c84ba3469ef22a5c59b59e57ca16672..3503e0415489636654d5a3fa037b4909a68907c3 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-272,7
+272,8
@@
malloc_error:
/*
* Set network URI to the consumer output object.
*
/*
* Set network URI to the consumer output object.
*
- * Return 0 on success. Negative value on error.
+ * Return 0 on success. Return 1 if the URI were equal. Else, negative value on
+ * error.
*/
int consumer_set_network_uri(struct consumer_output *obj,
struct lttng_uri *uri)
*/
int consumer_set_network_uri(struct consumer_output *obj,
struct lttng_uri *uri)
@@
-294,6
+295,7
@@
int consumer_set_network_uri(struct consumer_output *obj,
/* Assign default port. */
uri->port = DEFAULT_NETWORK_CONTROL_PORT;
}
/* Assign default port. */
uri->port = DEFAULT_NETWORK_CONTROL_PORT;
}
+ DBG3("Consumer control URI set with port %d", uri->port);
break;
case LTTNG_STREAM_DATA:
dst_uri = &obj->dst.net.data;
break;
case LTTNG_STREAM_DATA:
dst_uri = &obj->dst.net.data;
@@
-302,6
+304,7
@@
int consumer_set_network_uri(struct consumer_output *obj,
/* Assign default port. */
uri->port = DEFAULT_NETWORK_DATA_PORT;
}
/* Assign default port. */
uri->port = DEFAULT_NETWORK_DATA_PORT;
}
+ DBG3("Consumer data URI set with port %d", uri->port);
break;
default:
ERR("Set network uri type unknown %d", uri->stype);
break;
default:
ERR("Set network uri type unknown %d", uri->stype);
@@
-312,7
+315,7
@@
int consumer_set_network_uri(struct consumer_output *obj,
if (!ret) {
/* Same URI, don't touch it and return success. */
DBG3("URI network compare are the same");
if (!ret) {
/* Same URI, don't touch it and return success. */
DBG3("URI network compare are the same");
- goto e
nd
;
+ goto e
qual
;
}
/* URIs were not equal, replacing it. */
}
/* URIs were not equal, replacing it. */
@@
-347,9
+350,9
@@
int consumer_set_network_uri(struct consumer_output *obj,
DBG3("Consumer set network uri subdir path %s", tmp_path);
}
DBG3("Consumer set network uri subdir path %s", tmp_path);
}
-end:
return 0;
return 0;
-
+equal:
+ return 1;
error:
return -1;
}
error:
return -1;
}
This page took
0.024884 seconds
and
4
git commands to generate.