Changeset 506Tweet

Timestamp:

Apr 18, 2011, 3:37:17 PM (12 years ago)

Author:

Sam Hocevar

Message:

cache: get rid of more Lisp cache code.

Location:

abuse/trunk/src

Files:

• cache.cpp (modified) (4 diffs)
• cache.h (modified) (2 diffs)

abuse/trunk/src/cache.cpp

@@ -33 +33 @@
 #include "specache.h"
 #include "netface.h"
-
-char lfname[100]="";          // name of compiled lisp code cache file
 
 #define touch(x) { (x)->last_access=last_access++; \
@@ -666 +664 @@
 }
 
-static void cache_cleanup2()
-{ unlink(lfname);
-}
-
-static void cache_cleanup(int ret, void *arg)
-{ unlink(lfname);
-}
-
-void CacheList::create_lcache()
-{
-#ifdef WIN32
-    char *prefix="c:\\";
-#else
-    char const *prefix = "/tmp/";     // for UNIX store lisp cache in tmp dir
-    int flags = O_CREAT | O_RDWR;
-#endif
-
-    int cfail = 1, num = 0;
-    do
-    {
-        sprintf(lfname,"%slcache%02d.tmp",prefix,num);
-
-#if defined( __APPLE__ )
-        unlink(lfname);
-        FILE *fp=fopen(lfname,"wb");
-        if (fp)
-        {
-            fclose(fp);
-            cfail=0;
-        }
-#else
-        int fd=open(lfname,flags,S_IRWXU | S_IRWXG | S_IRWXO);     // can we get exclusive rights to this file?
-        if (fd<0) close(fd); else cfail=0;
-#endif
-
-        if (cfail)
-            num++;
-
-    } while (cfail && num<15);
-
-    if (cfail)
-    {
-        fprintf(stderr,"Error : Unable to open cache file for compiled code.\n"
-            "        Please delete all files named lcacheXX.tmp\n"
-            "        and make sure you have write permission to\n"
-            "        directory (%s)\n",prefix);
-        exit(0);
-    }
-    else
-    {
-        exit_proc(cache_cleanup,cache_cleanup2);    // make sure this file gets deleted on exit..
-    }
-    lcache_number=-1;
-}
-
 CacheList::CacheList()
 {
-  // start out with a decent sized cache buffer because it's going to get allocated anyway.
-  total=0;
-  list=NULL;
-  last_registered=-1;
-  cache_file=fp=NULL;
-  last_access=1;
-  used=ful=0;
-  last_dir=NULL;
-  last_file=-1;
-  prof_data=NULL;
-  cache_read_file=NULL;
-  create_lcache();
+    // Start out with a decent sized cache buffer because it's going to
+    // get allocated anyway.
+    total = 0;
+    list = NULL;
+    last_registered = -1;
+    fp = NULL;
+    last_access = 1;
+    used = ful = 0;
+    last_dir = NULL;
+    last_file = -1;
+    prof_data = NULL;
 }
 
@@ -751 +693 @@
   if (fp) delete fp;
   if (last_dir) delete last_dir;
-  if (cache_file)
-  {
-    delete cache_file;
-    cache_file=NULL;
-  }
-  unlink(lfname);
 
   if (prof_data)
@@ -767 +703 @@
   list=NULL;
   last_registered=-1;
-  cache_file=fp=NULL;
-  if (cache_read_file)
-  {
-    delete cache_read_file;
-    cache_read_file=NULL;
-  }
+  fp=NULL;
 
   last_access=1;

abuse/trunk/src/cache.h

@@ -84 +84 @@
     int16_t last_file; // for speed leave the last file accessed open
 
-    bFILE *fp,*cache_file,*cache_read_file;
+    bFILE *fp;
     spec_directory *last_dir;
     int32_t last_offset; // store the last offset so we don't have to seek if
                          // we don't need to
-
-    int16_t lcache_number;
 
     int AllocId();
@@ -105 +103 @@
     ~CacheList();
 
-    void create_lcache();
     void free_oldest();
     int in_use() { if (used) { used = 0; return 1; } else return 0; }