#undef LOCAL_DEBUG
-#include "ucw/lib.h"
-#include "ucw/fastbuf.h"
-#include "ucw/respool.h"
-#include "ucw/trans.h"
-#include "ucw/stkstring.h"
+#include <ucw/lib.h>
+#include <ucw/fastbuf.h>
+#include <ucw/resource.h>
+#include <ucw/trans.h>
+#include <ucw/stkstring.h>
#include <stdio.h>
#include <stdlib.h>
if (f)
{
bflush(f);
- if (f->res)
- {
- res_drop(f->res);
- f->res = NULL;
- }
+ res_detach(f->res);
DBG("FB: closing", f);
if (f->close)
f->close(f); /* Should always free all internal resources, even if it throws an exception */
void NONRET bthrow(struct fastbuf *f, const char *id, const char *fmt, ...)
{
+ DBG("FB: throwing %s", full_id);
+ char full_id[16];
+ snprintf(full_id, sizeof(full_id), "ucw.fb.%s", id);
ASSERT(!(f->flags & FB_DEAD)); /* Only one bthrow() is allowed before bclose() */
- DBG("FB: throwing %s", id);
va_list args;
va_start(args, fmt);
if (!f->res)
die("Fastbuf %s error: %s", f->name ? : "<fb>", stk_vprintf(fmt, args));
f->flags |= FB_DEAD;
f->bptr = f->bstop = f->bufend; /* Reset the buffer to guard consecutive seek/read/write */
- trans_vthrow(id, f, fmt, args);
+ trans_vthrow(full_id, f, fmt, args);
}
int brefill(struct fastbuf *f, int allow_eof)
DBG("FB: refill");
ASSERT(!(f->flags & FB_DEAD) && f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
if (!f->refill)
- bthrow(f, "fb.read", "Stream not readable");
+ bthrow(f, "read", "Stream not readable");
if (f->refill(f))
{
ASSERT(f->buffer <= f->bptr && f->bptr < f->bstop && f->bstop <= f->bufend);
{
ASSERT(f->buffer <= f->bptr && f->bptr == f->bstop && f->bstop <= f->bufend);
if (!allow_eof && (f->flags & FB_DIE_ON_EOF))
- bthrow(f, "fb.eof", "Unexpected EOF");
+ bthrow(f, "eof", "Unexpected EOF");
return 0;
}
}
DBG("FB: spout");
ASSERT(!(f->flags & FB_DEAD) && f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend); /* Check write mode possibly with unflushed data */
if (!f->spout)
- bthrow(f, "fb.write", "Stream not writeable");
+ bthrow(f, "write", "Stream not writeable");
f->spout(f);
ASSERT(f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
}
bflush(f);
DBG("FB: seeking to pos=%lld whence=%d %p %p %p %p", (long long)pos, whence, f->buffer, f->bstop, f->bptr, f->bufend);
if (!f->seek || !f->seek(f, pos, whence))
- bthrow(f, "fb.seek", "Stream not seekable");
+ bthrow(f, "seek", "Stream not seekable");
DBG("FB: seeked %p %p %p %p", f->buffer, f->bstop, f->bptr, f->bufend);
ASSERT(f->buffer <= f->bstop && f->bstop <= f->bptr && f->bptr <= f->bufend);
if (whence == SEEK_SET)
ASSERT(btell(f) >= 0);
}
-inline void bsetpos(struct fastbuf *f, ucw_off_t pos)
+void bsetpos(struct fastbuf *f, ucw_off_t pos)
{
/* We can optimize seeks only when reading */
if (f->bptr < f->bstop && pos <= f->pos && pos >= f->pos - (f->bstop - f->buffer)) /* If bptr == bstop, then [buffer, bstop] may be undefined */
else if (pos != btell(f))
{
if (pos < 0)
- bthrow(f, "fb.seek", "Seek out of range");
+ bthrow(f, "seek", "Seek out of range");
do_seek(f, pos, SEEK_SET);
}
}
break;
case SEEK_END:
if (pos > 0)
- bthrow(f, "fb.seek", "Seek out of range");
+ bthrow(f, "seek", "Seek out of range");
do_seek(f, pos, SEEK_END);
break;
default:
return f->bptr >= f->bstop && !brefill(f, 1);
}
-void bputc_slow(struct fastbuf *f, uns c)
+void bputc_slow(struct fastbuf *f, uint c)
{
if (f->bptr >= f->bufend)
bspout(f);
*f->bptr++ = c;
}
-uns bread_slow(struct fastbuf *f, void *b, uns l, uns check)
+uint bread_slow(struct fastbuf *f, void *b, uint l, uint check)
{
- uns total = 0;
+ uint total = 0;
while (l)
{
- uns k = f->bstop - f->bptr;
+ uint k = f->bstop - f->bptr;
if (!k)
{
total += k;
}
if (check && total && l)
- bthrow(f, "fb.read", "breadb: short read");
+ bthrow(f, "eof", "breadb: short read");
return total;
}
-void bwrite_slow(struct fastbuf *f, const void *b, uns l)
+void bwrite_slow(struct fastbuf *f, const void *b, uint l)
{
while (l)
{
- uns k = f->bufend - f->bptr;
+ uint k = f->bufend - f->bptr;
if (!k)
{
}
}
-void bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uns l)
+void bbcopy_slow(struct fastbuf *f, struct fastbuf *t, uint l)
{
while (l)
{
byte *fptr, *tptr;
- uns favail, tavail, n;
+ uint favail, tavail, n;
favail = bdirect_read_prepare(f, &fptr);
if (!favail)
{
if (l == ~0U)
return;
- bthrow(f, "fb.read", "bbcopy: source exhausted");
+ bthrow(f, "eof", "bbcopy: source exhausted");
}
tavail = bdirect_write_prepare(t, &tptr);
n = MIN(l, favail);
}
}
-int bconfig(struct fastbuf *f, uns item, int value)
+int bconfig(struct fastbuf *f, uint item, int value)
{
return (f->config && !(f->flags & FB_DEAD)) ? f->config(f, item, value) : -1;
}
bsetpos(f, 0);
}
-int bskip_slow(struct fastbuf *f, uns len)
+int bskip_slow(struct fastbuf *f, uint len)
{
while (len)
{
byte *buf;
- uns l = bdirect_read_prepare(f, &buf);
+ uint l = bdirect_read_prepare(f, &buf);
if (!l)
return 0;
l = MIN(l, len);
bclose(f);
}
-static void fb_res_dump(struct resource *r)
+static void fb_res_dump(struct resource *r, uint indent UNUSED)
{
struct fastbuf *f = r->priv;
- printf(" name=%s", f->name);
+ printf(" name=%s\n", f->name);
}
static const struct res_class fb_res_class = {