* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 2000
- * Markus Armbruster, 2005-2006
+ * Markus Armbruster, 2005-2008
*/
#include <config.h>
static int ef_realloc_cache(struct empfile *, int);
static int fillcache(struct empfile *, int);
-static int do_write(struct empfile *, void *, int, int);
+static int do_write(struct empfile *, void *, int, int, time_t);
static void do_blank(struct empfile *, void *, int, int);
/*
* Open the file-backed table TYPE (EF_SECTOR, ...).
* HOW are flags to control operation. Naturally, immutable flags are
* not permitted.
+ * If NELT is non-negative, the table must have that many elements.
* Return non-zero on success, zero on failure.
* You must call ef_close() before the next ef_open().
*/
int
-ef_open(int type, int how)
+ef_open(int type, int how, int nelt)
{
struct empfile *ep;
struct flock lock;
return 0;
}
ep->fids = fsiz / ep->size;
+ if (nelt >= 0 && nelt != ep->fids) {
+ logerror("Can't open %s (got %d records instead of %d)",
+ ep->file, ep->fids, nelt);
+ close(fd);
+ return 0;
+ }
/* allocate cache */
if (ep->flags & EFF_STATIC) {
* allowed only with EFF_MEM. Assume the whole cash is dirty
* then.
*/
- if (ep->flags & EFF_MEM)
- return do_write(ep, ep->cache, ep->baseid, ep->cids) >= 0;
+ if (ep->flags & EFF_MEM) {
+ if (do_write(ep, ep->cache, ep->baseid, ep->cids, time(NULL)) < 0)
+ return 0;
+ }
return 1;
}
}
/*
- * Fill cache of EP with elements starting at ID.
+ * Fill cache of file-backed EP with elements starting at ID.
* If any were read, return their number.
* Else return -1 and leave the cache unchanged.
*/
static int
-fillcache(struct empfile *ep, int start)
+fillcache(struct empfile *ep, int id)
{
int n, ret;
char *p;
if (CANT_HAPPEN(ep->fd < 0 || !ep->cache))
return -1;
- if (lseek(ep->fd, start * ep->size, SEEK_SET) == (off_t)-1) {
- logerror("Error seeking %s (%s)", ep->file, strerror(errno));
+ if (lseek(ep->fd, id * ep->size, SEEK_SET) == (off_t)-1) {
+ logerror("Error seeking %s to elt %d (%s)",
+ ep->file, id, strerror(errno));
return -1;
}
p = ep->cache;
- n = ep->csize * ep->size;
+ n = MIN(ep->csize, ep->fids - id) * ep->size;
while (n > 0) {
ret = read(ep->fd, p, n);
if (ret < 0) {
- if (errno != EAGAIN) {
- logerror("Error reading %s (%s)", ep->file, strerror(errno));
+ if (errno != EINTR) {
+ logerror("Error reading %s elt %d (%s)",
+ ep->file,
+ id + (int)((p - ep->cache) / ep->size),
+ strerror(errno));
break;
}
} else if (ret == 0) {
+ logerror("Unexpected EOF reading %s elt %d",
+ ep->file, id + (int)((p - ep->cache) / ep->size));
break;
} else {
p += ret;
if (p == ep->cache)
return -1; /* nothing read, old cache still ok */
- ep->baseid = start;
+ ep->baseid = id;
ep->cids = (p - ep->cache) / ep->size;
return ep->cids;
}
/*
- * Write COUNT elements from BUF to EP, starting at ID.
- * Return 0 on success, -1 on error.
+ * Write COUNT elements starting at ID from BUF to file-backed EP.
+ * Set the timestamp to NOW if the table has those.
+ * Return 0 on success, -1 on error (file may be corrupt then).
*/
static int
-do_write(struct empfile *ep, void *buf, int id, int count)
+do_write(struct empfile *ep, void *buf, int id, int count, time_t now)
{
- int n, ret;
+ int i, n, ret;
char *p;
+ struct emptypedstr *elt;
if (CANT_HAPPEN(ep->fd < 0 || (ep->flags & EFF_PRIVATE)
|| id < 0 || count < 0))
return -1;
+ if (ep->flags & EFF_TYPED) {
+ for (i = 0; i < count; i++) {
+ /*
+ * TODO Oopses here could be due to bad data corruption.
+ * Fail instead of attempting to recover?
+ */
+ elt = (struct emptypedstr *)((char *)buf + i * ep->size);
+ if (CANT_HAPPEN(elt->ef_type != ep->uid))
+ elt->ef_type = ep->uid;
+ if (CANT_HAPPEN(elt->uid != id + i))
+ elt->uid = id + i;
+ elt->timestamp = now;
+ }
+ }
+
if (lseek(ep->fd, id * ep->size, SEEK_SET) == (off_t)-1) {
- logerror("Error seeking %s (%s)", ep->file, strerror(errno));
+ logerror("Error seeking %s to elt %d (%s)",
+ ep->file, id, strerror(errno));
return -1;
}
while (n > 0) {
ret = write(ep->fd, p, n);
if (ret < 0) {
- if (errno != EAGAIN) {
- logerror("Error writing %s (%s)", ep->file, strerror(errno));
- /* FIXME if this extended file, truncate back to old size */
+ if (errno != EINTR) {
+ logerror("Error writing %s elt %d (%s)",
+ ep->file,
+ id + (int)((p - (char *)buf) / ep->size),
+ strerror(errno));
return -1;
}
} else {
if (CANT_HAPPEN((ep->flags & EFF_MEM) ? id >= ep->fids : id > ep->fids))
return 0; /* not implemented */
if (!(ep->flags & EFF_PRIVATE)) {
- if (do_write(ep, from, id, 1) < 0)
+ if (do_write(ep, from, id, 1, time(NULL)) < 0)
return 0;
}
if (id >= ep->baseid && id < ep->baseid + ep->cids) {
struct empfile *ep;
char *p;
int i, id;
+ time_t now = time(NULL);
if (ef_check(type) < 0)
return 0;
p = ep->cache + id * ep->size;
do_blank(ep, p, id, count);
if (ep->fd >= 0 && !(ep->flags & EFF_PRIVATE)) {
- if (do_write(ep, p, id, count) < 0)
+ if (do_write(ep, p, id, count, now) < 0)
return 0;
}
ep->cids += count;
p = ep->cache + ep->cids * ep->size;
for (i = 0; i < count; i++) {
do_blank(ep, p, id + i, 1);
- if (do_write(ep, p, id + i, 1) < 0)
+ if (do_write(ep, p, id + i, 1, now) < 0)
return 0;
}
}
return 1;
}
+/*
+ * Initialize element ID for EP in BUF.
+ * FIXME pass buffer size!
+ */
+void
+ef_blank(int type, int id, void *buf)
+{
+ if (ef_check(type) < 0)
+ return;
+ do_blank(&empfile[type], buf, id, 1);
+}
+
/*
* Initialize COUNT elements of EP in BUF, starting with element ID.
*/
do_blank(struct empfile *ep, void *buf, int id, int count)
{
int i;
+ struct emptypedstr *elt;
memset(buf, 0, count * ep->size);
- if (ep->init) {
- for (i = 0; i < count; i++)
- ep->init(id + i, (char *)buf + i * ep->size);
+ if (ep->flags & EFF_TYPED) {
+ for (i = 0; i < count; i++) {
+ elt = (struct emptypedstr *)((char *)buf + i * ep->size);
+ elt->ef_type = ep->uid;
+ elt->uid = id + i;
+ }
}
}
+/*
+ * Truncate table TYPE to COUNT elements.
+ * Any pointers obtained from ef_ptr() become invalid.
+ * Return non-zero on success, zero on failure.
+ */
+int
+ef_truncate(int type, int count)
+{
+ struct empfile *ep;
+
+ if (ef_check(type) < 0)
+ return 0;
+ ep = &empfile[type];
+ if (CANT_HAPPEN(count < 0 || count > ep->fids))
+ return 0;
+
+ if (ep->fd >= 0 && !(ep->flags & EFF_PRIVATE)) {
+ if (ftruncate(ep->fd, count * ep->size) < 0) {
+ logerror("Can't truncate %s to %d elements (%s)",
+ ep->file, count, strerror(errno));
+ return 0;
+ }
+ }
+ ep->fids = count;
+
+ if (ep->flags & EFF_MEM) {
+ if (!(ep->flags & EFF_STATIC)) {
+ if (!ef_realloc_cache(ep, count)) {
+ logerror("Can't shrink cache after truncate");
+ /* continue with unshrunk cache */
+ }
+ }
+ ep->cids = count;
+ } else {
+ if (ep->baseid >= count)
+ ep->cids = 0;
+ else if (ep->cids > count - ep->baseid)
+ ep->cids = count - ep->baseid;
+ }
+
+ return 1;
+}
+
struct castr *
ef_cadef(int type)
{
projects / empserver / blobdiff