-/* $Id: rstemp.c,v 1.40 2004-08-06 10:09:28 heikki Exp $
+/* $Id: rstemp.c,v 1.46 2004-08-26 11:11:59 heikki Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
Index Data Aps
#include <zebrautl.h>
#include <rstemp.h>
-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 void r_rewind (RSFD rfd);
-/* static int r_count (RSET ct);*/
-static int r_read (RSFD rfd, void *buf, int *term_index);
+static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
static void r_pos (RSFD rfd, double *current, double *total);
+
static const struct rset_control control =
{
"temp",
- r_create,
r_open,
r_close,
r_delete,
zint hits; /* no of hits */
char *temp_path;
int (*cmp)(const void *p1, const void *p2);
- struct rset_temp_rfd *rfd_list;
+ struct rset_temp_rfd *rfd_list; /* rfds in use */
+ struct rset_temp_rfd *free_list; /* fully alloc'd rfds waiting for reuse*/
};
struct rset_temp_rfd {
struct rset_temp_info *info;
struct rset_temp_rfd *next;
- int *countp;
void *buf;
size_t pos_cur; /* current position in set */
zint cur; /* number of the current hit */
};
-static void *r_create(RSET ct, const struct rset_control *sel, void *parms)
+RSET rstemp_create( NMEM nmem, int key_size,
+ int (*cmp)(const void *p1, const void *p2),
+ const char *temp_path)
{
- rset_temp_parms *temp_parms = (rset_temp_parms *) parms;
+ RSET rnew=rset_create_base(&control, nmem);
struct rset_temp_info *info;
- info = (struct rset_temp_info *) xmalloc (sizeof(struct rset_temp_info));
+ info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info));
info->fd = -1;
info->fname = NULL;
- info->key_size = temp_parms->key_size;
+ info->key_size = key_size;
info->buf_size = 4096;
- info->buf_mem = (char *) xmalloc (info->buf_size);
+ info->buf_mem = (char *) nmem_malloc (rnew->nmem, info->buf_size);
info->pos_end = 0;
info->pos_buf = 0;
info->dirty = 0;
info->hits = 0;
- info->cmp = temp_parms->cmp;
+ info->cmp = cmp;
info->rfd_list = NULL;
+ info->free_list = NULL;
- if (!temp_parms->temp_path)
- info->temp_path = NULL;
+ if (!temp_path)
+ info->temp_path = NULL;
else
+ info->temp_path = nmem_strdup(rnew->nmem,temp_path);
+ rnew->priv=info;
+ return rnew;
+} /* rstemp_create */
+
+static void r_delete (RSET ct)
+{
+ struct rset_temp_info *info = (struct rset_temp_info*) ct->priv;
+
+ xfree (info->buf_mem);
+ logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
+ if (info->fname)
{
- info->temp_path = (char *) xmalloc (strlen(temp_parms->temp_path)+1);
- strcpy (info->temp_path, temp_parms->temp_path);
+ logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
+ unlink (info->fname);
+ xfree (info->fname); /* FIXME should be nmem'd, and not freed here */
}
- ct->no_rset_terms = 1;
- ct->rset_terms = (RSET_TERM *) xmalloc (sizeof(*ct->rset_terms));
- ct->rset_terms[0] = temp_parms->rset_term;
-
- return info;
+ /*
+ if (info->temp_path)
+ xfree (info->temp_path);
+ xfree (info);
+ */ /* nmem'd */
}
+
static RSFD r_open (RSET ct, int flag)
{
- struct rset_temp_info *info = (struct rset_temp_info *) ct->buf;
+ struct rset_temp_info *info = (struct rset_temp_info *) ct->priv;
struct rset_temp_rfd *rfd;
if (info->fd == -1 && info->fname)
exit (1);
}
}
- rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
+ rfd = info->free_list;
+ if (rfd)
+ info->free_list=rfd->next;
+ else {
+ rfd = (struct rset_temp_rfd *) xmalloc (sizeof(*rfd));
+ rfd->buf = xmalloc (info->key_size);
+ }
rfd->next = info->rfd_list;
info->rfd_list = rfd;
rfd->info = info;
r_rewind (rfd);
- rfd->countp = &ct->rset_terms[0]->count;
- *rfd->countp = 0;
- rfd->buf = xmalloc (info->key_size);
-
return rfd;
}
if (info->fname && info->fd != -1 && info->dirty)
{
size_t count;
- int r;
+ int r;
if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1)
{
for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next)
if (*rfdp == rfd)
{
+ struct rset_temp_rfd *rfd_tmp=*rfdp;
r_flush (*rfdp, 0);
- xfree ((*rfdp)->buf);
-
*rfdp = (*rfdp)->next;
- xfree (rfd);
+ rfd_tmp->next=info->free_list;
+ info->free_list=rfd_tmp;
if (!info->rfd_list && info->fname && info->fd != -1)
{
assert (0);
}
-static void r_delete (RSET ct)
-{
- struct rset_temp_info *info = (struct rset_temp_info*) ct->buf;
-
- if (info->fname)
- unlink (info->fname);
- xfree (info->buf_mem);
- logf (LOG_DEBUG, "r_delete: set size %ld", (long) info->pos_end);
- if (info->fname)
- {
- logf (LOG_DEBUG, "r_delete: unlink %s", info->fname);
- unlink (info->fname);
- xfree (info->fname);
- }
- if (info->temp_path)
- xfree (info->temp_path);
- rset_term_destroy (ct->rset_terms[0]);
- xfree (ct->rset_terms);
- xfree (info);
-}
/* r_reread:
read from file to window if file is assocated with set -
if (info->fname)
{
size_t count;
- int r;
+ int r;
info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur +
info->buf_size;
return info->pos_end / info->key_size;
}
*/
-static int r_read (RSFD rfd, void *buf, int *term_index)
+static int r_read (RSFD rfd, void *buf)
{
struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
struct rset_temp_info *info = mrfd->info;
memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf),
info->key_size);
mrfd->pos_cur = nc;
- *term_index = 0;
-
- if (*mrfd->countp == 0 || (*info->cmp)(buf, mrfd->buf) > 1)
- {
- memcpy (mrfd->buf, buf, mrfd->info->key_size);
- (*mrfd->countp)++;
- }
mrfd->cur++;
return 1;
}
static void r_pos (RSFD rfd, double *current, double *total)
{
struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd;
- *current=mrfd->cur;
- *total=mrfd->info->hits;
+ *current=(double) mrfd->cur;
+ *total=(double) mrfd->info->hits;
}
projects / idzebra-moved-to-github.git / blobdiff