X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=rset%2Frsisamc.c;h=273d86e34313e9c17a62ef1f65ec1b8b46028784;hb=8d47d759a2e957ada235ab83bf877f2eb0d2ab99;hp=b67839f77212283e7fbf365a6ce7f550c7af0120;hpb=b7942589b21cca1b6d44c7bf9446dcb6a5942953;p=idzebra-moved-to-github.git diff --git a/rset/rsisamc.c b/rset/rsisamc.c index b67839f..273d86e 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,90 +1,131 @@ -/* - * Copyright (C) 1994-1996, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: rsisamc.c,v $ - * Revision 1.3 1997-10-31 12:37:01 adam - * Code calls xfree() instead of free(). - * - * Revision 1.2 1996/11/08 11:15:57 adam - * Compressed isam fully supported. - * - * Revision 1.1 1996/10/29 13:41:48 adam - * First use of isamc. - * - */ +/* $Id: rsisamc.c,v 1.22 2004-08-26 11:11:59 heikki Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 + 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 -#include +#include #include +#include -static void *r_create(const struct rset_control *sel, void *parms, - int *flags); static RSFD r_open (RSET ct, int flag); static void r_close (RSFD rfd); static void r_delete (RSET ct); static void r_rewind (RSFD rfd); -static int r_count (RSET ct); static int r_read (RSFD rfd, void *buf); static int r_write (RSFD rfd, const void *buf); -static int r_score (RSFD rfd, int *score); -static const rset_control control = +static const struct rset_control control = { "isamc", - r_create, r_open, r_close, r_delete, r_rewind, - r_count, + rset_default_forward, + rset_default_pos, r_read, r_write, - r_score }; -const rset_control *rset_kind_isamc = &control; +const struct rset_control *rset_kind_isamc = &control; struct rset_pp_info { ISAMC_PP pt; struct rset_pp_info *next; struct rset_isamc_info *info; + void *buf; }; struct rset_isamc_info { ISAMC is; ISAMC_P pos; + int key_size; + int (*cmp)(const void *p1, const void *p2); struct rset_pp_info *ispt_list; + struct rset_pp_info *free_list; }; -static void *r_create(const struct rset_control *sel, void *parms, - int *flags) +RSET rsisamc_create( NMEM nmem, int key_size, + int (*cmp)(const void *p1, const void *p2), + ISAMC is, ISAMC_P pos) { - rset_isamc_parms *pt = parms; + RSET rnew=rset_create_base(&control, nmem); struct rset_isamc_info *info; + info = (struct rset_isamc_info *) nmem_malloc(rnew->nmem,sizeof(*info)); + info->key_size = key_size; + info->cmp = cmp; + info->ispt_list = NULL; + info->free_list = NULL; + info->is=is; + info->pos=pos; + rnew->priv=info; + return rnew; +} + +static void r_delete (RSET ct) +{ + struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv; + + logf (LOG_DEBUG, "rsisamc_delete"); + assert (info->ispt_list == NULL); +} - *flags |= RSET_FLAG_VOLATILE; - info = xmalloc (sizeof(*info)); +/* +static void *r_create(RSET ct, const struct rset_control *sel, void *parms) +{ + rset_isamc_parms *pt = (rset_isamc_parms *) parms; + struct rset_isamc_info *info; + + info = (struct rset_isamc_info *) xmalloc (sizeof(*info)); info->is = pt->is; info->pos = pt->pos; + info->key_size = pt->key_size; + info->cmp = pt->cmp; info->ispt_list = NULL; return info; } +*/ RSFD r_open (RSET ct, int flag) { - struct rset_isamc_info *info = ct->buf; + struct rset_isamc_info *info = (struct rset_isamc_info *) ct->priv; struct rset_pp_info *ptinfo; logf (LOG_DEBUG, "risamc_open"); if (flag & RSETF_WRITE) { - logf (LOG_FATAL, "ISAMC set type is read-only"); - return NULL; + logf (LOG_FATAL, "ISAMC set type is read-only"); + return NULL; + } + ptinfo = info->free_list; + if (ptinfo) + info->free_list=ptinfo->next; + else { + ptinfo = (struct rset_pp_info *) nmem_malloc (ct->nmem,sizeof(*ptinfo)); + ptinfo->buf = nmem_malloc (ct->nmem,info->key_size); } - ptinfo = xmalloc (sizeof(*ptinfo)); ptinfo->next = info->ispt_list; info->ispt_list = ptinfo; ptinfo->pt = isc_pp_open (info->is, info->pos); @@ -100,23 +141,17 @@ static void r_close (RSFD rfd) for (ptinfop = &info->ispt_list; *ptinfop; ptinfop = &(*ptinfop)->next) if (*ptinfop == rfd) { + struct rset_pp_info *tmp=(struct rset_pp_info*) rfd; isc_pp_close ((*ptinfop)->pt); *ptinfop = (*ptinfop)->next; - xfree (rfd); + tmp->next=info->free_list; + info->free_list=tmp; return; } logf (LOG_FATAL, "r_close but no rfd match!"); assert (0); } -static void r_delete (RSET ct) -{ - struct rset_isamc_info *info = ct->buf; - - logf (LOG_DEBUG, "rsisamc_delete"); - assert (info->ispt_list == NULL); - xfree (info); -} static void r_rewind (RSFD rfd) { @@ -124,14 +159,12 @@ static void r_rewind (RSFD rfd) abort (); } -static int r_count (RSET ct) -{ - return 0; -} - static int r_read (RSFD rfd, void *buf) { - return isc_pp_read( ((struct rset_pp_info*) rfd)->pt, buf); + struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd; + int r; + r = isc_pp_read(pinfo->pt, buf); + return r; } static int r_write (RSFD rfd, const void *buf) @@ -139,9 +172,3 @@ static int r_write (RSFD rfd, const void *buf) logf (LOG_FATAL, "ISAMC set type is read-only"); return -1; } - -static int r_score (RSFD rfd, int *score) -{ - *score = -1; - return -1; -}