-/*
- * Copyright (C) 1995-2000, Index Data ApS
- * All rights reserved.
- *
- * $Log: cfile.c,v $
- * Revision 1.26 2000-03-20 19:08:35 adam
- * Added remote record import using Z39.50 extended services and Segment
- * Requests.
- *
- * Revision 1.25 1999/05/26 07:49:12 adam
- * C++ compilation.
- *
- * Revision 1.24 1999/05/12 13:08:06 adam
- * First version of ISAMS.
- *
- * Revision 1.23 1998/10/15 13:09:29 adam
- * Minor changes.
- *
- * Revision 1.22 1998/10/13 20:07:22 adam
- * Changed some log messages.
- *
- * Revision 1.21 1998/08/24 17:29:52 adam
- * Minor changes.
- *
- * Revision 1.20 1998/08/07 15:07:13 adam
- * Fixed but in cf_commit_flat.
- *
- * Revision 1.19 1997/02/12 20:37:17 adam
- * Changed the messages logged. No real code changed.
- *
- * Revision 1.18 1996/10/29 13:56:15 adam
- * Include of zebrautl.h instead of alexutil.h.
- *
- * Revision 1.17 1996/04/19 16:49:00 adam
- * Minor changes.
- *
- * Revision 1.16 1996/04/19 16:23:47 adam
- * Serious bug fix in shadow implementation; function new_bucket might
- * set wrong bucket number on new bucket.
- *
- * Revision 1.15 1996/04/18 16:02:56 adam
- * Changed logging a bit.
- * Removed warning message when commiting flat shadow files.
- *
- * Revision 1.14 1996/04/12 07:01:55 adam
- * Yet another bug fix (next_block was initialized to 0; now set to 1).
- *
- * Revision 1.13 1996/04/09 14:48:49 adam
- * Bug fix: offset calculation when using flat files was completely broken.
- *
- * Revision 1.12 1996/04/09 06:47:28 adam
- * Function scan_areadef doesn't use sscanf (%n fails on this Linux).
- *
- * 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
- * Work on flat shadow (not finished yet).
- *
- * Revision 1.8 1995/12/15 12:36:52 adam
- * Moved hash file information to union.
- * Renamed commit files.
- *
- * Revision 1.7 1995/12/15 10:35:07 adam
- * Changed names of commit files.
- *
- * 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.
- *
- */
+/* $Id: cfile.c,v 1.32 2004-12-08 12:23:08 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+ Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <zebrautl.h>
-#include <mfile.h>
+#include "mfile.h"
#include "cfile.h"
static int write_head (CFile cf)
{
- int left = cf->head.hash_size * sizeof(int);
+ int left = cf->head.hash_size * sizeof(zint);
int bno = 1;
const char *tab = (char*) cf->array;
static int read_head (CFile cf)
{
- int left = cf->head.hash_size * sizeof(int);
+ int left = cf->head.hash_size * sizeof(zint);
int bno = 1;
char *tab = (char*) cf->array;
int hash_bytes;
cf->rmf = mf;
- logf (LOG_DEBUG, "cf: open %s %s", cf->rmf->name, wflag ? "rdwr" : "rd");
+ yaz_log (YLOG_DEBUG, "cf: open %s %s", cf->rmf->name, wflag ? "rdwr" : "rd");
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);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "Failed to open %s", path);
exit (1);
}
sprintf (path, "%s-i", fname);
if (!(cf->hash_mf = mf_open (area, path, HASH_BSIZE, wflag)))
{
- logf (LOG_FATAL|LOG_ERRNO, "Failed to open %s", path);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "Failed to open %s", path);
exit (1);
}
assert (firstp);
cf->head.state = 1;
cf->head.block_size = block_size;
cf->head.hash_size = 199;
- hash_bytes = cf->head.hash_size * sizeof(int);
+ hash_bytes = cf->head.hash_size * sizeof(zint);
cf->head.flat_bucket = cf->head.next_bucket = cf->head.first_bucket =
(hash_bytes+sizeof(cf->head))/HASH_BSIZE + 2;
cf->head.next_block = 1;
if (wflag)
mf_write (cf->hash_mf, 0, 0, sizeof(cf->head), &cf->head);
- cf->array = (int *) xmalloc (hash_bytes);
+ cf->array = (zint *) xmalloc (hash_bytes);
for (i = 0; i<cf->head.hash_size; i++)
cf->array[i] = 0;
if (wflag)
*firstp = 0;
assert (cf->head.block_size == block_size);
assert (cf->head.hash_size > 2);
- hash_bytes = cf->head.hash_size * sizeof(int);
+ hash_bytes = cf->head.hash_size * sizeof(zint);
assert (cf->head.next_bucket > 0);
assert (cf->head.next_block > 0);
if (cf->head.state == 1)
- cf->array = (int *) xmalloc (hash_bytes);
+ cf->array = (zint *) xmalloc (hash_bytes);
else
cf->array = NULL;
read_head (cf);
return cf;
}
-static int cf_hash (CFile cf, int no)
+static int cf_hash (CFile cf, zint no)
{
- return (no>>3) % cf->head.hash_size;
+ return (int) (((no >> 3) % cf->head.hash_size));
}
static void release_bucket (CFile cf, struct CFile_hash_bucket *p)
}
}
-static struct CFile_hash_bucket *alloc_bucket (CFile cf, int block_no, int hno)
+static struct CFile_hash_bucket *alloc_bucket (CFile cf, zint block_no, int hno)
{
struct CFile_hash_bucket *p, **pp;
return p;
}
-static struct CFile_hash_bucket *get_bucket (CFile cf, int block_no, int hno)
+static struct CFile_hash_bucket *get_bucket (CFile cf, zint block_no, int hno)
{
struct CFile_hash_bucket *p;
p = alloc_bucket (cf, block_no, hno);
if (!mf_read (cf->hash_mf, block_no, 0, 0, &p->ph))
{
- logf (LOG_FATAL|LOG_ERRNO, "read get_bucket");
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "read get_bucket");
exit (1);
}
assert (p->ph.this_bucket == block_no);
return p;
}
-static struct CFile_hash_bucket *new_bucket (CFile cf, int *block_nop, int hno)
+static struct CFile_hash_bucket *new_bucket (CFile cf, zint *block_nop, int hno)
{
struct CFile_hash_bucket *p;
- int i, block_no;
+ int i;
+ zint block_no;
block_no = *block_nop = cf->head.next_bucket++;
p = alloc_bucket (cf, block_no, hno);
return p;
}
-static int cf_lookup_flat (CFile cf, int no)
+static zint cf_lookup_flat (CFile cf, zint no)
{
- int hno = (no*sizeof(int))/HASH_BSIZE;
- int off = (no*sizeof(int)) - hno*HASH_BSIZE;
- int vno = 0;
+ zint hno = (no*sizeof(zint))/HASH_BSIZE;
+ int off = (int) ((no*sizeof(zint)) - hno*HASH_BSIZE);
+ zint vno = 0;
- mf_read (cf->hash_mf, hno+cf->head.next_bucket, off, sizeof(int), &vno);
+ mf_read (cf->hash_mf, hno+cf->head.next_bucket, off, sizeof(zint), &vno);
return vno;
}
-static int cf_lookup_hash (CFile cf, int no)
+static zint cf_lookup_hash (CFile cf, zint no)
{
int hno = cf_hash (cf, no);
struct CFile_hash_bucket *hb;
- int block_no, i;
+ zint block_no;
+ int i;
for (hb = cf->parray[hno]; hb; hb = hb->h_next)
{
{
if (hb->ph.this_bucket == block_no)
{
- logf (LOG_FATAL, "Found hash bucket on other chain (1)");
+ yaz_log (YLOG_FATAL, "Found hash bucket on other chain (1)");
abort ();
}
for (i = 0; i<HASH_BUCKET && hb->ph.vno[i]; i++)
if (hb->ph.no[i] == no)
{
- logf (LOG_FATAL, "Found hash bucket on other chain (2)");
+ yaz_log (YLOG_FATAL, "Found hash bucket on other chain (2)");
abort ();
}
}
return 0;
}
-static void cf_write_flat (CFile cf, int no, int vno)
+static void cf_write_flat (CFile cf, zint no, zint vno)
{
- int hno = (no*sizeof(int))/HASH_BSIZE;
- int off = (no*sizeof(int)) - hno*HASH_BSIZE;
+ zint hno = (no*sizeof(zint))/HASH_BSIZE;
+ int off = (int) ((no*sizeof(zint)) - hno*HASH_BSIZE);
hno += cf->head.next_bucket;
if (hno >= cf->head.flat_bucket)
cf->head.flat_bucket = hno+1;
cf->dirty = 1;
- mf_write (cf->hash_mf, hno, off, sizeof(int), &vno);
+ mf_write (cf->hash_mf, hno, off, sizeof(zint), &vno);
}
static void cf_moveto_flat (CFile cf)
{
struct CFile_hash_bucket *p;
- int i, j;
+ int j;
+ zint i;
- logf (LOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
- logf (LOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=%d total=%d",
+ yaz_log (YLOG_DEBUG, "cf: Moving to flat shadow: %s", cf->rmf->name);
+ yaz_log (YLOG_DEBUG, "cf: hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT " total="
+ ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
assert (cf->head.state == 1);
{
if (!mf_read (cf->hash_mf, i, 0, 0, &p->ph))
{
- logf (LOG_FATAL|LOG_ERRNO, "read bucket moveto flat");
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "read bucket moveto flat");
exit (1);
}
for (j = 0; j < HASH_BUCKET && p->ph.vno[j]; j++)
cf->dirty = 1;
}
-static int cf_lookup (CFile cf, int no)
+static zint cf_lookup (CFile cf, zint no)
{
if (cf->head.state > 1)
return cf_lookup_flat (cf, no);
return cf_lookup_hash (cf, no);
}
-static int cf_new_flat (CFile cf, int no)
+static zint cf_new_flat (CFile cf, zint no)
{
- int vno = (cf->head.next_block)++;
+ zint vno = (cf->head.next_block)++;
cf_write_flat (cf, no, vno);
return vno;
}
-static int cf_new_hash (CFile cf, int no)
+static zint cf_new_hash (CFile cf, zint no)
{
int hno = cf_hash (cf, no);
struct CFile_hash_bucket *hbprev = NULL, *hb = cf->parray[hno];
- int *bucketpp = &cf->array[hno];
- int i, vno = (cf->head.next_block)++;
+ zint *bucketpp = &cf->array[hno];
+ int i;
+ zint vno = (cf->head.next_block)++;
for (hb = cf->parray[hno]; hb; hb = hb->h_next)
if (!hb->ph.vno[HASH_BUCKET-1])
{
if (hb->ph.this_bucket == *bucketpp)
{
- logf (LOG_FATAL, "Found hash bucket on other chain");
+ yaz_log (YLOG_FATAL, "Found hash bucket on other chain");
abort ();
}
}
return vno;
}
-int cf_new (CFile cf, int no)
+zint cf_new (CFile cf, zint no)
{
if (cf->head.state > 1)
return cf_new_flat (cf, no);
}
-int cf_read (CFile cf, int no, int offset, int nbytes, void *buf)
+int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf)
{
- int block;
+ zint block;
assert (cf);
zebra_mutex_lock (&cf->mutex);
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read no=%d, block=%d", no, block);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cf_read no=" ZINT_FORMAT " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 1;
}
-int cf_write (CFile cf, int no, int offset, int nbytes, const void *buf)
+int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf)
{
- int block;
+ zint block;
assert (cf);
zebra_mutex_lock (&cf->mutex);
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write no=%d, block=%d", no, block);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cf_write no=" ZINT_FORMAT
+ " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 0;
int cf_close (CFile cf)
{
- logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=%d total=%d",
+ yaz_log (YLOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT
+ " total=" ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
flush_bucket (cf, -1);
projects / idzebra-moved-to-github.git / blobdiff