X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Freadbuffer.c;h=e48e78c6ff9fd2819e4747ddd6565ec9c269e9b8;hp=f389a77c3fce8bf6319bc4a2c6698dfe28e68dc9;hb=35eebe42ba3cd77674422cebf674e316d5a258b1;hpb=460e29f1c9232dafbdc161bf67d3e956d23eeb6b

diff --git a/backup/readbuffer.c b/backup/readbuffer.c
index f389a77..e48e78c 100644
--- a/backup/readbuffer.c
+++ b/backup/readbuffer.c
@@ -29,96 +29,63 @@
 
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 
-#ifndef RWBUFFER_SIZE_MB
-#define RWBUFFER_SIZE_MB 16
-#endif
+#include "rwbuffer.h"
 
-#define BUFFER (RWBUFFER_SIZE_MB*1024*1024)
-#define WAITEMPTY ((BUFFER*1)/4)
+const char *progname= "readbuffer";
 
-static inline int min(int a, int b) { return a<=b ? a : b; }
-
-static void nonblock(int fd) {
-  int r;
-  r= fcntl(fd,F_GETFL,0); if (r == -1) { perror("fcntl getfl"); exit(1); }
-  r |= O_NDELAY;
-  if (fcntl(fd,F_SETFL,r) == -1) { perror("fcntl setfl"); exit(1); }
-}
+static size_t waitempty;
 
 int main(int argc, const char *const *argv) {
-  static unsigned char buf[BUFFER];
-  
-  unsigned char *wp, *rp;
-  int used,r,reading,seeneof;
-  fd_set readfds;
-  fd_set writefds;
-
-  used=0; wp=rp=buf; reading=1; seeneof=0;
-  nonblock(0); nonblock(1);
-
-  if (argv[1] && !strcmp(argv[1],"--mlock")) {
-    if (mlock(buf,sizeof(buf))) { perror("mlock"); exit(1); }
-    argv++; argc--;
-  }
-  if (argv[1]) { fputs("usage: readbuffer [--mlock]\n",stderr); exit(1); }
+  int r,reading;
 
+  startup(argv);
+  waitempty= (buffersize*1)/4;
+  reading=1;
+  
   while (!seeneof || used) {
+    
     FD_ZERO(&readfds);
     if (reading) {
-      if (used<BUFFER-1) {
+      if (used<buffersize-1) {
 	FD_SET(0,&readfds);
       } else {
-/*fprintf(stderr,"\t buffers full - stopping\n");*/
 	reading=0;
       }
     }
     FD_ZERO(&writefds); if (used) FD_SET(1,&writefds);
-/*fprintf(stderr,"used %6d reading %d seeneof %d wp %8lx rp %8lx read %d write %d\n",
-        used,reading,seeneof,(unsigned long)(wp-buf),(unsigned long)(rp-buf),
-        FD_ISSET(0,&readfds),FD_ISSET(1,&writefds));*/
-    r= select(2,&readfds,&writefds,0,0);
-/*fprintf(stderr,"\t readable %d writeable %d\n",
-        FD_ISSET(0,&readfds),FD_ISSET(1,&writefds));*/
-    if (r == -1) {
-      if (errno == EINTR) continue;
-      perror("select"); exit(1);
-    }
+
+    callselect();
+
     if (FD_ISSET(0,&readfds)) {
-      r= read(0,rp,min(BUFFER-1-used,buf+BUFFER-rp));
+      r= read(0,rp,min(buffersize-1-used,buf+buffersize-rp));
       if (!r) {
-/*fprintf(stderr,"\t eof detected\n");*/
         seeneof=1; reading=0;
       } else if (r<0) {
         if (!(errno == EAGAIN || errno == EINTR)) { perror("read"); exit(1); }
-/*fprintf(stderr,"\t read transient error\n");*/
       } else {
-/*fprintf(stderr,"\t read %d\n",r);*/
         used+= r;
         rp+= r;
-        if (rp == buf+BUFFER) rp=buf;
+        if (rp == buf+buffersize) rp=buf;
       }
     }
+
     if (FD_ISSET(1,&writefds)) {
       assert(used);
-      r= write(1,wp,min(used,buf+BUFFER-wp));
+      r= write(1,wp,min(used,buf+buffersize-wp));
       if (r<=0) {
         if (!(errno == EAGAIN || errno == EINTR)) { perror("write"); exit(1); }
-/*fprintf(stderr,"\t write transient error\n");*/
       } else {
-/*fprintf(stderr,"\t wrote %d\n",r);*/
         used-= r;
         wp+= r;
-        if (wp == buf+BUFFER) wp=buf;
+        if (wp == buf+buffersize) wp=buf;
       }
-      if (used < WAITEMPTY && !seeneof) {
-/*fprintf(stderr,"\t starting writes\n");*/
+      if (used < waitempty && !seeneof) {
 	reading=1;
       }
     }