Changeset 28958

Timestamp:

Aug 18, 2010, 7:38:20 PM (16 years ago)

Author:

bills

Message:

Cache the images table in memory to save on I/O

Location:

trunk/Ohana/src/opihi

Files:

• dvo/ImageSelection.c (modified) (1 diff)
• dvo/LoadImages.c (modified) (3 diffs)
• dvo/gimages.c (modified) (1 diff)
• dvo/images.c (modified) (1 diff)
• dvo/imdense.c (modified) (1 diff)
• dvo/imextract.c (modified) (1 diff)
• include/dvoshell.h (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/ImageSelection.c

@@ -38 +38 @@
 /* free loaded images */
 void FreeImageSelection () {
-  if (image != NULL) free (image);
+  if (image != NULL) FreeImages(image);
   if (subset != NULL) free (subset);
   image = NULL;

trunk/Ohana/src/opihi/dvo/LoadImages.c

@@ -1 +1 @@
 # include "dvoshell.h"
+
+// XXX: Maybe make this a command line option
+int dvoUseImageCache = 1;
+
+static char *lastFilename = NULL;
+static time_t lastModified = 0;
+static Image *imageCache = NULL;
+static off_t cacheNimage = 0;
+
+static time_t getLastModified(char *filename);
 
 Image *LoadImages (off_t *Nimage) {
@@ -12 +22 @@
   catdir = GetCATDIR ();
   sprintf (filename, "%s/Images.dat", catdir);
+
+  if (lastFilename) {
+    if (dvoUseImageCache && !strcmp(lastFilename, filename)) {
+      // Make sure the file hasn't changed since we loaded it
+      if (getLastModified(filename) == lastModified) {
+        *Nimage = cacheNimage;
+        return  imageCache;
+      }
+    }
+    free(lastFilename);
+    lastFilename = NULL;
+    free(imageCache);
+    imageCache = NULL;
+    cacheNimage = 0;
+    lastModified = 0;
+  }
+
 
   gfits_db_init (&db);
@@ -38 +65 @@
 
   image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped);
+  if (dvoUseImageCache && image) {
+    cacheNimage = *Nimage;
+    imageCache = image;
+    lastFilename = strdup(filename);
+    lastModified = getLastModified(filename);
+  }
+
   return (image);
 }
+
+static time_t getLastModified(char *filename) {
+  struct stat statbuf;
+  if (!stat(filename, &statbuf)) {
+    return statbuf.st_mtime;
+  } else {
+    return 0;
+  }
+}
+
+void FreeImages(Image *images) {
+  if (!dvoUseImageCache && (images != NULL)) {
+    free(images);
+  } else {
+    // defer free until next LoadImages with a different or modified Images.dat
+  }
+}
+

trunk/Ohana/src/opihi/dvo/gimages.c

@@ -247 +247 @@
   set_int_variable ("IMAGEphotcode:n", Nfound);
 
-  free (image);
+  FreeImages (image);
   free (subset);
 

trunk/Ohana/src/opihi/dvo/images.c

@@ -319 +319 @@
   free (Xvec.elements.Flt);
   free (Yvec.elements.Flt);
-  free (image);
+  FreeImages (image);
   return (TRUE);
 

trunk/Ohana/src/opihi/dvo/imdense.c

@@ -70 +70 @@
   free (Xvec.elements.Flt);
   free (Yvec.elements.Flt);
-  free (image);
+  FreeImages (image);
   return (TRUE);
 

trunk/Ohana/src/opihi/dvo/imextract.c

@@ -137 +137 @@
 
   // free (subset);
-  free (image);
+  FreeImages (image);
 
   if (vec) free (vec);

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -302 +302 @@
 int           InitPhotcodes         PROTO((void));
 Image        *LoadImages            PROTO((off_t *Nimage));
+void          FreeImages            PROTO((Image *images));
 Image        *MatchImage            PROTO((unsigned int time, short int source, unsigned int imageID));
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));