/*
* Ask the consumer to snapshot a specific channel using the key.
*
- * Return 0 on success or else a negative error.
+ * Returns LTTNG_OK on success or else an LTTng error code.
*/
-int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
- struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
- const char *session_path, int wait, uint64_t nb_packets_per_stream,
- uint64_t trace_archive_id)
+enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
+ uint64_t key, struct snapshot_output *output, int metadata,
+ uid_t uid, gid_t gid, const char *session_path, int wait,
+ uint64_t nb_packets_per_stream, uint64_t trace_archive_id)
{
int ret;
+ enum lttng_error_code status = LTTNG_OK;
struct lttcomm_consumer_msg msg;
assert(socket);
output->nb_snapshot,
session_path);
if (ret < 0) {
- ret = -LTTNG_ERR_NOMEM;
+ status = LTTNG_ERR_INVALID;
goto error;
} else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s/%s-%s-%" PRIu64 "%s\"",
output->name, output->datetime,
output->nb_snapshot,
session_path);
- ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+ status = LTTNG_ERR_SNAPSHOT_FAIL;
goto error;
}
} else {
output->nb_snapshot,
session_path);
if (ret < 0) {
- ret = -LTTNG_ERR_NOMEM;
+ status = LTTNG_ERR_NOMEM;
goto error;
} else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s-%s-%" PRIu64 "%s\"",
ret, output->consumer->dst.session_root_path,
output->name, output->datetime, output->nb_snapshot,
session_path);
- ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+ status = LTTNG_ERR_SNAPSHOT_FAIL;
goto error;
}
S_IRWXU | S_IRWXG, uid, gid);
if (ret < 0) {
if (errno != EEXIST) {
- ERR("Trace directory creation error");
+ status = LTTNG_ERR_CREATE_DIR_FAIL;
+ PERROR("Trace directory creation error");
goto error;
}
}
ret = consumer_send_msg(socket, &msg);
pthread_mutex_unlock(socket->lock);
if (ret < 0) {
+ switch (-ret) {
+ case LTTCOMM_CONSUMERD_CHAN_NOT_FOUND:
+ status = LTTNG_ERR_CHAN_NOT_FOUND;
+ break;
+ default:
+ status = LTTNG_ERR_SNAPSHOT_FAIL;
+ break;
+ }
goto error;
}
error:
health_code_update();
- return ret;
+ return status;
}
/*
health_code_update();
return ret;
}
+
+int consumer_clear_channel(struct consumer_socket *socket, uint64_t key,
+ struct consumer_output *output)
+{
+ int ret;
+ struct lttcomm_consumer_msg msg;
+
+ assert(socket);
+
+ DBG("Consumer clear channel %" PRIu64, key);
+
+ memset(&msg, 0, sizeof(msg));
+ msg.cmd_type = LTTNG_CONSUMER_CLEAR_CHANNEL;
+ msg.u.clear_channel.key = key;
+
+ if (output->type == CONSUMER_DST_NET) {
+ ERR("Relayd clear is not supported for now");
+ ret = -LTTNG_ERR_INVALID;
+ goto error;
+ }
+ health_code_update();
+
+ pthread_mutex_lock(socket->lock);
+ ret = consumer_send_msg(socket, &msg);
+ if (ret < 0) {
+ goto error_socket;
+ }
+
+error_socket:
+ pthread_mutex_unlock(socket->lock);
+
+error:
+ health_code_update();
+ return ret;
+}