*
* CPU hot-plugging is supported using inotify.
*
- * Copyright 2005 -
- * Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
+ * Copyright 2009-2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
#include <asm/types.h>
/* Get the next sub buffer that can be read. */
-#define RELAY_GET_SUBBUF _IOR(0xF5, 0x00,__u32)
+#define RELAY_GET_SB _IOR(0xF5, 0x00,__u32)
/* Release the oldest reserved (by "get") sub buffer. */
-#define RELAY_PUT_SUBBUF _IOW(0xF5, 0x01,__u32)
+#define RELAY_PUT_SB _IOW(0xF5, 0x01,__u32)
/* returns the number of sub buffers in the per cpu channel. */
-#define RELAY_GET_N_SUBBUFS _IOR(0xF5, 0x02,__u32)
-/* returns the size of the sub buffers. */
-#define RELAY_GET_SUBBUF_SIZE _IOR(0xF5, 0x03,__u32)
+#define RELAY_GET_N_SB _IOR(0xF5, 0x02,__u32)
+/* returns the size of the current sub buffer. */
+#define RELAY_GET_SB_SIZE _IOR(0xF5, 0x03, __u32)
+/* returns the size of data to consume in the current sub-buffer. */
+#define RELAY_GET_MAX_SB_SIZE _IOR(0xF5, 0x04, __u32)
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
#include <sys/inotify.h>
#undef HAS_INOTIFY
#endif
-enum {
- GET_SUBBUF,
- PUT_SUBBUF,
- GET_N_BUBBUFS,
- GET_SUBBUF_SIZE
-};
-
struct fd_pair {
int channel;
int trace;
- unsigned int n_subbufs;
- unsigned int subbuf_size;
+ unsigned int n_sb;
+ unsigned int max_sb_size;
void *mmap;
pthread_mutex_t mutex;
};
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
+ goto end;
}
ret = lseek(fd_pairs->pair[fd_pairs->num_pairs-1].trace,
0, SEEK_END);
if (ret < 0) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].trace);
+ fd_pairs->num_pairs--;
+ goto end;
}
} else {
printf("File %s exists, cannot open. Try append mode.\n", path_trace);
open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
goto end;
}
} else {
S_IRWXU|S_IRWXG|S_IRWXO);
if(fd_pairs->pair[fd_pairs->num_pairs-1].trace == -1) {
perror(path_trace);
+ open_ret = -1;
+ close(fd_pairs->pair[fd_pairs->num_pairs-1].channel);
+ fd_pairs->num_pairs--;
+ goto end;
}
}
}
int read_subbuffer(struct fd_pair *pair)
{
- unsigned int consumed_old;
+ unsigned int consumed_old, len;
int err;
long ret;
- unsigned long len;
off_t offset;
- err = ioctl(pair->channel, RELAY_GET_SUBBUF, &consumed_old);
+ err = ioctl(pair->channel, RELAY_GET_SB, &consumed_old);
printf_verbose("cookie : %u\n", consumed_old);
if(err != 0) {
ret = errno;
goto write_error;
}
#endif //0
- len = pair->subbuf_size;
+ err = ioctl(pair->channel, RELAY_GET_SB_SIZE, &len);
+ if(err != 0) {
+ ret = errno;
+ perror("Getting sub-buffer len failed.");
+ goto get_error;
+ }
+
offset = 0;
while (len > 0) {
printf_verbose("splice chan to pipe offset %lu\n",
#endif //0
write_error:
ret = 0;
- err = ioctl(pair->channel, RELAY_PUT_SUBBUF, &consumed_old);
+ err = ioctl(pair->channel, RELAY_PUT_SB, &consumed_old);
if(err != 0) {
ret = errno;
if(errno == EFAULT) {
perror("Error in unreserving sub buffer\n");
} else if(errno == EIO) {
- perror("Reader has been pushed by the writer, last subbuffer corrupted.");
- /* FIXME : we may delete the last written buffer if we wish. */
+ /* Should never happen with newer LTTng versions */
+ perror("Reader has been pushed by the writer, last sub-buffer corrupted.");
}
goto get_error;
}
for(i=idx_begin;i<idx_end;i++) {
struct fd_pair *pair = &fd_pairs->pair[i];
- ret = ioctl(pair->channel, RELAY_GET_N_SUBBUFS,
- &pair->n_subbufs);
+ ret = ioctl(pair->channel, RELAY_GET_N_SB, &pair->n_sb);
if(ret != 0) {
- perror("Error in getting the number of subbuffers");
+ perror("Error in getting the number of sub-buffers");
goto end;
}
- ret = ioctl(pair->channel, RELAY_GET_SUBBUF_SIZE,
- &pair->subbuf_size);
+ ret = ioctl(pair->channel, RELAY_GET_MAX_SB_SIZE,
+ &pair->max_sb_size);
if(ret != 0) {
- perror("Error in getting the size of the subbuffers");
+ perror("Error in getting the max sub-buffer size");
goto end;
}
ret = pthread_mutex_init(&pair->mutex, NULL); /* Fast mutex */
pollfd[i].fd);
/* Take care of high priority channels first. */
high_prio = 1;
- /* it's ok to have an unavailable subbuffer */
+ /* it's ok to have an unavailable sub-buffer */
ret = read_subbuffer(&fd_pairs->pair[i-inotify_fds]);
if(ret == EAGAIN) ret = 0;
projects / ltt-control.git / blobdiff