* Sebastian Hammer, Adam Dickmeiss
*
* $Log: bfile.c,v $
- * Revision 1.19 1996-02-05 12:28:58 adam
+ * Revision 1.20 1996-03-26 15:59:04 adam
+ * The directory of the shadow table file can be specified by the new
+ * bf_lockDir call.
+ *
+ * Revision 1.19 1996/02/05 12:28:58 adam
* Removed a LOG_LOG message.
*
* Revision 1.18 1996/01/02 08:59:06 quinn
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <unistd.h>
#include "cfile.h"
static MFile_area commit_area = NULL;
+static char *commit_lockDir = NULL;
+
+static FILE *open_cache (const char *flags)
+{
+ char cacheFilename[1024];
+ FILE *file;
+
+ sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : "");
+ file = fopen (cacheFilename, flags);
+ return file;
+}
+
+static void unlink_cache (void)
+{
+ char cacheFilename[1024];
+
+ sprintf (cacheFilename, "%scache", commit_lockDir ? commit_lockDir : "");
+ unlink (cacheFilename);
+}
+
+void bf_lockDir (const char *lockDir)
+{
+ size_t len;
+
+ xfree (commit_lockDir);
+
+ if (lockDir == NULL)
+ lockDir = "";
+ len = strlen(lockDir);
+ commit_lockDir = xmalloc (len+2);
+ strcpy (commit_lockDir, lockDir);
+
+ if (len > 0 && commit_lockDir[len-1] != '/')
+ strcpy (commit_lockDir + len, "/");
+}
void bf_cache (int enableFlag)
{
{
if (!commit_area)
if (res_get (common_resource, "shadow"))
+ {
commit_area = mf_init ("shadow");
+ }
else
{
logf (LOG_FATAL, "Shadow area must be defined if commit"
if (commit_area)
{
- FILE *outf;
int first_time;
tmp->mf = mf_open (0, name, block_size, 0);
wflag, &first_time);
if (first_time)
{
- outf = fopen ("cache", "a");
+ FILE *outf;
+
+ outf = open_cache ("a");
+ if (!outf)
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "open %scache",
+ commit_lockDir ? commit_lockDir : "");
+ exit (1);
+ }
fprintf (outf, "%s %d\n", name, block_size);
fclose (outf);
}
{
FILE *inf;
- inf = fopen ("cache", "r");
+ inf = open_cache ("r");
if (inf)
{
fclose (inf);
int first_time;
assert (commit_area);
- if (!(inf = fopen ("cache", "r")))
+ if (!(inf = open_cache ("r")))
{
logf (LOG_LOG, "No commit file");
return ;
mustDisable = 1;
}
- if (!(inf = fopen ("cache", "r")))
+ if (!(inf = open_cache ("r")))
return ;
while (fscanf (inf, "%s %d", path, &block_size) == 2)
{
mf_close (mf);
}
fclose (inf);
- unlink ("cache");
+ unlink_cache ();
if (mustDisable)
bf_cache (0);
}
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: cfile.c,v $
- * Revision 1.10 1996-02-07 14:03:46 adam
+ * Revision 1.11 1996-03-26 15:59:05 adam
+ * The directory of the shadow table file can be specified by the new
+ * bf_lockDir call.
+ *
+ * Revision 1.10 1996/02/07 14:03:46 adam
* Work on flat indexed shadow files.
*
* Revision 1.9 1996/02/07 10:08:43 adam
struct CFile_hash_bucket *p;
int i, j;
- logf (LOG_LOG, "Moving to flat shadow.");
+ logf (LOG_LOG, "Moving to flat shadow: %s", cf->rmf->name);
logf (LOG_LOG, "hits=%d miss=%d bucket_in_memory=%d total=%d",
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);