case ENOSYS:
WARN("Event type not implemented");
break;
+ case ENOENT:
+ WARN("Event %s not found!", ev->name);
+ break;
default:
PERROR("create event ioctl");
}
DBG("Tearing down kernel session");
/*
- * Destroy channels on the consumer if in no output mode because the
- * streams are in *no* monitor mode so we have to send a command to clean
- * them up or else they leaked.
+ * Destroy channels on the consumer if at least one FD has been sent and we
+ * are in no output mode because the streams are in *no* monitor mode so we
+ * have to send a command to clean them up or else they leaked.
*/
- if (!ksess->output_traces) {
+ if (!ksess->output_traces && ksess->consumer_fds_sent) {
int ret;
struct consumer_socket *socket;
struct lttng_ht_iter iter;
/*
* Take a snapshot for a given kernel session.
*
- * Return 0 on success or else a negative value.
+ * Return 0 on success or else return a LTTNG_ERR code.
*/
int kernel_snapshot_record(struct ltt_kernel_session *ksess,
struct snapshot_output *output, int wait, unsigned int nb_streams)
{
- int ret, saved_metadata_fd;
+ int err, ret, saved_metadata_fd;
struct consumer_socket *socket;
struct lttng_ht_iter iter;
struct ltt_kernel_metadata *saved_metadata;
socket, node.node) {
struct consumer_output *saved_output;
struct ltt_kernel_channel *chan;
- /* Code flow error */
- assert(socket->fd >= 0);
/*
* Temporarly switch consumer output for our snapshot output. As long
DBG3("Kernel snapshot record maximum stream size %" PRIu64
" is smaller than subbuffer size of %" PRIu64,
max_size_per_stream, chan->channel->attr.subbuf_size);
+ (void) kernel_consumer_destroy_metadata(socket,
+ ksess->metadata);
goto error_consumer;
}
pthread_mutex_unlock(socket->lock);
if (ret < 0) {
ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
+ (void) kernel_consumer_destroy_metadata(socket,
+ ksess->metadata);
goto error_consumer;
}
}
(void) kernel_consumer_destroy_metadata(socket, ksess->metadata);
}
+ ret = LTTNG_OK;
+
error_consumer:
/* Close newly opened metadata stream. It's now on the consumer side. */
- ret = close(ksess->metadata_stream_fd);
- if (ret < 0) {
+ err = close(ksess->metadata_stream_fd);
+ if (err < 0) {
PERROR("close snapshot kernel");
}