X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=31f70434534cf56b3fd173242c1e5f3831e8c367;hb=a1ae2ea59428174575b7328b1062a6248d636b72;hp=6351ebe32f47431c0f6490bd6edd23ba3b8a0c37;hpb=2b29c638278807c1536634ce49f0c9c053b3ab5f;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c index 6351ebe32..31f704345 100644 --- a/src/bin/lttng-sessiond/consumer.c +++ b/src/bin/lttng-sessiond/consumer.c @@ -561,7 +561,7 @@ struct consumer_output *consumer_copy_output(struct consumer_output *obj) } output->enabled = obj->enabled; output->net_seq_index = obj->net_seq_index; - memcpy(output->subdir, obj->subdir, PATH_MAX); + memcpy(output->subdir, obj->subdir, sizeof(output->subdir)); output->snapshot = obj->snapshot; output->relay_major_version = obj->relay_major_version; output->relay_minor_version = obj->relay_minor_version; @@ -1579,3 +1579,48 @@ end: rcu_read_unlock(); return ret; } + +/* + * Ask the consumer to create a directory. + * + * Called with the consumer socket lock held. + */ +int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id, + const struct consumer_output *output, const char *path, + uid_t uid, gid_t gid) +{ + int ret; + struct lttcomm_consumer_msg msg; + + assert(socket); + + DBG("Consumer mkdir %s in session %" PRIu64, path, session_id); + + memset(&msg, 0, sizeof(msg)); + msg.cmd_type = LTTNG_CONSUMER_MKDIR; + msg.u.mkdir.session_id = session_id; + msg.u.mkdir.uid = uid; + msg.u.mkdir.gid = gid; + ret = snprintf(msg.u.mkdir.path, sizeof(msg.u.mkdir.path), "%s", path); + if (ret < 0 || ret >= sizeof(msg.u.mkdir.path)) { + ERR("Format path"); + ret = -1; + goto error; + } + + if (output->type == CONSUMER_DST_NET) { + msg.u.mkdir.relayd_id = output->net_seq_index; + } else { + msg.u.mkdir.relayd_id = (uint64_t) -1ULL; + } + + health_code_update(); + ret = consumer_send_msg(socket, &msg); + if (ret < 0) { + goto error; + } + +error: + health_code_update(); + return ret; +}