X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dict%2Fdrdwr.c;h=a77335fbea7a367b10a963450c1a8df1515f0566;hp=a77e7a105e2f3f8a94f29f2ed5e354cf603a5544;hb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;hpb=df82693c96b0691db2508139dea6fc4a03766193 diff --git a/dict/drdwr.c b/dict/drdwr.c index a77e7a1..a77335f 100644 --- a/dict/drdwr.c +++ b/dict/drdwr.c @@ -1,14 +1,40 @@ +/* $Id: drdwr.c,v 1.16 2005-01-15 19:38:21 adam Exp $ + Copyright (C) 1995-2005 + 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 #include +#ifndef WIN32 #include +#endif #include #include #include #include -#include +#include "dict-p.h" -static void pr_lru (Dict_BFile bf) +void dict_pr_lru (Dict_BFile bf) { struct Dict_file_block *p; for (p=bf->lru_back; p; p = p->lru_next) @@ -41,7 +67,7 @@ static void release_block (Dict_BFile bf, struct Dict_file_block *p) if (p->lru_next) p->lru_next->lru_prev = p->lru_prev; else - bf->lru_back = p->lru_prev; + bf->lru_front = p->lru_prev; /* remove from hash chain */ *p->h_prev = p->h_next; @@ -61,7 +87,45 @@ void dict_bf_flush_blocks (Dict_BFile bf, int no_to_flush) { p = bf->lru_back; if (p->dirty) - bf_write (bf->bf, p->no, p->data); + { + if (!bf->compact_flag) + bf_write (bf->bf, p->no, 0, 0, p->data); + else + { + int effective_block = p->no / bf->block_size; + int effective_offset = p->no - + effective_block * bf->block_size; + int remain = bf->block_size - effective_offset; + + if (remain >= p->nbytes) + { + bf_write (bf->bf, effective_block, effective_offset, + p->nbytes, p->data); +#if 0 + yaz_log (YLOG_LOG, "bf_write no=%d offset=%d size=%d", + effective_block, effective_offset, + p->nbytes); +#endif + + } + else + { +#if 0 + yaz_log (YLOG_LOG, "bf_write1 no=%d offset=%d size=%d", + effective_block, effective_offset, + remain); +#endif + bf_write (bf->bf, effective_block, effective_offset, + remain, p->data); +#if 0 + yaz_log (YLOG_LOG, "bf_write2 no=%d offset=%d size=%d", + effective_block+1, 0, p->nbytes - remain); +#endif + bf_write (bf->bf, effective_block+1, 0, + p->nbytes - remain, (char*)p->data + remain); + } + } + } release_block (bf, p); } } @@ -121,7 +185,7 @@ static void move_to_front (Dict_BFile bf, struct Dict_file_block *p) bf->lru_front = p; } -int bf_readp (Dict_BFile bf, int no, void **bufp) +int dict_bf_readp (Dict_BFile bf, int no, void **bufp) { struct Dict_file_block *p; int i; @@ -134,7 +198,21 @@ int bf_readp (Dict_BFile bf, int no, void **bufp) } bf->misses++; p = alloc_block (bf, no); - i = bf_read (bf->bf, no, p->data); + + if (!bf->compact_flag) + i = bf_read (bf->bf, no, 0, 0, p->data); + else + { + int effective_block = no / bf->block_size; + int effective_offset = no - effective_block * bf->block_size; + + i = bf_read (bf->bf, effective_block, effective_offset, + bf->block_size - effective_offset, p->data); + if (i > 0 && effective_offset > 0) + i = bf_read (bf->bf, effective_block+1, 0, effective_offset, + (char*) p->data + bf->block_size - effective_offset); + i = 1; + } if (i > 0) { *bufp = p->data; @@ -145,27 +223,28 @@ int bf_readp (Dict_BFile bf, int no, void **bufp) return i; } -int bf_newp (Dict_BFile bf, int no, void **bufp) +int dict_bf_newp (Dict_BFile dbf, int no, void **bufp, int nbytes) { struct Dict_file_block *p; - if (!(p = find_block (bf, no))) - p = alloc_block (bf, no); + if (!(p = find_block (dbf, no))) + p = alloc_block (dbf, no); else - move_to_front (bf, p); + move_to_front (dbf, p); *bufp = p->data; - memset (p->data, 0, bf->bf->block_size); + memset (p->data, 0, dbf->block_size); p->dirty = 1; + p->nbytes = nbytes; #if 0 printf ("bf_newp of %d:", no); - pr_lru (bf); + dict_pr_lru (dbf); #endif return 1; } -int bf_touch (Dict_BFile bf, int no) +int dict_bf_touch (Dict_BFile dbf, int no) { struct Dict_file_block *p; - if ((p = find_block (bf, no))) + if ((p = find_block (dbf, no))) { p->dirty = 1; return 0;