X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttd%2Flttd.c;h=3a2fdd3f5bec004318a651d2941d3c91f490ac67;hb=db9d75c08a1d635cac6520252ce86047f815c98b;hp=01f1dd6dc262a7f5e9bdb6a6200ffefa0699a846;hpb=3986d00b34273f065773f0de6345aec5af7a2451;p=lttv.git

diff --git a/ltt/branches/poly/lttd/lttd.c b/ltt/branches/poly/lttd/lttd.c
index 01f1dd6d..3a2fdd3f 100644
--- a/ltt/branches/poly/lttd/lttd.c
+++ b/ltt/branches/poly/lttd/lttd.c
@@ -35,7 +35,7 @@
 /* Get the next sub buffer that can be read. */
 #define RELAYFS_GET_SUBBUF        _IOR(0xF4, 0x00,__u32)
 /* Release the oldest reserved (by "get") sub buffer. */
-#define RELAYFS_PUT_SUBBUF        _IO(0xF4, 0x01)
+#define RELAYFS_PUT_SUBBUF        _IOW(0xF4, 0x01,__u32)
 /* returns the number of sub buffers in the per cpu channel. */
 #define RELAYFS_GET_N_SUBBUFS     _IOR(0xF4, 0x02,__u32)
 /* returns the size of the sub buffers. */
@@ -67,7 +67,6 @@ static char *trace_name = NULL;
 static char *channel_name = NULL;
 static int	daemon_mode = 0;
 static int	append_mode = 0;
-static int	sig_parent = 0;
 volatile static int	quit_program = 0;	/* For signal handler */
 
 /* Args :
@@ -76,7 +75,7 @@ volatile static int	quit_program = 0;	/* For signal handler */
  * -c directory		Root directory of the relayfs trace channels.
  * -d          		Run in background (daemon).
  * -a							Trace append mode.
- * -s							Send SIGIO to parent when ready for IO.
+ * -s							Send SIGUSR1 to parent when ready for IO.
  */
 void show_arguments(void)
 {
@@ -87,7 +86,6 @@ void show_arguments(void)
 	printf("-c directory  Root directory of the relayfs trace channels.\n");
 	printf("-d            Run in background (daemon).\n");
 	printf("-a            Append to an possibly existing trace.\n");
-	printf("-s            Send SIGIO to parent when ready for IO.\n");
 	printf("\n");
 }
 
@@ -133,9 +131,6 @@ int parse_arguments(int argc, char **argv)
 					case 'a':
 						append_mode = 1;
 						break;
-					case 's':
-						sig_parent = 1;
-						break;
 					default:
 						printf("Invalid argument '%s'.\n", argv[argn]);
 						printf("\n");
@@ -302,13 +297,13 @@ end:
 
 int read_subbuffer(struct fd_pair *pair)
 {
-	unsigned int	subbuf_index;
+	unsigned int	consumed_old;
 	int err, ret;
 
 
 	err = ioctl(pair->channel, RELAYFS_GET_SUBBUF, 
-								&subbuf_index);
-	printf("index : %u\n", subbuf_index);
+								&consumed_old);
+	printf("cookie : %u\n", consumed_old);
 	if(err != 0) {
 		perror("Error in reserving sub buffer");
 		ret = -EPERM;
@@ -316,7 +311,7 @@ int read_subbuffer(struct fd_pair *pair)
 	}
 	
 	err = TEMP_FAILURE_RETRY(write(pair->trace,
-				pair->mmap + (subbuf_index * pair->subbuf_size),
+				pair->mmap + (consumed_old & (~(pair->subbuf_size-1))),
 				pair->subbuf_size));
 
 	if(err < 0) {
@@ -327,10 +322,16 @@ int read_subbuffer(struct fd_pair *pair)
 
 
 write_error:
-	err = ioctl(pair->channel, RELAYFS_PUT_SUBBUF);
+	err = ioctl(pair->channel, RELAYFS_PUT_SUBBUF, &consumed_old);
 	if(err != 0) {
-		perror("Error in unreserving sub buffer");
-		ret = -EPERM;
+		if(errno == -EFAULT) {
+			perror("Error in unreserving sub buffer");
+			ret = -EFAULT;
+		} 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. */
+			ret = -EIO;
+		}
 		goto get_error;
 	}
 
@@ -410,9 +411,6 @@ int read_channels(struct channel_trace_fd *fd_pairs)
 		pollfd[i].events = POLLIN|POLLPRI;
 	}
 
-	/* Signal the parent that ready for IO */
-	if(sig_parent) kill(getppid(), SIGIO);
-
 	while(1) {
 		high_prio = 0;
 		num_hup = 0; 
@@ -513,7 +511,6 @@ void close_channel_trace_pairs(struct channel_trace_fd *fd_pairs)
 int main(int argc, char ** argv)
 {
 	int ret;
-	pid_t pid;
 	struct channel_trace_fd fd_pairs = { NULL, 0 };
 	struct sigaction act;
 	
@@ -526,18 +523,13 @@ int main(int argc, char ** argv)
 	show_info();
 
 	if(daemon_mode) {
-		pid = fork();
-		
-		if(pid > 0) {
-			/* parent */
-			return 0;
-		} else if(pid < 0) {
-			/* error */
-			printf("An error occured while forking.\n");
-			return -1;
-		}
-		/* else, we are the child, continue... */
-	}
+		ret = daemon(0, 0);
+    
+    if(ret == -1) {
+      perror("An error occured while daemonizing.");
+      exit(-1);
+    }
+  }
 
 	/* Connect the signal handlers */
 	act.sa_handler = handler;