projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: bindings import segfaults on missing hash_key_u64
[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 10152864e9940beb0e6b3d4423fdd4a7e6013fcd..c90436c574270e2716372853b4a4c86dbbc80578 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-315,7
+315,7
@@
error:
* object reference is not needed anymore.
*/
struct consumer_socket *consumer_find_socket_by_bitness(int bits,
* object reference is not needed anymore.
*/
struct consumer_socket *consumer_find_socket_by_bitness(int bits,
- struct consumer_output *consumer)
+
const
struct consumer_output *consumer)
{
int consumer_fd;
struct consumer_socket *socket = NULL;
{
int consumer_fd;
struct consumer_socket *socket = NULL;
@@
-348,7
+348,7
@@
end:
* returned consumer_socket.
*/
struct consumer_socket *consumer_find_socket(int key,
* returned consumer_socket.
*/
struct consumer_socket *consumer_find_socket(int key,
- struct consumer_output *consumer)
+
const
struct consumer_output *consumer)
{
struct lttng_ht_iter iter;
struct lttng_ht_node_ulong *node;
{
struct lttng_ht_iter iter;
struct lttng_ht_node_ulong *node;
@@
-405,7
+405,7
@@
void consumer_add_socket(struct consumer_socket *sock,
}
/*
}
/*
- * Delte consumer socket to consumer output object. Read side lock must be
+ * Del
e
te consumer socket to consumer output object. Read side lock must be
* acquired before calling this function.
*/
void consumer_del_socket(struct consumer_socket *sock,
* acquired before calling this function.
*/
void consumer_del_socket(struct consumer_socket *sock,
@@
-893,10
+893,6
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
msg->u.ask_channel.buffer_credentials.uid = UINT32_MAX;
msg->u.ask_channel.buffer_credentials.gid = UINT32_MAX;
msg->u.ask_channel.buffer_credentials.uid = UINT32_MAX;
msg->u.ask_channel.buffer_credentials.gid = UINT32_MAX;
- if (monitor) {
- assert(trace_chunk);
- }
-
if (trace_chunk) {
uint64_t chunk_id;
enum lttng_trace_chunk_status chunk_status;
if (trace_chunk) {
uint64_t chunk_id;
enum lttng_trace_chunk_status chunk_status;
@@
-1441,7
+1437,7
@@
end:
* Returns LTTNG_OK on success or else an LTTng error code.
*/
enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
* Returns LTTNG_OK on success or else an LTTng error code.
*/
enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
- uint64_t key, const struct
snapshot
_output *output, int metadata,
+ uint64_t key, const struct
consumer
_output *output, int metadata,
uid_t uid, gid_t gid, const char *channel_path, int wait,
uint64_t nb_packets_per_stream)
{
uid_t uid, gid_t gid, const char *channel_path, int wait,
uint64_t nb_packets_per_stream)
{
@@
-1451,7
+1447,6
@@
enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
assert(socket);
assert(output);
assert(socket);
assert(output);
- assert(output->consumer);
DBG("Consumer snapshot channel key %" PRIu64, key);
DBG("Consumer snapshot channel key %" PRIu64, key);
@@
-1461,9
+1456,9
@@
enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
msg.u.snapshot_channel.nb_packets_per_stream = nb_packets_per_stream;
msg.u.snapshot_channel.metadata = metadata;
msg.u.snapshot_channel.nb_packets_per_stream = nb_packets_per_stream;
msg.u.snapshot_channel.metadata = metadata;
- if (output->
consumer->
type == CONSUMER_DST_NET) {
+ if (output->type == CONSUMER_DST_NET) {
msg.u.snapshot_channel.relayd_id =
msg.u.snapshot_channel.relayd_id =
- output->
consumer->
net_seq_index;
+ output->net_seq_index;
msg.u.snapshot_channel.use_relayd = 1;
} else {
msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
msg.u.snapshot_channel.use_relayd = 1;
} else {
msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
@@
-1703,7
+1698,7
@@
int consumer_create_trace_chunk(struct consumer_socket *socket,
const struct lttng_directory_handle *chunk_directory_handle;
int chunk_dirfd;
const char *chunk_name;
const struct lttng_directory_handle *chunk_directory_handle;
int chunk_dirfd;
const char *chunk_name;
- bool chunk_name_overriden;
+ bool chunk_name_overrid
d
en;
uint64_t chunk_id;
time_t creation_timestamp;
char creation_timestamp_buffer[ISO8601_STR_LEN];
uint64_t chunk_id;
time_t creation_timestamp;
char creation_timestamp_buffer[ISO8601_STR_LEN];
@@
-1723,14
+1718,14
@@
int consumer_create_trace_chunk(struct consumer_socket *socket,
}
chunk_status = lttng_trace_chunk_get_name(chunk, &chunk_name,
}
chunk_status = lttng_trace_chunk_get_name(chunk, &chunk_name,
- &chunk_name_overriden);
+ &chunk_name_overrid
d
en);
if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK &&
chunk_status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
ERR("Failed to get name of trace chunk");
ret = -LTTNG_ERR_FATAL;
goto error;
}
if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK &&
chunk_status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
ERR("Failed to get name of trace chunk");
ret = -LTTNG_ERR_FATAL;
goto error;
}
- if (chunk_name_overriden) {
+ if (chunk_name_overrid
d
en) {
ret = lttng_strncpy(msg.u.create_trace_chunk.override_name,
chunk_name,
sizeof(msg.u.create_trace_chunk.override_name));
ret = lttng_strncpy(msg.u.create_trace_chunk.override_name,
chunk_name,
sizeof(msg.u.create_trace_chunk.override_name));
This page took
0.027276 seconds
and
4
git commands to generate.