[Pspp-cvs] pspp ChangeLog Smake src/language/data-io/Chang...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 07/12/05 06:04:59

Modified files:
        .              : ChangeLog Smake 
        src/language/data-io: ChangeLog data-reader.c data-reader.h 

Log message:
        * src/language/data-io/data-reader.c (struct dfm_reader): New
        `file_size' member to support dfm_get_percent_read.
        (dfm_open_reader): Initialize file_size.
        (dfm_get_percent_read): New function.
        
        * Smake (GNULIB_MODULES): Add ftello module.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/ChangeLog?cvsroot=pspp&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-reader.c?cvsroot=pspp&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/data-reader.h?cvsroot=pspp&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- ChangeLog   6 Nov 2007 05:49:04 -0000       1.94
+++ ChangeLog   5 Dec 2007 06:04:59 -0000       1.95
@@ -1,3 +1,7 @@
+2007-12-04  Ben Pfaff  <address@hidden>
+
+       * Smake (GNULIB_MODULES): Add ftello module.
+
 2007-11-05  Ben Pfaff  <address@hidden>
 
        * configure.ac: No need for check for off_t or for the size of

Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- Smake       3 Nov 2007 22:00:03 -0000       1.65
+++ Smake       5 Dec 2007 06:04:59 -0000       1.66
@@ -18,6 +18,7 @@
        full-read \
        full-write \
         fseeko \
+        ftello \
        fwriteerror \
        gethostname \
        getline \

Index: src/language/data-io/ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- src/language/data-io/ChangeLog      9 Nov 2007 03:06:28 -0000       1.51
+++ src/language/data-io/ChangeLog      5 Dec 2007 06:04:59 -0000       1.52
@@ -1,3 +1,10 @@
+2007-12-04  Ben Pfaff  <address@hidden>
+
+       * src/language/data-io/data-reader.c (struct dfm_reader): New
+       `file_size' member to support dfm_get_percent_read.
+       (dfm_open_reader): Initialize file_size.
+       (dfm_get_percent_read): New function.
+
 2007-11-08  Ben Pfaff  <address@hidden>
 
        Patch #6256: add support for binary, 360 file formats.  Reviewed

Index: src/language/data-io/data-reader.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-reader.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/language/data-io/data-reader.c  9 Nov 2007 03:06:29 -0000       1.29
+++ src/language/data-io/data-reader.c  5 Dec 2007 06:04:59 -0000       1.30
@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 
 #include <data/casereader.h>
 #include <data/file-handle-def.h>
@@ -63,6 +64,7 @@
     struct string scratch;      /* Extra line buffer. */
     enum dfm_reader_flags flags; /* Zero or more of DFM_*. */
     FILE *file;                 /* Associated file. */
+    off_t file_size;            /* File size, or -1 if unavailable. */
     size_t pos;                 /* Offset in line of current character. */
     unsigned eof_cnt;           /* # of attempts to advance past EOF. */
     struct lexer *lexer;        /* The lexer reading the file */
@@ -137,6 +139,7 @@
   r->block_left = 0;
   if (fh_get_referent (fh) != FH_REF_INLINE)
     {
+      struct stat s;
       r->where.file_name = fh_get_file_name (fh);
       r->where.line_number = 0;
       r->file = fn_open (fh_get_file_name (fh),
@@ -150,7 +153,10 @@
           free (r);
           return NULL;
         }
+      r->file_size = fstat (fileno (r->file), &s) == 0 ? s.st_size : -1;
     }
+  else
+    r->file_size = -1;
   fh_lock_set_aux (lock, r);
 
   return r;
@@ -596,6 +602,27 @@
   return fh_get_legacy_encoding (reader->fh);
 }
 
+/* Returns a number between 0 and 100 that approximates the
+   percentage of the data in READER that has already been read,
+   or -1 if this value cannot be estimated.
+
+   ftello is slow in glibc (it flushes the read buffer), so don't
+   call this function unless you need to. */
+int
+dfm_get_percent_read (const struct dfm_reader *reader)
+{
+  if (reader->file_size >= 0)
+    {
+      off_t position = ftello (reader->file);
+      if (position >= 0)
+        {
+          double p = 100.0 * position / reader->file_size;
+          return p < 0 ? 0 : p > 100 ? 100 : p;
+        }
+    }
+  return -1;
+}
+
 /* Causes dfm_get_record() or dfm_get_whole_record() to read in
    the next record the next time it is executed on file
    HANDLE. */

Index: src/language/data-io/data-reader.h
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/data-io/data-reader.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/language/data-io/data-reader.h  9 Nov 2007 03:06:29 -0000       1.6
+++ src/language/data-io/data-reader.h  5 Dec 2007 06:04:59 -0000       1.7
@@ -40,6 +40,7 @@
 void dfm_expand_tabs (struct dfm_reader *);
 enum legacy_encoding dfm_reader_get_legacy_encoding (
   const struct dfm_reader *);
+int dfm_get_percent_read (const struct dfm_reader *);
 
 /* Line control. */
 void dfm_forward_record (struct dfm_reader *);