-/* $Id: rsbool.c,v 1.38 2004-08-20 14:44:46 heikki Exp $
+/* $Id: rsbool.c,v 1.44 2004-08-26 11:11:59 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
#define RSET_DEBUG 0
#endif
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
static void r_delete (RSET ct);
static const struct rset_control control_and =
{
"and",
- r_create,
r_open,
r_close,
r_delete,
static const struct rset_control control_or =
{
"or",
- r_create,
r_open,
r_close,
r_delete,
static const struct rset_control control_not =
{
"not",
- r_create,
r_open,
r_close,
r_delete,
RSET rset_r;
int (*cmp)(const void *p1, const void *p2);
void (*log_item)(int logmask, const void *p, const char *txt);
- struct rset_bool_rfd *rfd_list;
+ struct rset_bool_rfd *rfd_list; /* RSFDs in use */
+ struct rset_bool_rfd *free_list; /* RSFDs that are freed (for reuse) */
};
struct rset_bool_rfd {
struct rset_bool_info *info;
};
+static RSET rsbool_create_base( const struct rset_control *ctrl,
+ NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ RSET rset_l, RSET rset_r,
+ void (*log_item)(int logmask, const void *p, const char *txt) )
+{
+ RSET rnew=rset_create_base(ctrl, nmem);
+ struct rset_bool_info *info;
+ info = (struct rset_bool_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ info->key_size = key_size;
+ info->rset_l = rset_l;
+ info->rset_r = rset_r;
+ info->cmp = cmp;
+ info->log_item = log_item;
+ info->rfd_list = NULL;
+ info->free_list = NULL;
+
+ rnew->priv=info;
+ return rnew;
+}
+
+
+RSET rsbool_create_and( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ RSET rset_l, RSET rset_r,
+ void (*log_item)(int logmask, const void *p, const char *txt) )
+{
+ return rsbool_create_base(rset_kind_and, nmem, key_size, cmp,
+ rset_l, rset_r, log_item);
+}
+
+RSET rsbool_create_or( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ RSET rset_l, RSET rset_r,
+ void (*log_item)(int logmask, const void *p, const char *txt) )
+{
+ return rsbool_create_base(rset_kind_or, nmem, key_size, cmp,
+ rset_l, rset_r, log_item);
+}
+
+RSET rsbool_create_not( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ RSET rset_l, RSET rset_r,
+ void (*log_item)(int logmask, const void *p, const char *txt) )
+{
+ return rsbool_create_base(rset_kind_not, nmem, key_size, cmp,
+ rset_l, rset_r, log_item);
+}
+
+static void r_delete (RSET ct)
+{
+ struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
+
+ assert (info->rfd_list == NULL);
+ rset_delete (info->rset_l);
+ rset_delete (info->rset_r);
+}
+
+#if 0
static void *r_create (RSET ct, const struct rset_control *sel, void *parms)
{
rset_bool_parms *bool_parms = (rset_bool_parms *) parms;
info->key_size = bool_parms->key_size;
info->rset_l = bool_parms->rset_l;
info->rset_r = bool_parms->rset_r;
- if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r))
- ct->flags |= RSET_FLAG_VOLATILE;
info->cmp = bool_parms->cmp;
info->log_item = bool_parms->log_item;
info->rfd_list = NULL;
return info;
}
+#endif
static RSFD r_open (RSET ct, int flag)
{
- struct rset_bool_info *info = (struct rset_bool_info *) ct->buf;
+ struct rset_bool_info *info = (struct rset_bool_info *) ct->priv;
struct rset_bool_rfd *rfd;
if (flag & RSETF_WRITE)
logf (LOG_FATAL, "bool set type is read-only");
return NULL;
}
- rfd = (struct rset_bool_rfd *) xmalloc (sizeof(*rfd));
+ rfd = info->free_list;
+ if (rfd)
+ info->free_list = rfd->next;
+ else {
+ rfd = (struct rset_bool_rfd *) nmem_malloc(ct->nmem, sizeof(*rfd));
+ rfd->buf_l = nmem_malloc(ct->nmem, info->key_size);
+ rfd->buf_r = nmem_malloc(ct->nmem, info->key_size);
+ }
+
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->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);
for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
if (*rfdp == rfd)
{
- xfree ((*rfdp)->buf_l);
- xfree ((*rfdp)->buf_r);
+ struct rset_bool_rfd *rfd_tmp = *rfdp;
+
rset_close (info->rset_l, (*rfdp)->rfd_l);
rset_close (info->rset_r, (*rfdp)->rfd_r);
*rfdp = (*rfdp)->next;
- xfree (rfd);
+
+ rfd_tmp->next = info->free_list;
+ info->free_list = rfd_tmp;
+
return;
}
logf (LOG_FATAL, "r_close but no rfd match!");
assert (0);
}
-static void r_delete (RSET ct)
-{
- struct rset_bool_info *info = (struct rset_bool_info *) ct->buf;
-
- assert (info->rfd_list == NULL);
- rset_delete (info->rset_l);
- rset_delete (info->rset_r);
- xfree (info);
-}
static void r_rewind (RSFD rfd)
{