Use the mmapped fileobj in more places and use slice access

diff --git a/debug-viewer/GstDebugViewer/Data.py b/debug-viewer/GstDebugViewer/Data.py
index 011e394..8e36451 100644 (file)
--- a/debug-viewer/GstDebugViewer/Data.py
+++ b/debug-viewer/GstDebugViewer/Data.py
@@ -171,9 +171,7 @@ class LineCache (Producer):
         self.logger = logging.getLogger ("linecache")
         self.dispatcher = dispatcher
 
-        import mmap
-        self.__fileobj = mmap.mmap (fileobj.fileno (), 0, prot = mmap.PROT_READ)
-
+        self.__fileobj = fileobj
         self.__fileobj.seek (0, 2)
         self.__file_size = self.__fileobj.tell ()
         self.__fileobj.seek (0)
@@ -342,12 +340,15 @@ class LogFile (Producer):
 
     def __init__ (self, filename, dispatcher):
 
+        import mmap
+
         Producer.__init__ (self)
 
         self.logger = logging.getLogger ("logfile")
 
         self.path = os.path.normpath (os.path.abspath (filename))
-        self.fileobj = file (filename, "rb")
+        self.__real_fileobj = file (filename, "rb")
+        self.fileobj = mmap.mmap (self.__real_fileobj.fileno (), 0, prot = mmap.PROT_READ)
         self.line_cache = LineCache (self.fileobj, dispatcher)
         self.line_cache.consumers.append (self)
 

diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py
index b7c5adf..88fd32c 100755 (executable)
--- a/debug-viewer/GstDebugViewer/GUI.py
+++ b/debug-viewer/GstDebugViewer/GUI.py
@@ -208,7 +208,7 @@ class LogModelBase (gtk.GenericTreeModel):
     def iter_rows_offset (self):
 
         for i, offset in enumerate (self.line_offsets):
-            self.ensure_cached (offset)
+            self.ensure_cached (i)
             row = self.line_cache[offset]
             row[self.COL_LEVEL] = self.line_levels[i] # FIXME
             yield (row, offset,)
@@ -260,7 +260,7 @@ class LogModelBase (gtk.GenericTreeModel):
             return self.line_levels[line_index]
 
         line_offset = self.line_offsets[line_index]
-        self.ensure_cached (line_offset)
+        self.ensure_cached (line_index)
 
         value = self.line_cache[line_offset][col_id]
         if col_id == self.COL_MESSAGE:
@@ -335,10 +335,13 @@ class LazyLogModel (LogModelBase):
 
     def access_offset (self, offset):
 
+        # TODO: Implement using one slice access instead of seek+readline.
         self.__fileobj.seek (offset)
         return self.__fileobj.readline ()
 
-    def ensure_cached (self, line_offset):
+    def ensure_cached (self, line_index):
+
+        line_offset = self.line_offsets[line_index]
 
         if line_offset in self.line_cache:
             return
@@ -346,18 +349,12 @@ class LazyLogModel (LogModelBase):
         if len (self.line_cache) > 10000:
             self.line_cache.clear ()
 
-        if line_offset == 0:
-            self.__fileobj.seek (0)
+        if line_index == len (self.line_offsets) - 1:
+            self.__fileobj.seek (line_offset)
             line = self.__fileobj.readline ()
         else:
-            # Seek a bit further backwards to verify that offset (still) points
-            # to the beginning of a line:
-            self.__fileobj.seek (line_offset - len (os.linesep))
-            line_start = (self.__fileobj.readline () == os.linesep)
-            if not line_start:
-                # FIXME: We should re-read the file instead!
-                raise ValueError ("file changed!")
-            line = self.__fileobj.readline ()
+            next_offset = self.line_offsets[line_index + 1]
+            line = self.__fileobj[line_offset:next_offset]
 
         self.line_cache[line_offset] = Data.LogLine.parse_full (line)