projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #165: Use multi-and and multi-or always. WS cleanups.
[idzebra-moved-to-github.git]
/
bfile
/
cfile.c
diff --git
a/bfile/cfile.c
b/bfile/cfile.c
index
3023ec5
..
63465d5
100644
(file)
--- a/
bfile/cfile.c
+++ b/
bfile/cfile.c
@@
-1,6
+1,6
@@
-/* $Id: cfile.c,v 1.29 2004-08-06 12:28:22 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: cfile.c,v 1.33 2005-01-15 19:38:17 adam Exp $
+ Copyright (C) 1995-2005
+ Index Data ApS
This file is part of the Zebra server.
This file is part of the Zebra server.
@@
-20,14
+20,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <zebrautl.h>
#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)
#include "cfile.h"
static int write_head (CFile cf)
@@
-78,17
+76,17
@@
CFile cf_open (MFile mf, MFile_area area, const char *fname,
int hash_bytes;
cf->rmf = mf;
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)))
{
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)))
{
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);
exit (1);
}
assert (firstp);
@@
-223,7
+221,7
@@
static struct CFile_hash_bucket *get_bucket (CFile cf, zint block_no, int hno)
p = alloc_bucket (cf, block_no, hno);
if (!mf_read (cf->hash_mf, block_no, 0, 0, &p->ph))
{
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);
exit (1);
}
assert (p->ph.this_bucket == block_no);
@@
-292,13
+290,13
@@
static zint cf_lookup_hash (CFile cf, zint no)
{
if (hb->ph.this_bucket == block_no)
{
{
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)
{
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 ();
}
}
abort ();
}
}
@@
-330,8
+328,8
@@
static void cf_moveto_flat (CFile cf)
int j;
zint i;
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=" ZINT_FORMAT " total="
+ 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);
ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);
@@
-343,7
+341,7
@@
static void cf_moveto_flat (CFile cf)
{
if (!mf_read (cf->hash_mf, i, 0, 0, &p->ph))
{
{
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++)
exit (1);
}
for (j = 0; j < HASH_BUCKET && p->ph.vno[j]; j++)
@@
-411,7
+409,7
@@
static zint cf_new_hash (CFile cf, zint no)
{
if (hb->ph.this_bucket == *bucketpp)
{
{
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 ();
}
}
abort ();
}
}
@@
-466,7
+464,7
@@
int cf_read (CFile cf, zint no, int offset, int nbytes, void *buf)
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
zebra_mutex_unlock (&cf->mutex);
if (!mf_read (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_read no=" ZINT_FORMAT ", block=%d", no, block);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cf_read no=" ZINT_FORMAT " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 1;
exit (1);
}
return 1;
@@
-493,7
+491,8
@@
int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf)
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
zebra_mutex_unlock (&cf->mutex);
if (mf_write (cf->block_mf, block, offset, nbytes, buf))
{
- logf (LOG_FATAL|LOG_ERRNO, "cf_write no=" ZINT_FORMAT ", block=%d", no, block);
+ yaz_log (YLOG_FATAL|YLOG_ERRNO, "cf_write no=" ZINT_FORMAT
+ " block=" ZINT_FORMAT, no, block);
exit (1);
}
return 0;
exit (1);
}
return 0;
@@
-501,7
+500,7
@@
int cf_write (CFile cf, zint no, int offset, int nbytes, const void *buf)
int cf_close (CFile cf)
{
int cf_close (CFile cf)
{
- logf (LOG_DEBUG, "cf: close hits=%d miss=%d bucket_in_memory=" ZINT_FORMAT
+ 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);
" total=" ZINT_FORMAT,
cf->no_hits, cf->no_miss, cf->bucket_in_memory,
cf->head.next_bucket - cf->head.first_bucket);