X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=fa239f31de91577d6b5293ccfb2dd4f039ceba4c;hp=f77479d6256b7e00a31b736f3a33b43ca2c44bcd;hb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4;hpb=8d47d759a2e957ada235ab83bf877f2eb0d2ab99 diff --git a/rset/rstemp.c b/rset/rstemp.c index f77479d..fa239f3 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,6 +1,6 @@ -/* $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 +/* $Id: rstemp.c,v 1.61 2005-03-30 09:25:24 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -20,36 +20,38 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include +#include +#include +#include +#include #ifdef WIN32 #include #else #include #endif -#include #include -#include -#include -#include +#include +#include -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_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 RSFD r_open(RSET ct, int flag); +static void r_close(RSFD rfd); +static void r_delete(RSET ct); +static int r_read(RSFD rfd, void *buf, TERMID *term); +static int r_write(RSFD rfd, const void *buf); +static void r_pos(RSFD rfd, double *current, double *total); +static void r_flush(RSFD rfd, int mk); +static void r_reread(RSFD rfd); static const struct rset_control control = { "temp", + r_delete, + rset_get_one_term, r_open, r_close, - r_delete, - r_rewind, rset_default_forward, r_pos, r_read, @@ -59,9 +61,8 @@ static const struct rset_control control = const struct rset_control *rset_kind_temp = &control; struct rset_temp_info { - int fd; - char *fname; - size_t key_size; /* key size */ + int fd; /* file descriptor for temp file */ + char *fname; /* name of temp file */ char *buf_mem; /* window buffer */ size_t buf_size; /* size of window */ size_t pos_end; /* last position in set */ @@ -70,137 +71,128 @@ struct rset_temp_info { int dirty; /* window is dirty */ zint hits; /* no of hits */ char *temp_path; - int (*cmp)(const void *p1, const void *p2); - 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; void *buf; size_t pos_cur; /* current position in set */ + /* FIXME - term pos or what ?? */ zint cur; /* number of the current hit */ }; -RSET rstemp_create( NMEM nmem, int key_size, - int (*cmp)(const void *p1, const void *p2), - const char *temp_path) +static int log_level = 0; +static int log_level_initialized = 0; + +RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol, + int scope, const char *temp_path, TERMID term) { - RSET rnew=rset_create_base(&control, nmem); + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term); struct rset_temp_info *info; - + if (!log_level_initialized) + { + log_level = yaz_log_module_level("rstemp"); + log_level_initialized = 1; + } info = (struct rset_temp_info *) nmem_malloc(rnew->nmem, sizeof(*info)); info->fd = -1; info->fname = NULL; - info->key_size = key_size; info->buf_size = 4096; - info->buf_mem = (char *) nmem_malloc (rnew->nmem, 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 = cmp; - info->rfd_list = NULL; - info->free_list = NULL; if (!temp_path) info->temp_path = NULL; else - info->temp_path = nmem_strdup(rnew->nmem,temp_path); - rnew->priv=info; + info->temp_path = nmem_strdup(rnew->nmem, temp_path); + rnew->priv = info; return rnew; } /* rstemp_create */ -static void r_delete (RSET ct) +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); + yaz_log(log_level, "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); /* FIXME should be nmem'd, and not freed here */ + yaz_log(log_level, "r_delete: unlink %s", info->fname); + unlink(info->fname); } - /* - if (info->temp_path) - xfree (info->temp_path); - xfree (info); - */ /* nmem'd */ } - -static RSFD r_open (RSET ct, int flag) +static RSFD r_open(RSET ct, int flag) { struct rset_temp_info *info = (struct rset_temp_info *) ct->priv; - struct rset_temp_rfd *rfd; + RSFD rfd; + struct rset_temp_rfd *prfd; if (info->fd == -1 && info->fname) { if (flag & RSETF_WRITE) - info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); else - info->fd = open (info->fname, O_BINARY|O_RDONLY); + info->fd = open(info->fname, O_BINARY|O_RDONLY); if (info->fd == -1) { - logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname); + exit(1); } } - 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 = rfd_create_base(ct); + if (!rfd->priv) + { + prfd = (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd)); + rfd->priv = (void *)prfd; + prfd->buf = nmem_malloc(ct->nmem,ct->keycontrol->key_size); + } + else + prfd= rfd->priv; + r_flush(rfd, 0); + prfd->pos_cur = 0; + info->pos_buf = 0; + r_reread(rfd); + prfd->cur = 0; return rfd; } /* r_flush: flush current window to file if file is assocated with set */ -static void r_flush (RSFD rfd, int mk) +static void r_flush(RSFD rfd, int mk) { - struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; + /* struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; */ + struct rset_temp_info *info = rfd->rset->priv; if (!info->fname && mk) { #if HAVE_MKSTEMP char template[1024]; - if (info->temp_path) - sprintf (template, "%s/zrsXXXXXX", info->temp_path); + sprintf(template, "%s/zrsXXXXXX", info->temp_path); else - sprintf (template, "zrsXXXXXX"); + sprintf(template, "zrsXXXXXX"); - info->fd = mkstemp (template); + info->fd = mkstemp(template); if (info->fd == -1) { - logf (LOG_FATAL|LOG_ERRNO, "mkstemp %s", template); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template); + exit(1); } - info->fname = (char *) xmalloc (strlen(template)+1); - strcpy (info->fname, template); + info->fname = nmem_strdup(rfd->rset->nmem, template); #else - char *s = (char*) tempnam (info->temp_path, "zrs"); - info->fname = (char *) xmalloc (strlen(s)+1); - strcpy (info->fname, s); + char *s = (char*) tempnam(info->temp_path, "zrs"); + info->fname= nmem_strdup(rfd->rset->nmem, s); - logf (LOG_DEBUG, "creating tempfile %s", info->fname); - info->fd = open (info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); + yaz_log(log_level, "creating tempfile %s", info->fname); + info->fd = open(info->fname, O_BINARY|O_RDWR|O_CREAT, 0666); if (info->fd == -1) { - logf (LOG_FATAL|LOG_ERRNO, "open %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname); + exit(1); } #endif } @@ -209,50 +201,41 @@ static void r_flush (RSFD rfd, int mk) size_t count; int r; - if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname); + exit(1); } count = info->buf_size; if (count > info->pos_end - info->pos_buf) count = info->pos_end - info->pos_buf; - if ((r = write (info->fd, info->buf_mem, count)) < (int) count) + if ((r = write(info->fd, info->buf_mem, count)) < (int) count) { if (r == -1) - logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: write %s", info->fname); else - logf (LOG_FATAL, "write of %ld but got %ld", + yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld", (long) count, (long) r); - exit (1); + exit(1); } info->dirty = 0; } } -static void r_close (RSFD rfd) +static void r_close(RSFD rfd) { - struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; - struct rset_temp_rfd **rfdp; - - for (rfdp = &info->rfd_list; *rfdp; rfdp = &(*rfdp)->next) - if (*rfdp == rfd) - { - struct rset_temp_rfd *rfd_tmp=*rfdp; - r_flush (*rfdp, 0); - *rfdp = (*rfdp)->next; - rfd_tmp->next=info->free_list; - info->free_list=rfd_tmp; - - if (!info->rfd_list && info->fname && info->fd != -1) - { - close (info->fd); - info->fd = -1; - } - return; - } - logf (LOG_FATAL, "r_close but no rfd match!"); - assert (0); + /*struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; */ + struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + if (rfd_is_last(rfd)) + { + r_flush(rfd, 0); + if (info->fname && info->fd != -1) + { + close(info->fd); + info->fd = -1; + } + } + rfd_delete_base(rfd); } @@ -260,35 +243,36 @@ static void r_close (RSFD rfd) read from file to window if file is assocated with set - indicated by fname */ -static void r_reread (RSFD rfd) +static void r_reread(RSFD rfd) { - struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; + struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; if (info->fname) { size_t count; int r; - info->pos_border = ((struct rset_temp_rfd *)rfd)->pos_cur + + info->pos_border = mrfd->pos_cur + info->buf_size; if (info->pos_border > info->pos_end) info->pos_border = info->pos_end; count = info->pos_border - info->pos_buf; if (count > 0) { - if (lseek (info->fd, info->pos_buf, SEEK_SET) == -1) + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "lseek %s", info->fname); - exit (1); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd); + exit(1); } - if ((r = read (info->fd, info->buf_mem, count)) < (int) count) + if ((r = read(info->fd, info->buf_mem, count)) < (int) count) { if (r == -1) - logf (LOG_FATAL|LOG_ERRNO, "read %s", info->fname); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: read %s", info->fname); else - logf (LOG_FATAL, "read of %ld but got %ld", + yaz_log(YLOG_FATAL, "read of %ld but got %ld", (long) count, (long) r); - exit (1); + exit(1); } } } @@ -296,64 +280,48 @@ static void r_reread (RSFD rfd) info->pos_border = info->pos_end; } -static void r_rewind (RSFD rfd) -{ - struct rset_temp_info *info = ((struct rset_temp_rfd*)rfd)->info; - - r_flush (rfd, 0); - ((struct rset_temp_rfd *)rfd)->pos_cur = 0; - info->pos_buf = 0; - r_reread (rfd); - ((struct rset_temp_rfd *)rfd)->cur=0; -} - -/* -static int r_count (RSET ct) -{ - struct rset_temp_info *info = (struct rset_temp_info *) ct->buf; - - return info->pos_end / info->key_size; -} -*/ -static int r_read (RSFD rfd, void *buf) +static int r_read(RSFD rfd, void *buf, TERMID *term) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; - struct rset_temp_info *info = mrfd->info; + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; + struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; - size_t nc = mrfd->pos_cur + info->key_size; + size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; if (mrfd->pos_cur < info->pos_buf || nc > info->pos_border) { if (nc > info->pos_end) return 0; - r_flush (rfd, 0); + r_flush(rfd, 0); info->pos_buf = mrfd->pos_cur; - r_reread (rfd); + r_reread(rfd); } - memcpy (buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), - info->key_size); + memcpy(buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), + rfd->rset->keycontrol->key_size); + if (term) + *term = rfd->rset->term; + /* FIXME - should we store and return terms ?? */ mrfd->pos_cur = nc; mrfd->cur++; return 1; } -static int r_write (RSFD rfd, const void *buf) +static int r_write(RSFD rfd, const void *buf) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; - struct rset_temp_info *info = mrfd->info; + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; + struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; - size_t nc = mrfd->pos_cur + info->key_size; + size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; if (nc > info->pos_buf + info->buf_size) { - r_flush (rfd, 1); + r_flush(rfd, 1); info->pos_buf = mrfd->pos_cur; if (info->pos_buf < info->pos_end) - r_reread (rfd); + r_reread(rfd); } info->dirty = 1; - memcpy (info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, - info->key_size); + memcpy(info->buf_mem + (mrfd->pos_cur - info->pos_buf), buf, + rfd->rset->keycontrol->key_size); mrfd->pos_cur = nc; if (nc > info->pos_end) info->pos_border = info->pos_end = nc; @@ -361,9 +329,12 @@ static int r_write (RSFD rfd, const void *buf) return 1; } -static void r_pos (RSFD rfd, double *current, double *total) +static void r_pos(RSFD rfd, double *current, double *total) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; - *current=(double) mrfd->cur; - *total=(double) mrfd->info->hits; + /* struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd; */ + struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; + struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + + *current = (double) mrfd->cur; + *total = (double) info->hits; }