Remove the idea of limited reads and writes.

This commit is contained in:
Nigel Tao committed 2017-10-07 15:32:00 +11:00
1 parent a12292d094
commit d275b379a3
11 files changed
+48 -102

No files matched your search

+1 -2
View File
@@ -27,10 +27,9 @@ type template_args_short_read struct {
}
func template_short_read(b *buffer, args template_args_short_read) error {
b.printf("short_read_%s:\nif (a_%s.limit.ptr_to_len) {\nstatus = %sSUSPENSION_LIMITED_READ;\n} else if (a_%s.buf && a_%s.buf->closed) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n} else {\nstatus = %sSUSPENSION_SHORT_READ;\n}\ngoto suspend;\n",
b.printf("short_read_%s:\nif (a_%s.buf && a_%s.buf->closed && !a_%s.limit.ptr_to_len) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n}\nstatus = %sSUSPENSION_SHORT_READ;\ngoto suspend;\n",
args.name,
args.name,
args.PKGPREFIX,
args.name,
args.name,
args.PKGPREFIX,
+3 -5
View File
@@ -353,12 +353,10 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.printf("%s -= %srend_src - %srptr_src;\n", scratchName, bPrefix, bPrefix)
b.printf("%srptr_src = %srend_src;\n", bPrefix, bPrefix)
// TODO: is ptr_to_len the right check?
b.printf("if (%ssrc.limit.ptr_to_len) {", aPrefix)
b.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX)
b.printf("} else if (%ssrc.buf && %ssrc.buf->closed) {", aPrefix, aPrefix)
// TODO: goto short_read_src;
b.printf("if (%ssrc.buf && %ssrc.buf->closed && !%ssrc.limit.ptr_to_len) {", aPrefix, aPrefix, aPrefix)
b.printf("status = %sERROR_UNEXPECTED_EOF; goto exit;", g.PKGPREFIX)
b.printf("} else { status = %sSUSPENSION_SHORT_READ; } goto suspend;\n", g.PKGPREFIX)
b.printf("} status = %sSUSPENSION_SHORT_READ; goto suspend;\n", g.PKGPREFIX)
b.writes("}\n")
b.printf("%srptr_src += %s;\n", bPrefix, scratchName)
+2 -6
View File
@@ -9,14 +9,10 @@
template short_read(string qPKGPREFIXq, string qnameq) {
short_read_qnameq:
// TODO: is ptr_to_len the right check?
if (a_qnameq.limit.ptr_to_len) {
status = qPKGPREFIXqSUSPENSION_LIMITED_READ;
} else if (a_qnameq.buf && a_qnameq.buf->closed) {
if (a_qnameq.buf && a_qnameq.buf->closed && !a_qnameq.limit.ptr_to_len) {
status = qPKGPREFIXqERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = qPKGPREFIXqSUSPENSION_SHORT_READ;
}
status = qPKGPREFIXqSUSPENSION_SHORT_READ;
goto suspend;
}
+12 -31
View File
@@ -107,8 +107,6 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_FLATE_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_FLATE_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1157040128 // 0xbb08f800
@@ -490,7 +488,7 @@ bool puffs_flate_status_is_error(puffs_flate_status s) {
return s < 0;
}
const char* puffs_flate_status_strings0[11] = {
const char* puffs_flate_status_strings0[9] = {
"flate: ok",
"flate: bad puffs version",
"flate: bad receiver",
@@ -500,8 +498,6 @@ const char* puffs_flate_status_strings0[11] = {
"flate: unexpected EOF",
"flate: short read",
"flate: short write",
"flate: limited read",
"flate: limited write",
};
const char* puffs_flate_status_strings1[18] = {
@@ -531,7 +527,7 @@ const char* puffs_flate_status_string(puffs_flate_status s) {
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_flate_status_strings0;
n = 11;
n = 9;
break;
case puffs_flate_packageid:
a = puffs_flate_status_strings1;
@@ -985,14 +981,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1141,14 +1134,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1468,14 +1458,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1789,14 +1776,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -2247,13 +2231,10 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
goto suspend;
}
+16 -41
View File
@@ -107,8 +107,6 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_GIF_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_GIF_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_GIF_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
@@ -459,7 +457,7 @@ bool puffs_gif_status_is_error(puffs_gif_status s) {
return s < 0;
}
const char* puffs_gif_status_strings0[11] = {
const char* puffs_gif_status_strings0[9] = {
"gif: ok",
"gif: bad puffs version",
"gif: bad receiver",
@@ -469,8 +467,6 @@ const char* puffs_gif_status_strings0[11] = {
"gif: unexpected EOF",
"gif: short read",
"gif: short write",
"gif: limited read",
"gif: limited write",
};
const char* puffs_gif_status_strings1[7] = {
@@ -489,7 +485,7 @@ const char* puffs_gif_status_string(puffs_gif_status s) {
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_gif_status_strings0;
n = 11;
n = 9;
break;
case puffs_gif_packageid:
a = puffs_gif_status_strings1;
@@ -762,14 +758,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -851,14 +844,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -967,14 +957,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1043,14 +1030,11 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
self->private_impl.c_decode_extension[0].scratch -=
b_rend_src - b_rptr_src;
b_rptr_src = b_rend_src;
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
b_rptr_src += self->private_impl.c_decode_extension[0].scratch;
@@ -1086,14 +1070,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1249,14 +1230,11 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
@@ -1493,13 +1471,10 @@ exit:
return status;
short_read_src:
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf && a_src.buf->closed) {
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
} else {
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
goto suspend;
}
-2
View File
@@ -107,8 +107,6 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_FLATE_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_FLATE_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1157040128 // 0xbb08f800
-2
View File
@@ -107,8 +107,6 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_GIF_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_GIF_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_GIF_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
-2
View File
@@ -34,8 +34,6 @@ var StatusList = [...]Status{
{t.IDError, "unexpected EOF"}, // Used if reading when closed == true.
{t.IDSuspension, "short read"}, // Used if reading when closed == false.
{t.IDSuspension, "short write"},
{t.IDSuspension, "limited read"},
{t.IDSuspension, "limited write"},
}
var StatusMap = map[string]Status{}
-2
View File
@@ -204,7 +204,6 @@ pri func decoder.decode_uncompressed?(dst writer1, src reader1)() {
return error "internal error: inconsistent Huffman decoder state"
}
length -= n
// TODO: distinguish between short and limited writes?
// TODO: distinguish between reads and writes.
return suspension "short read"
}
@@ -365,7 +364,6 @@ pri func decoder.decode_huffman?(dst writer1, src reader1)() {
return error "internal error: inconsistent Huffman decoder state"
}
length -= n
// TODO: distinguish between short and limited writes?
return suspension "short write"
}
}
-1
View File
@@ -240,7 +240,6 @@ bool do_test_puffs_flate_history(int i,
puffs_flate_status got_s =
puffs_flate_decoder_decode(dec, dst_writer, src_reader);
// TODO: should want_s's SHORT_WRITE be LIMITED_WRITE?
if (got_s != want_s) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
": decode status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
+14 -8
View File
@@ -227,14 +227,17 @@ void test_puffs_gif_lzw_decode(const char* src_filename,
puffs_gif_lzw_decoder_decode(&dec, got_writer, src_reader);
if (src.ri == src.wi) {
if (status != PUFFS_GIF_STATUS_OK) {
FAIL("status: got %d, want %d", status, PUFFS_GIF_STATUS_OK);
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_gif_status_string(status), PUFFS_GIF_STATUS_OK,
puffs_gif_status_string(PUFFS_GIF_STATUS_OK));
return;
}
break;
}
if (status != PUFFS_GIF_SUSPENSION_LIMITED_READ) {
FAIL("status: got %d, want %d", status,
PUFFS_GIF_SUSPENSION_LIMITED_READ);
if (status != PUFFS_GIF_SUSPENSION_SHORT_READ) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_gif_status_string(status), PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ));
return;
}
if (src.ri < old_ri) {
@@ -329,7 +332,7 @@ void bench_puffs_gif_lzw_decode(const char* filename, uint64_t reps) {
puffs_gif_status s =
puffs_gif_lzw_decoder_decode(&dec, dst_writer, src_reader);
if (s) {
FAIL("decode: %s", puffs_gif_status_string(s));
FAIL("decode: %" PRIi32 " (%s)", s, puffs_gif_status_string(s));
return;
}
n_bytes += dst.wi;
@@ -387,13 +390,16 @@ void test_puffs_gif_decode(const char* filename,
puffs_gif_decoder_decode(&dec, got_writer, src_reader);
if ((src.ri == src.wi) || puffs_gif_status_is_error(got)) {
if (got != want) {
FAIL("status: got %d, want %d", got, want);
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", got,
puffs_gif_status_string(got), want, puffs_gif_status_string(want));
return;
}
break;
}
if (got != PUFFS_GIF_SUSPENSION_LIMITED_READ) {
FAIL("status: got %d, want %d", got, PUFFS_GIF_SUSPENSION_LIMITED_READ);
if (got != PUFFS_GIF_SUSPENSION_SHORT_READ) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", got,
puffs_gif_status_string(got), PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ));
return;
}
if (src.ri < old_ri) {