projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement --shm-path option for UST sessions (per-uid channels)
[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 9b8a0a759ac5f22acb16979ed468bf6d1c87f16f..628201e07c0f4477eafb1079a5cd96cf0677ecee 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-801,7
+801,8
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
uint64_t tracefile_count,
uint64_t session_id_per_pid,
unsigned int monitor,
uint64_t tracefile_count,
uint64_t session_id_per_pid,
unsigned int monitor,
- uint32_t ust_app_uid)
+ uint32_t ust_app_uid,
+ const char *shm_path)
{
assert(msg);
{
assert(msg);
@@
-839,6
+840,12
@@
void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
strncpy(msg->u.ask_channel.name, name, sizeof(msg->u.ask_channel.name));
msg->u.ask_channel.name[sizeof(msg->u.ask_channel.name) - 1] = '\0';
strncpy(msg->u.ask_channel.name, name, sizeof(msg->u.ask_channel.name));
msg->u.ask_channel.name[sizeof(msg->u.ask_channel.name) - 1] = '\0';
+
+ if (shm_path) {
+ strncpy(msg->u.ask_channel.shm_path, shm_path,
+ sizeof(msg->u.ask_channel.shm_path));
+ msg->u.ask_channel.shm_path[sizeof(msg->u.ask_channel.shm_path) - 1] = '\0';
+ }
}
/*
}
/*
@@
-1158,7
+1165,8
@@
end:
}
/*
}
/*
- * Send a close metdata command to consumer using the given channel key.
+ * Send a close metadata command to consumer using the given channel key.
+ * Called with registry lock held.
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
@@
-1224,7
+1232,8
@@
end:
}
/*
}
/*
- * Send metadata string to consumer. Socket lock MUST be acquired.
+ * Send metadata string to consumer.
+ * RCU read-side lock must be held to guarantee existence of socket.
*
* Return 0 on success else a negative value.
*/
*
* Return 0 on success else a negative value.
*/
@@
-1239,6
+1248,8
@@
int consumer_push_metadata(struct consumer_socket *socket,
DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr);
DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr);
+ pthread_mutex_lock(socket->lock);
+
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA;
msg.u.push_metadata.key = metadata_key;
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA;
msg.u.push_metadata.key = metadata_key;
@@
-1266,6
+1277,7
@@
int consumer_push_metadata(struct consumer_socket *socket,
}
end:
}
end:
+ pthread_mutex_unlock(socket->lock);
health_code_update();
return ret;
}
health_code_update();
return ret;
}
This page took
0.026979 seconds
and
4
git commands to generate.