X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=rset%2Frstemp.c;h=c02121bc42c7f67fb6a48153ae6a96c568ae635e;hp=57e1bebbe7d9c016e2857628b4b9dabd4cdf5a68;hb=d02c4c703a93e0ad3f4ccde4519879f1f57a6824;hpb=f00e10dfcb19faeeabb42c5532f4b47f5548be97 diff --git a/rset/rstemp.c b/rset/rstemp.c index 57e1beb..c02121b 100644 --- a/rset/rstemp.c +++ b/rset/rstemp.c @@ -1,8 +1,5 @@ -/* $Id: rstemp.c,v 1.60 2005-01-17 01:21:44 adam Exp $ - Copyright (C) 1995-2005 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2011 Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -15,11 +12,14 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -27,12 +27,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include -#include +#include #include static RSFD r_open(RSET ct, int flag); @@ -44,23 +45,20 @@ 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 = +static const struct rset_control control = { "temp", r_delete, rset_get_one_term, r_open, r_close, - rset_default_forward, - r_pos, + 0, /* no forward */ + r_pos, r_read, r_write, }; -const struct rset_control *rset_kind_temp = &control; - -struct rset_temp_info { +struct rset_private { int fd; /* file descriptor for temp file */ char *fname; /* name of temp file */ char *buf_mem; /* window buffer */ @@ -69,11 +67,11 @@ struct rset_temp_info { size_t pos_buf; /* position of first byte in window */ size_t pos_border; /* position of last byte+1 in window */ int dirty; /* window is dirty */ - zint hits; /* no of hits */ + zint hits; /* no of hits */ char *temp_path; }; -struct rset_temp_rfd { +struct rfd_private { void *buf; size_t pos_cur; /* current position in set */ /* FIXME - term pos or what ?? */ @@ -83,17 +81,18 @@ struct rset_temp_rfd { 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 rset_create_temp(NMEM nmem, struct rset_key_control *kcontrol, + int scope, const char *temp_path, TERMID term) { - RSET rnew = rset_create_base(&control, nmem, kcontrol, scope,term); - struct rset_temp_info *info; + RSET rnew = rset_create_base(&control, nmem, kcontrol, scope, term, + 0, 0); + struct rset_private *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 = (struct rset_private *) nmem_malloc(rnew->nmem, sizeof(*info)); info->fd = -1; info->fname = NULL; info->buf_size = 4096; @@ -107,13 +106,13 @@ RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol, info->temp_path = NULL; else info->temp_path = nmem_strdup(rnew->nmem, temp_path); - rnew->priv = info; + rnew->priv = info; return rnew; } /* rstemp_create */ static void r_delete(RSET ct) { - struct rset_temp_info *info = (struct rset_temp_info*) ct->priv; + struct rset_private *info = (struct rset_private*) ct->priv; yaz_log(log_level, "r_delete: set size %ld", (long) info->pos_end); if (info->fname) @@ -125,9 +124,9 @@ static void r_delete(RSET ct) static RSFD r_open(RSET ct, int flag) { - struct rset_temp_info *info = (struct rset_temp_info *) ct->priv; + struct rset_private *info = (struct rset_private *) ct->priv; RSFD rfd; - struct rset_temp_rfd *prfd; + struct rfd_private *prfd; if (info->fd == -1 && info->fname) { @@ -138,16 +137,16 @@ static RSFD r_open(RSET ct, int flag) if (info->fd == -1) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open failed %s", info->fname); - exit(1); + zebra_exit("r_open"); } } rfd = rfd_create_base(ct); if (!rfd->priv) { - prfd = (struct rset_temp_rfd *) nmem_malloc(ct->nmem, sizeof(*prfd)); + prfd = (struct rfd_private *) 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); @@ -163,24 +162,28 @@ static RSFD r_open(RSET ct, int flag) */ static void r_flush(RSFD rfd, int mk) { - /* struct rset_temp_info *info = ((struct rset_temp_rfd*) rfd)->info; */ - struct rset_temp_info *info = rfd->rset->priv; + struct rset_private *info = rfd->rset->priv; if (!info->fname && mk) { #if HAVE_MKSTEMP char template[1024]; + + *template = '\0'; + if (info->temp_path) - sprintf(template, "%s/zrsXXXXXX", info->temp_path); - else - sprintf(template, "zrsXXXXXX"); + sprintf(template, "%s/", info->temp_path); + strcat(template, "zrs_"); +#if HAVE_UNISTD_H + sprintf(template + strlen(template), "%ld_", (long) getpid()); +#endif + strcat(template, "XXXXXX"); info->fd = mkstemp(template); - if (info->fd == -1) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: mkstemp %s", template); - exit(1); + zebra_exit("r_flush"); } info->fname = nmem_strdup(rfd->rset->nmem, template); #else @@ -192,7 +195,7 @@ static void r_flush(RSFD rfd, int mk) if (info->fd == -1) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: open %s", info->fname); - exit(1); + zebra_exit("r_flush"); } #endif } @@ -200,11 +203,11 @@ static void r_flush(RSFD rfd, int mk) { size_t count; int r; - + if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (1) %s", info->fname); - exit(1); + zebra_exit("r_flusxh"); } count = info->buf_size; if (count > info->pos_end - info->pos_buf) @@ -216,7 +219,7 @@ static void r_flush(RSFD rfd, int mk) else yaz_log(YLOG_FATAL, "rstemp: write of %ld but got %ld", (long) count, (long) r); - exit(1); + zebra_exit("r_flush"); } info->dirty = 0; } @@ -224,8 +227,7 @@ static void r_flush(RSFD rfd, int mk) static void r_close(RSFD rfd) { - /*struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; */ - struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; if (rfd_is_last(rfd)) { r_flush(rfd, 0); @@ -235,7 +237,6 @@ static void r_close(RSFD rfd) info->fd = -1; } } - rfd_delete_base(rfd); } @@ -245,8 +246,8 @@ static void r_close(RSFD rfd) */ static void r_reread(RSFD rfd) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; - struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; if (info->fname) { @@ -263,7 +264,7 @@ static void r_reread(RSFD rfd) if (lseek(info->fd, info->pos_buf, SEEK_SET) == -1) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "rstemp: lseek (2) %s fd=%d", info->fname, info->fd); - exit(1); + zebra_exit("r_reread"); } if ((r = read(info->fd, info->buf_mem, count)) < (int) count) { @@ -272,7 +273,7 @@ static void r_reread(RSFD rfd) else yaz_log(YLOG_FATAL, "read of %ld but got %ld", (long) count, (long) r); - exit(1); + zebra_exit("r_reread"); } } } @@ -282,8 +283,8 @@ static void r_reread(RSFD rfd) static int r_read(RSFD rfd, void *buf, TERMID *term) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; - struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; @@ -298,7 +299,7 @@ static int r_read(RSFD rfd, void *buf, TERMID *term) memcpy(buf, info->buf_mem + (mrfd->pos_cur - info->pos_buf), rfd->rset->keycontrol->key_size); if (term) - *term = rfd->rset->term; + *term = rfd->rset->term; /* FIXME - should we store and return terms ?? */ mrfd->pos_cur = nc; mrfd->cur++; @@ -307,8 +308,8 @@ static int r_read(RSFD rfd, void *buf, TERMID *term) static int r_write(RSFD rfd, const void *buf) { - struct rset_temp_rfd *mrfd = (struct rset_temp_rfd*) rfd->priv; - struct rset_temp_info *info = (struct rset_temp_info *)rfd->rset->priv; + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; size_t nc = mrfd->pos_cur + rfd->rset->keycontrol->key_size; @@ -331,10 +332,18 @@ static int r_write(RSFD rfd, const void *buf) static void r_pos(RSFD rfd, double *current, double *total) { - /* 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; - + struct rfd_private *mrfd = (struct rfd_private*) rfd->priv; + struct rset_private *info = (struct rset_private *)rfd->rset->priv; + *current = (double) mrfd->cur; *total = (double) info->hits; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +