* Sebastian Hammer, Adam Dickmeiss
*
* $Log: cfile.c,v $
- * Revision 1.1 1995-11-30 08:33:11 adam
+ * Revision 1.6 1995-12-11 09:03:53 adam
+ * New function: cf_unlink.
+ * New member of commit file head: state (0) deleted, (1) hash file.
+ *
+ * Revision 1.5 1995/12/08 16:21:14 adam
+ * Work on commit/update.
+ *
+ * Revision 1.4 1995/12/01 16:24:28 adam
+ * Commit files use separate meta file area.
+ *
+ * Revision 1.3 1995/12/01 11:37:22 adam
+ * Cached/commit files implemented as meta-files.
+ *
+ * Revision 1.2 1995/11/30 17:00:49 adam
+ * Several bug fixes. Commit system runs now.
+ *
+ * Revision 1.1 1995/11/30 08:33:11 adam
* Started work on commit facility.
*
*/
#include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <alexutil.h>
+#include <stdlib.h>
+#include <string.h>
+#include <alexutil.h>
#include <mfile.h>
#include "cfile.h"
-static int hash_write (CFile cf, const void *buf, size_t bytes)
+static int write_head (CFile cf)
{
- int r;
+ int left = cf->head.hash_size * sizeof(int);
+ int bno = 1;
+ const char *tab = (char*) cf->array;
- r = write (cf->hash_fd, buf, bytes);
- if (r == bytes)
- return bytes;
- if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "write in commit hash file");
- else
- logf (LOG_FATAL, "write in commit hash file. "
- "%d bytes instead of %d bytes", r, bytes);
- exit (1);
+ while (left >= HASH_BSIZE)
+ {
+ mf_write (cf->hash_mf, bno++, 0, 0, tab);
+ tab += HASH_BSIZE;
+ left -= HASH_BSIZE;
+ }
+ if (left > 0)
+ mf_write (cf->hash_mf, bno, 0, left, tab);
return 0;
}
-static int hash_read (CFile cf, void *buf, size_t bytes)
+static int read_head (CFile cf)
{
- int r;
+ int left = cf->head.hash_size * sizeof(int);
+ int bno = 1;
+ char *tab = (char*) cf->array;
- r = read (cf->hash_fd, buf, bytes);
- if (r == bytes)
- return bytes;
- if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read in commit hash file");
- else
- logf (LOG_FATAL, "read in commit hash file. "
- "%d bytes instead of %d bytes", r, bytes);
- abort ();
+ while (left >= HASH_BSIZE)
+ {
+ mf_read (cf->hash_mf, bno++, 0, 0, tab);
+ tab += HASH_BSIZE;
+ left -= HASH_BSIZE;
+ }
+ if (left > 0)
+ mf_read (cf->hash_mf, bno, 0, left, tab);
return 0;
}
-CFile cf_open (MFile mf, const char *cname, const char *fname,
+
+CFile cf_open (MFile mf, MFile_area area, const char *fname,
int block_size, int wflag, int *firstp)
{
char path[256];
- int r, i;
+ int i;
CFile cf = xmalloc (sizeof(*cf));
int hash_bytes;
- cf->mf = mf;
- sprintf (path, "%s.%s.b", cname, fname);
- if ((cf->block_fd =
- open (path, wflag ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
+ cf->rmf = mf;
+ sprintf (path, "%s.b", fname);
+ if (!(cf->block_mf = mf_open (area, path, block_size, wflag)))
{
logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", path);
exit (1);
}
- sprintf (path, "%s.%s.h", cname, fname);
- if ((cf->hash_fd =
- open (path, wflag ? O_RDWR|O_CREAT : O_RDONLY, 0666)) < 0)
+ sprintf (path, "%s.h", fname);
+ if (!(cf->hash_mf = mf_open (area, path, HASH_BSIZE, wflag)))
{
logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", path);
exit (1);
}
- r = read (cf->hash_fd, &cf->head, sizeof(cf->head));
- if (r != sizeof(cf->head))
+ assert (firstp);
+ if (!mf_read (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head) ||
+ !cf->head.state)
{
*firstp = 1;
- if (r == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read head of %s", path);
- exit (1);
- }
- if (r != 0)
- {
- logf (LOG_FATAL, "illegal head of %s", path);
- exit (1);
- }
+ cf->head.state = 1;
cf->head.block_size = block_size;
cf->head.hash_size = 401;
hash_bytes = cf->head.hash_size * sizeof(int);
(hash_bytes+sizeof(cf->head))/HASH_BSIZE + 2;
cf->head.next_block = 1;
if (wflag)
- hash_write (cf, &cf->head, sizeof(cf->head));
+ mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
cf->array = xmalloc (hash_bytes);
for (i = 0; i<cf->head.hash_size; i++)
cf->array[i] = 0;
if (wflag)
- hash_write (cf, cf->array, hash_bytes);
+ write_head (cf);
}
else
{
hash_bytes = cf->head.hash_size * sizeof(int);
assert (cf->head.next_bucket > 0);
cf->array = xmalloc (hash_bytes);
- hash_read (cf, cf->array, hash_bytes);
+ read_head (cf);
}
cf->parray = xmalloc (cf->head.hash_size * sizeof(*cf->parray));
for (i = 0; i<cf->head.hash_size; i++)
cf->parray[i] = NULL;
cf->bucket_lru_front = cf->bucket_lru_back = NULL;
cf->bucket_in_memory = 0;
- cf->max_bucket_in_memory = 200;
+ cf->max_bucket_in_memory = 400;
cf->dirty = 0;
cf->iobuf = xmalloc (cf->head.block_size);
+ memset (cf->iobuf, 0, cf->head.block_size);
return cf;
}
break;
if (p->dirty)
{
- if (lseek (cf->hash_fd, p->ph.this_bucket*HASH_BSIZE, SEEK_SET) < 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "lseek in flush_bucket");
- exit (1);
- }
- hash_write (cf, &p->ph, HASH_BSIZE);
+ mf_write (cf->hash_mf, p->ph.this_bucket, 0, 0, &p->ph);
cf->dirty = 1;
}
release_bucket (cf, p);
struct CFile_hash_bucket *p;
p = alloc_bucket (cf, block_no, hno);
-
- if (lseek (cf->hash_fd, block_no * HASH_BSIZE, SEEK_SET) < 0)
+ if (!mf_read (cf->hash_mf, block_no, 0, 0, &p->ph))
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek in get_bucket");
+ logf (LOG_FATAL|LOG_ERRNO, "read get_bucket");
exit (1);
}
- hash_read (cf, &p->ph, HASH_BSIZE);
assert (p->ph.this_bucket == block_no);
p->dirty = 0;
return p;
p = alloc_bucket (cf, *block_no, hno);
for (i = 0; i<HASH_BUCKET; i++)
+ {
p->ph.vno[i] = 0;
+ p->ph.no[i] = 0;
+ }
p->ph.next_bucket = 0;
p->ph.this_bucket = *block_no;
p->dirty = 1;
struct CFile_hash_bucket *hb;
int block_no, i;
- logf (LOG_LOG, "cf_lookup pass 1");
for (hb = cf->parray[hno]; hb; hb = hb->h_next)
{
- logf (LOG_LOG, "bucket_no=%d", hb->ph.this_bucket);
for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
if (hb->ph.no[i] == no)
return hb->ph.vno[i];
}
- logf (LOG_LOG, "cf_lookup pass 2");
for (block_no = cf->array[hno]; block_no; block_no = hb->ph.next_bucket)
{
- logf (LOG_LOG, "bucket_no=%d", block_no);
for (hb = cf->parray[hno]; hb; hb = hb->h_next)
+ {
if (hb->ph.this_bucket == block_no)
- continue;
+ break;
+ }
+ if (hb)
+ continue;
hb = get_bucket (cf, block_no, hno);
for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
if (hb->ph.no[i] == no)
{
bucketpp = &hb->ph.next_bucket;
hbprev = hb;
- continue;
+ break;
}
+ if (hb)
+ continue;
hb = get_bucket (cf, *bucketpp, hno);
assert (hb);
for (i = 0; i<HASH_BUCKET; i++)
int cf_read (CFile cf, int no, int offset, int num, void *buf)
{
- int block, r;
+ int block;
assert (cf);
- logf (LOG_LOG, "cf_read no=%d, offset=%d, num=%d", no, offset, num);
if (!(block = cf_lookup (cf, no)))
return -1;
- if (lseek (cf->block_fd, cf->head.block_size * block + offset,
- SEEK_SET) < 0)
+ if (!mf_read (cf->block_mf, block, offset, num, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read, lseek no=%d, block=%d",
- no, block);
- exit (1);
- }
- r = read (cf->block_fd, buf, num ? num : cf->head.block_size);
- if (r != cf->head.block_size)
- {
- logf (LOG_FATAL|LOG_ERRNO, "cf_read, read no=%d, block=%d",
- no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
exit (1);
}
return 1;
int cf_write (CFile cf, int no, int offset, int num, const void *buf)
{
- int block, r;
+ int block;
assert (cf);
-
- logf (LOG_LOG, "cf_write no=%d, offset=%d, num=%d", no, offset, num);
if (!(block = cf_lookup (cf, no)))
{
block = cf_new (cf, no);
if (offset || num)
{
- mf_read (cf->mf, no, 0, 0, cf->iobuf);
+ mf_read (cf->rmf, no, 0, 0, cf->iobuf);
memcpy (cf->iobuf + offset, buf, num);
buf = cf->iobuf;
offset = 0;
num = 0;
}
}
- if (lseek (cf->block_fd, cf->head.block_size * block + offset,
- SEEK_SET) < 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "cf_write, lseek no=%d, block=%d",
- no, block);
- exit (1);
- }
- r = write (cf->block_fd, buf, num ? num : cf->head.block_size);
- if (r != cf->head.block_size)
+ if (mf_write (cf->block_mf, block, offset, num, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write, read no=%d, block=%d",
- no, block);
+ logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
exit (1);
}
return 0;
flush_bucket (cf, -1);
if (cf->dirty)
{
- int hash_bytes = cf->head.hash_size * sizeof(int);
- if (lseek (cf->hash_fd, 0L, SEEK_SET) < 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "seek in hash fd");
- exit (1);
- }
- hash_write (cf, &cf->head, sizeof(cf->head));
- hash_write (cf, cf->array, hash_bytes);
- }
- if (close (cf->hash_fd) < 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "close hash fd");
- exit (1);
- }
- if (close (cf->block_fd) < 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "close block fd");
- exit (1);
+ mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
+ write_head (cf);
}
+ mf_close (cf->hash_mf);
+ mf_close (cf->block_mf);
xfree (cf->array);
xfree (cf->parray);
xfree (cf->iobuf);
projects / idzebra-moved-to-github.git / blobdiff