projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move hash table to common/ directory
[lttng-tools.git]
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/lttng-sessiond/ust-consumer.c
b/lttng-sessiond/ust-consumer.c
index 46558417ecc2c47b295a7613ae35c7da7c9412d0..d6b80ff64f2cb134c051abe7b0c2bbd604147ddb 100644
(file)
--- a/
lttng-sessiond/ust-consumer.c
+++ b/
lttng-sessiond/ust-consumer.c
@@
-27,14
+27,15
@@
#include <lttng-sessiond-comm.h>
#include <lttng/lttng-consumer.h>
#include <lttng-sessiond-comm.h>
#include <lttng/lttng-consumer.h>
-#include "hashtable.h"
+#include "
../common/
hashtable.h"
#include "ust-consumer.h"
/*
* Send all stream fds of UST channel to the consumer.
*/
static int send_channel_streams(int sock,
#include "ust-consumer.h"
/*
* Send all stream fds of UST channel to the consumer.
*/
static int send_channel_streams(int sock,
- struct ust_app_channel *uchan)
+ struct ust_app_channel *uchan,
+ uid_t uid, gid_t gid)
{
int ret, fd;
struct lttcomm_consumer_msg lum;
{
int ret, fd;
struct lttcomm_consumer_msg lum;
@@
-84,6
+85,8
@@
static int send_channel_streams(int sock,
*/
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = stream->obj->memory_map_size;
*/
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = stream->obj->memory_map_size;
+ lum.u.stream.uid = uid;
+ lum.u.stream.gid = gid;
strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending stream %d to consumer", lum.u.stream.stream_key);
strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending stream %d to consumer", lum.u.stream.stream_key);
@@
-100,18
+103,7
@@
static int send_channel_streams(int sock,
perror("send consumer stream ancillary data");
goto error;
}
perror("send consumer stream ancillary data");
goto error;
}
-
- /*
- * We release the stream object here, as we have passed
- * it to the consumer.
- */
- /* Ensure we don't let the app know (sock = -1). */
- ustctl_release_object(-1, stream->obj);
- cds_list_del(&stream->list);
- free(stream);
}
}
- /* Ensure we don't let the app know (sock = -1). */
- ustctl_release_object(-1, uchan->obj);
DBG("consumer channel streams sent");
DBG("consumer channel streams sent");
@@
-135,6
+127,11
@@
int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
DBG("Sending metadata stream fd");
DBG("Sending metadata stream fd");
+ if (consumer_fd < 0) {
+ ERR("Consumer has negative file descriptor");
+ return -EINVAL;
+ }
+
if (usess->metadata->obj->shm_fd != 0) {
int fd;
int fds[2];
if (usess->metadata->obj->shm_fd != 0) {
int fd;
int fds[2];
@@
-164,6
+161,8
@@
int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM;
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = usess->metadata->stream_obj->memory_map_size;
lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM;
lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
lum.u.stream.mmap_len = usess->metadata->stream_obj->memory_map_size;
+ lum.u.stream.uid = usess->uid;
+ lum.u.stream.gid = usess->gid;
strncpy(lum.u.stream.path_name, usess->metadata->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key);
strncpy(lum.u.stream.path_name, usess->metadata->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key);
@@
-179,10
+178,6
@@
int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
perror("send consumer stream");
goto error;
}
perror("send consumer stream");
goto error;
}
- /* Metadata fds passed to consumer, release them. */
- /* Ensure we don't let the app know (sock = -1). */
- ustctl_release_object(-1, usess->metadata->stream_obj);
- ustctl_release_object(-1, usess->metadata->obj);
}
/* Send each channel fd streams of session */
}
/* Send each channel fd streams of session */
@@
-191,7
+186,8
@@
int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
while ((node = hashtable_iter_get_node(&iter)) != NULL) {
uchan = caa_container_of(node, struct ust_app_channel, node);
while ((node = hashtable_iter_get_node(&iter)) != NULL) {
uchan = caa_container_of(node, struct ust_app_channel, node);
- ret = send_channel_streams(sock, uchan);
+ ret = send_channel_streams(sock, uchan, usess->uid,
+ usess->gid);
if (ret < 0) {
rcu_read_unlock();
goto error;
if (ret < 0) {
rcu_read_unlock();
goto error;
This page took
0.025354 seconds
and
4
git commands to generate.