-/* $Id: rsbetween.c,v 1.19 2004-08-23 12:38:53 heikki Exp $
+/* $Id: rsbetween.c,v 1.22 2004-08-26 11:11:59 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
Index Data Aps
#define RSBETWEEN_DEBUG 0
-static void *r_create_between(RSET ct, const struct rset_control *sel, void *parms);
static RSFD r_open_between (RSET ct, int flag);
static void r_close_between (RSFD rfd);
static void r_delete_between (RSET ct);
static int r_write_between (RSFD rfd, const void *buf);
static void r_pos_between (RSFD rfd, double *current, double *total);
-static const struct rset_control control_between =
+static const struct rset_control control =
{
"between",
- r_create_between,
r_open_between,
r_close_between,
r_delete_between,
};
-const struct rset_control *rset_kind_between = &control_between;
+const struct rset_control *rset_kind_between = &control;
struct rset_between_info {
int key_size;
int (*cmp)(const void *p1, const void *p2);
char *(*printer)(const void *p1, char *buf);
struct rset_between_rfd *rfd_list;
+ struct rset_between_rfd *free_list;
};
struct rset_between_rfd {
}
#endif
-static void *r_create_between (RSET ct, const struct rset_control *sel,
- void *parms)
+RSET rsbetween_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ RSET rset_l, RSET rset_m, RSET rset_r, RSET rset_attr,
+ char *(*printer)(const void *p1, char *buf) )
{
- rset_between_parms *between_parms = (rset_between_parms *) parms;
+ RSET rnew=rset_create_base(&control, nmem);
struct rset_between_info *info;
-
- info = (struct rset_between_info *) xmalloc (sizeof(*info));
- info->key_size = between_parms->key_size;
- info->rset_l = between_parms->rset_l;
- info->rset_m = between_parms->rset_m;
- info->rset_r = between_parms->rset_r;
- info->rset_attr = between_parms->rset_attr;
- info->cmp = between_parms->cmp;
- info->printer = between_parms->printer;
+ info = (struct rset_between_info *) nmem_malloc(rnew->nmem,sizeof(*info));
+ info->key_size = key_size;
+ info->rset_l = rset_l;
+ info->rset_m = rset_m;
+ info->rset_r = rset_r;
+ info->rset_attr = rset_attr;
+ info->cmp = cmp;
+ info->printer = printer;
info->rfd_list = NULL;
- return info;
+ info->free_list = NULL;
+
+ rnew->priv=info;
+ return rnew;
}
+
+static void r_delete_between (RSET ct)
+{
+ struct rset_between_info *info = (struct rset_between_info *) ct->priv;
+
+ assert (info->rfd_list == NULL);
+ rset_delete (info->rset_l);
+ rset_delete (info->rset_m);
+ rset_delete (info->rset_r);
+ if (info->rset_attr)
+ rset_delete (info->rset_attr);
+}
+
+
static RSFD r_open_between (RSET ct, int flag)
{
- struct rset_between_info *info = (struct rset_between_info *) ct->buf;
+ struct rset_between_info *info = (struct rset_between_info *) ct->priv;
struct rset_between_rfd *rfd;
if (flag & RSETF_WRITE)
logf (LOG_FATAL, "between set type is read-only");
return NULL;
}
- rfd = (struct rset_between_rfd *) xmalloc (sizeof(*rfd));
+ rfd=info->free_list;
+ if (rfd)
+ info->free_list=rfd->next;
+ else {
+ rfd = (struct rset_between_rfd *) nmem_malloc(ct->nmem, (sizeof(*rfd)));
+ 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->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->rfd_l = rset_open (info->rset_l, RSETF_READ);
rfd->rfd_m = rset_open (info->rset_m, RSETF_READ);
rfd->rfd_r = rset_open (info->rset_r, RSETF_READ);
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);
+ struct rset_between_rfd *rfd_tmp=*rfdp;
rset_close (info->rset_l, (*rfdp)->rfd_l);
rset_close (info->rset_m, (*rfdp)->rfd_m);
rset_close (info->rset_r, (*rfdp)->rfd_r);
if (info->rset_attr)
rset_close (info->rset_attr, (*rfdp)->rfd_attr);
-
*rfdp = (*rfdp)->next;
- xfree (rfd);
+ rfd_tmp->next=info->free_list;
+ info->free_list=rfd_tmp;
return;
}
logf (LOG_FATAL, "r_close_between but no rfd match!");
assert (0);
}
-static void r_delete_between (RSET ct)
-{
- struct rset_between_info *info = (struct rset_between_info *) ct->buf;
-
- assert (info->rfd_list == NULL);
- rset_delete (info->rset_l);
- rset_delete (info->rset_m);
- rset_delete (info->rset_r);
- if (info->rset_attr)
- rset_delete (info->rset_attr);
- xfree (info);
-}
-
static void r_rewind_between (RSFD rfd)
{
struct rset_between_info *info = ((struct rset_between_rfd*)rfd)->info;