X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frset.c;h=d4122c46a3d49bd4942c6cc6290dd74162e4f72d;hp=e7981482089d7729eae9b376c3d288cfe519e1ad;hb=726c42c6ae793b79a5351d2fce805d220d21321e;hpb=7ead84f2bb444f7a420b1d1c8e8c47aec61f156c diff --git a/rset/rset.c b/rset/rset.c index e798148..d4122c4 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,4 +1,4 @@ -/* $Id: rset.c,v 1.20 2004-01-30 11:43:41 heikki Exp $ +/* $Id: rset.c,v 1.33 2004-09-09 10:08:06 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -25,36 +25,85 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include - +#include +#include #include -#include <../index/index.h> /* for log_keydump. Debugging only */ -RSET rset_create(const struct rset_control *sel, void *parms) + +/* creates an rfd. Either allocates a new one, in which case the priv */ +/* pointer is null, and will have to be filled in, or picks up one */ +/* from the freelist, in which case the priv is already allocated, */ +/* and presumably everything that hangs from it as well */ + +RSFD rfd_create_base(RSET rs) { - RSET rnew; - int i; + RSFD rnew=rs->free_list; + if (rnew) { + rs->free_list=rnew->next; + assert(rnew->rset==rs); + /* logf(LOG_DEBUG,"rfd-create_base (fl): rfd=%p rs=%p fl=%p priv=%p", + rnew, rs, rs->free_list, rnew->priv); */ + } else { + rnew=nmem_malloc(rs->nmem, sizeof(*rnew)); + rnew->priv=NULL; + rnew->rset=rs; + /* logf(LOG_DEBUG,"rfd_create_base (new): rfd=%p rs=%p fl=%p priv=%p", + rnew, rs, rs->free_list, rnew->priv); */ + } + rnew->next=NULL; /* not part of any (free?) list */ + return rnew; +} + +/* puts an rfd into the freelist of the rset. Only when the rset gets */ +/* deleted, will all the nmem disappear */ +void rfd_delete_base(RSFD rfd) +{ + RSET rs=rfd->rset; + /* logf(LOG_DEBUG,"rfd_delete_base: rfd=%p rs=%p priv=%p fl=%p", + rfd, rs, rfd->priv, rs->free_list); */ + assert(NULL == rfd->next); + rfd->next=rs->free_list; + rs->free_list=rfd; +} - logf (LOG_DEBUG, "rs_create(%s)", sel->desc); - rnew = (RSET) xmalloc(sizeof(*rnew)); + +RSET rset_create_base(const struct rset_control *sel, + NMEM nmem, const struct key_control *kcontrol, + int scope) +{ + RSET rnew; + NMEM M; + /* assert(nmem); */ /* can not yet be used, api/t4 fails */ + if (nmem) + M=nmem; + else + M=nmem_create(); + rnew = (RSET) nmem_malloc(M,sizeof(*rnew)); + /* logf (LOG_DEBUG, "rs_create(%s) rs=%p (nm=%p)", sel->desc, rnew, nmem); */ + rnew->nmem=M; + if (nmem) + rnew->my_nmem=0; + else + rnew->my_nmem=1; rnew->control = sel; - rnew->flags = 0; rnew->count = 1; - rnew->rset_terms = NULL; - rnew->no_rset_terms = 0; - rnew->buf = (*sel->f_create)(rnew, sel, parms); - logf (LOG_DEBUG, "no_rset_terms: %d", rnew->no_rset_terms); - for (i = 0; ino_rset_terms; i++) - logf (LOG_DEBUG, " %s", rnew->rset_terms[i]->name); + rnew->priv = 0; + rnew->free_list=NULL; + rnew->keycontrol=kcontrol; + rnew->scope=scope; return rnew; } void rset_delete (RSET rs) { (rs->count)--; +/* logf(LOG_DEBUG,"rs_delete(%s), rs=%p, count=%d", + rs->control->desc, rs, rs->count); */ if (!rs->count) { - (*rs->control->f_delete)(rs); - xfree(rs); + (*rs->control->f_delete)(rs); + if (rs->my_nmem) + nmem_destroy(rs->nmem); } } @@ -64,77 +113,37 @@ RSET rset_dup (RSET rs) return rs; } -int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index, - int (*cmpfunc)(const void *p1, const void *p2), +#if 0 +void rset_default_pos (RSFD rfd, double *current, double *total) +{ /* This should never really be needed, but it is still used in */ + /* those rsets that we don't really plan to use, like isam-s */ + assert(rfd); + assert(current); + assert(total); + *current=-1; /* signal that pos is not implemented */ + *total=-1; +} /* rset_default_pos */ +#endif + +int rset_default_forward(RSFD rfd, void *buf, const void *untilbuf) { int more=1; - int cmp=2; + int cmp=rfd->rset->scope; logf (LOG_DEBUG, "rset_default_forward starting '%s' (ct=%p rfd=%p)", - ct->control->desc, ct,rfd); - key_logdump(LOG_DEBUG, untilbuf); - while ( (cmp==2) && (more)) + rfd->rset->control->desc, rfd->rset, rfd); + /* key_logdump(LOG_DEBUG, untilbuf); */ + while ( (cmp>=rfd->rset->scope) && (more)) { logf (LOG_DEBUG, "rset_default_forward looping m=%d c=%d",more,cmp); - more=rset_read(ct, rfd, buf, term_index); + more=rset_read(rfd, buf); if (more) - cmp=(*cmpfunc)(untilbuf,buf); - if (more) - key_logdump(LOG_DEBUG,buf); + cmp=(rfd->rset->keycontrol->cmp)(untilbuf,buf); +/* if (more) + key_logdump(LOG_DEBUG,buf); */ } logf (LOG_DEBUG, "rset_default_forward exiting m=%d c=%d",more,cmp); return more; } -RSET_TERM *rset_terms(RSET rs, int *no) -{ - *no = rs->no_rset_terms; - return rs->rset_terms; -} - -RSET_TERM rset_term_create (const char *name, int length, const char *flags, - int type) -{ - RSET_TERM t = (RSET_TERM) xmalloc (sizeof(*t)); - if (!name) - t->name = NULL; - else if (length == -1) - t->name = xstrdup (name); - else - { - t->name = (char*) xmalloc (length+1); - memcpy (t->name, name, length); - t->name[length] = '\0'; - } - if (!flags) - t->flags = NULL; - else - t->flags = xstrdup (flags); - t->nn = -1; - t->count = 0; - t->type = type; - return t; -} - -void rset_term_destroy (RSET_TERM t) -{ - xfree (t->name); - xfree (t->flags); - xfree (t); -} - -RSET_TERM rset_term_dup (RSET_TERM t) -{ - RSET_TERM nt = (RSET_TERM) xmalloc (sizeof(*nt)); - if (t->name) - nt->name = xstrdup (t->name); - else - nt->name = NULL; - if (t->flags) - nt->flags = xstrdup (t->flags); - else - nt->flags = NULL; - nt->nn = t->nn; - return nt; -}