From eb1d9cf5bea42ce04747d852d21dde853574fa3f Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Tue, 24 Aug 2004 15:00:16 +0000 Subject: [PATCH] Using a bit more of those nmems in rsets --- index/trunc.c | 7 +++++-- rset/rsbetween.c | 18 ++++++------------ rset/rsbool.c | 12 ++++-------- rset/rset.c | 24 +++++++++++++----------- 4 files changed, 28 insertions(+), 33 deletions(-) diff --git a/index/trunc.c b/index/trunc.c index 6a5f5bb..5b7a856 100644 --- a/index/trunc.c +++ b/index/trunc.c @@ -1,4 +1,4 @@ -/* $Id: trunc.c,v 1.37 2004-08-24 14:25:16 heikki Exp $ +/* $Id: trunc.c,v 1.38 2004-08-24 15:00:16 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -487,15 +487,18 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no, #if 1 else if (no <10000 ) /* FIXME - hardcoded number */ { + RSET r; RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */ int i; for (i=0;ireg->isamb, isam_p[i] ); - return rsmultior_create( NULL, /* FIXME - use some nmem */ + r=rsmultior_create( NULL, /* FIXME - use some nmem */ sizeof(struct it_key), key_compare_it, no, rsets); + xfree(rsets); + return r; /* rset_multior_parms m_parms; rset_isamb_parms b_parms; diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 4d7a813..49346fb 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.20 2004-08-24 14:25:16 heikki Exp $ +/* $Id: rsbetween.c,v 1.21 2004-08-24 15:00:16 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -164,7 +164,6 @@ static void r_delete_between (RSET ct) rset_delete (info->rset_r); if (info->rset_attr) rset_delete (info->rset_attr); - /* xfree (info); */ } @@ -178,15 +177,15 @@ static RSFD r_open_between (RSET ct, int flag) logf (LOG_FATAL, "between set type is read-only"); return NULL; } - rfd = (struct rset_between_rfd *) xmalloc (sizeof(*rfd)); + rfd = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*rfd))); rfd->next = info->rfd_list; info->rfd_list = rfd; rfd->info = info; - rfd->buf_l = xmalloc (info->key_size); - rfd->buf_m = xmalloc (info->key_size); - rfd->buf_r = xmalloc (info->key_size); - rfd->buf_attr = xmalloc (info->key_size); + rfd->buf_l = nmem_malloc(ct->nmem, (info->key_size)); + rfd->buf_m = nmem_malloc(ct->nmem, (info->key_size)); + rfd->buf_r = nmem_malloc(ct->nmem, (info->key_size)); + rfd->buf_attr = nmem_malloc(ct->nmem, (info->key_size)); rfd->rfd_l = rset_open (info->rset_l, RSETF_READ); rfd->rfd_m = rset_open (info->rset_m, RSETF_READ); @@ -214,10 +213,6 @@ static void r_close_between (RSFD rfd) for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next) if (*rfdp == rfd) { - xfree ((*rfdp)->buf_l); - xfree ((*rfdp)->buf_m); - xfree ((*rfdp)->buf_r); - xfree ((*rfdp)->buf_attr); rset_close (info->rset_l, (*rfdp)->rfd_l); rset_close (info->rset_m, (*rfdp)->rfd_m); rset_close (info->rset_r, (*rfdp)->rfd_r); @@ -225,7 +220,6 @@ static void r_close_between (RSFD rfd) rset_close (info->rset_attr, (*rfdp)->rfd_attr); *rfdp = (*rfdp)->next; - xfree (rfd); return; } logf (LOG_FATAL, "r_close_between but no rfd match!"); diff --git a/rset/rsbool.c b/rset/rsbool.c index 179cac4..59eec01 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $Id: rsbool.c,v 1.40 2004-08-24 14:25:16 heikki Exp $ +/* $Id: rsbool.c,v 1.41 2004-08-24 15:00:16 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -167,7 +167,6 @@ static void r_delete (RSET ct) assert (info->rfd_list == NULL); rset_delete (info->rset_l); rset_delete (info->rset_r); - /* xfree (info); */ /* nmem'd */ } #if 0 @@ -198,15 +197,15 @@ static RSFD r_open (RSET ct, int flag) logf (LOG_FATAL, "bool set type is read-only"); return NULL; } - rfd = (struct rset_bool_rfd *) xmalloc (sizeof(*rfd)); + rfd = (struct rset_bool_rfd *) nmem_malloc(ct->nmem, sizeof(*rfd)); logf(LOG_DEBUG,"rsbool (%s) open [%p]", ct->control->desc, rfd); rfd->next = info->rfd_list; info->rfd_list = rfd; rfd->info = info; rfd->hits=0; - rfd->buf_l = xmalloc (info->key_size); - rfd->buf_r = xmalloc (info->key_size); + rfd->buf_l = nmem_malloc(ct->nmem, info->key_size); + rfd->buf_r = nmem_malloc(ct->nmem, info->key_size); rfd->rfd_l = rset_open (info->rset_l, RSETF_READ); rfd->rfd_r = rset_open (info->rset_r, RSETF_READ); rfd->more_l = rset_read (info->rset_l, rfd->rfd_l, rfd->buf_l); @@ -223,12 +222,9 @@ static void r_close (RSFD rfd) for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next) if (*rfdp == rfd) { - xfree ((*rfdp)->buf_l); - xfree ((*rfdp)->buf_r); rset_close (info->rset_l, (*rfdp)->rfd_l); rset_close (info->rset_r, (*rfdp)->rfd_r); *rfdp = (*rfdp)->next; - xfree (rfd); return; } logf (LOG_FATAL, "r_close but no rfd match!"); diff --git a/rset/rset.c b/rset/rset.c index 15954d8..e24ef47 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,4 +1,4 @@ -/* $Id: rset.c,v 1.27 2004-08-24 14:25:16 heikki Exp $ +/* $Id: rset.c,v 1.28 2004-08-24 15:00:16 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -34,19 +34,22 @@ RSET rset_create_base(const struct rset_control *sel, NMEM nmem) /* FIXME - Add a general key-func block for cmp, dump, etc */ { RSET rnew; - + NMEM M; logf (LOG_DEBUG, "rs_create(%s)", sel->desc); - rnew = (RSET) xmalloc(sizeof(*rnew)); - rnew->control = sel; - rnew->count = 1; - rnew->priv = 0; - rnew->nmem=nmem; + if (nmem) + M=nmem; + else + M=nmem_create(); + rnew = (RSET) nmem_malloc(M,sizeof(*rnew)); + rnew->nmem=M; if (nmem) rnew->my_nmem=0; - else { - rnew->nmem=nmem_create(); + else rnew->my_nmem=1; - } + rnew->control = sel; + rnew->count = 1; + rnew->priv = 0; + return rnew; } @@ -58,7 +61,6 @@ void rset_delete (RSET rs) (*rs->control->f_delete)(rs); if (rs->my_nmem) nmem_destroy(rs->nmem); - xfree(rs); } } -- 1.7.10.4