Rename buf1, reader1, etc to io_buffer, io_reader

Also remove the unused Buf1, Buf2 and Usize tokens.
This commit is contained in:
Nigel Tao committed 2018-04-05 20:49:48 +10:00
1 parent 82a48796c8
commit 97aab37462
46 files changed
+823 -847

No files matched your search

+24 -24
View File
@@ -18,22 +18,22 @@
#ifdef WUFFS_MIMICLIB_USE_MINIZ_INSTEAD_OF_ZLIB
#include "/path/to/your/copy/of/github.com/richgel999/miniz/miniz_tinfl.c"
const char* mimic_bench_adler32(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return "miniz does not independently compute Adler32";
}
const char* mimic_bench_crc32_ieee(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return "miniz does not implement CRC32/IEEE";
}
const char* mimic_deflate_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_deflate_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit,
bool deflate_instead_of_zlib) {
@@ -53,22 +53,22 @@ const char* mimic_deflate_zlib_decode(wuffs_base__buf1* dst,
return NULL;
}
const char* mimic_deflate_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_zlib_decode(dst, src, wlimit, rlimit, true);
}
const char* mimic_gzip_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return "miniz does not implement gzip";
}
const char* mimic_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_zlib_decode(dst, src, wlimit, rlimit, false);
@@ -79,8 +79,8 @@ const char* mimic_zlib_decode(wuffs_base__buf1* dst,
uint32_t global_mimiclib_deflate_unused_u32;
const char* mimic_bench_adler32(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
@@ -94,8 +94,8 @@ const char* mimic_bench_adler32(wuffs_base__buf1* dst,
return NULL;
}
const char* mimic_bench_crc32_ieee(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
@@ -115,8 +115,8 @@ typedef enum {
zlib_flavor_zlib,
} zlib_flavor;
const char* mimic_deflate_gzip_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_deflate_gzip_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit,
zlib_flavor flavor) {
@@ -184,24 +184,24 @@ cleanup0:;
return ret;
}
const char* mimic_deflate_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
zlib_flavor_raw);
}
const char* mimic_gzip_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
zlib_flavor_gzip);
}
const char* mimic_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* mimic_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
return mimic_deflate_gzip_zlib_decode(dst, src, wlimit, rlimit,
+3 -2
View File
@@ -15,7 +15,7 @@
#include "gif_lib.h"
int mimic_gif_read_func(GifFileType* f, GifByteType* ptr, int len) {
wuffs_base__buf1* src = (wuffs_base__buf1*)(f->UserData);
wuffs_base__io_buffer* src = (wuffs_base__io_buffer*)(f->UserData);
if (len < 0) {
return 0;
}
@@ -29,7 +29,8 @@ int mimic_gif_read_func(GifFileType* f, GifByteType* ptr, int len) {
return n;
}
const char* mimic_gif_decode(wuffs_base__buf1* dst, wuffs_base__buf1* src) {
const char* mimic_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src) {
const char* ret = NULL;
// http://giflib.sourceforge.net/gif_lib.html#compatibility says that "A few
+11 -9
View File
@@ -98,7 +98,7 @@ void test_wuffs_crc32_ieee_golden() {
int i;
for (i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); i++) {
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, test_cases[i].filename)) {
return;
}
@@ -165,8 +165,8 @@ void test_wuffs_crc32_ieee_pi() {
uint32_t global_wuffs_crc32_unused_u32;
const char* wuffs_bench_crc32_ieee(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* wuffs_bench_crc32_ieee(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
@@ -183,13 +183,14 @@ const char* wuffs_bench_crc32_ieee(wuffs_base__buf1* dst,
void bench_wuffs_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_bench_crc32_ieee, tc_src, &crc32_midsummer_gt, 0, 0,
150000);
do_bench_io_buffers(wuffs_bench_crc32_ieee, tc_src, &crc32_midsummer_gt, 0, 0,
150000);
}
void bench_wuffs_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0, 15000);
do_bench_io_buffers(wuffs_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0,
15000);
}
// ---------------- Mimic Benches
@@ -198,13 +199,14 @@ void bench_wuffs_crc32_ieee_100k() {
void bench_mimic_crc32_ieee_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_bench_crc32_ieee, tc_src, &crc32_midsummer_gt, 0, 0,
150000);
do_bench_io_buffers(mimic_bench_crc32_ieee, tc_src, &crc32_midsummer_gt, 0, 0,
150000);
}
void bench_mimic_crc32_ieee_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0, 15000);
do_bench_io_buffers(mimic_bench_crc32_ieee, tc_src, &crc32_pi_gt, 0, 0,
15000);
}
#endif // WUFFS_MIMIC
+53 -53
View File
@@ -107,8 +107,8 @@ golden_test deflate_romeo_fixed_gt = {
// ---------------- Deflate Tests
const char* wuffs_deflate_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* wuffs_deflate_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_deflate__decoder dec;
@@ -116,12 +116,12 @@ const char* wuffs_deflate_decode(wuffs_base__buf1* dst,
uint64_t wlim = 0;
uint64_t rlim = 0;
while (true) {
wuffs_base__writer1 dst_writer = {.buf = dst};
wuffs_base__io_writer dst_writer = {.buf = dst};
if (wlimit) {
wlim = wlimit;
dst_writer.private_impl.limit.ptr_to_len = &wlim;
}
wuffs_base__reader1 src_reader = {.buf = src};
wuffs_base__io_reader src_reader = {.buf = src};
if (rlimit) {
rlim = rlimit;
src_reader.private_impl.limit.ptr_to_len = &rlim;
@@ -143,62 +143,62 @@ const char* wuffs_deflate_decode(wuffs_base__buf1* dst,
void test_wuffs_deflate_decode_256_bytes() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_256_bytes_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_256_bytes_gt, 0, 0);
}
void test_wuffs_deflate_decode_deflate_backref_crosses_blocks() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode,
&deflate_deflate_backref_crosses_blocks_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode,
&deflate_deflate_backref_crosses_blocks_gt, 0, 0);
}
void test_wuffs_deflate_decode_deflate_distance_32768() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_deflate_distance_32768_gt, 0,
0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_deflate_distance_32768_gt,
0, 0);
}
void test_wuffs_deflate_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_midsummer_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_midsummer_gt, 0, 0);
}
void test_wuffs_deflate_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_pi_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_pi_gt, 0, 0);
}
void test_wuffs_deflate_decode_pi_many_big_reads() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_pi_gt, 0, 4096);
do_test_io_buffers(wuffs_deflate_decode, &deflate_pi_gt, 0, 4096);
}
void test_wuffs_deflate_decode_pi_many_medium_reads() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_pi_gt, 0, 599);
do_test_io_buffers(wuffs_deflate_decode, &deflate_pi_gt, 0, 599);
}
void test_wuffs_deflate_decode_pi_many_small_writes_reads() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_pi_gt, 59, 61);
do_test_io_buffers(wuffs_deflate_decode, &deflate_pi_gt, 59, 61);
}
void test_wuffs_deflate_decode_romeo() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_romeo_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_romeo_gt, 0, 0);
}
void test_wuffs_deflate_decode_romeo_fixed() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_deflate_decode, &deflate_romeo_fixed_gt, 0, 0);
do_test_io_buffers(wuffs_deflate_decode, &deflate_romeo_fixed_gt, 0, 0);
}
void test_wuffs_deflate_decode_split_src() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
golden_test* gt = &deflate_256_bytes_gt;
if (!read_file(&src, gt->src_filename)) {
@@ -209,8 +209,8 @@ void test_wuffs_deflate_decode_split_src() {
}
wuffs_deflate__decoder dec;
wuffs_base__writer1 dst_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_writer dst_writer = {.buf = &got};
wuffs_base__io_reader src_reader = {.buf = &src};
int i;
for (i = 1; i < 32; i++) {
@@ -252,7 +252,7 @@ void test_wuffs_deflate_decode_split_src() {
char prefix[64];
snprintf(prefix, 64, "i=%d: ", i);
if (!buf1s_equal(prefix, &got, &want)) {
if (!io_buffers_equal(prefix, &got, &want)) {
return;
}
}
@@ -260,8 +260,8 @@ void test_wuffs_deflate_decode_split_src() {
bool do_test_wuffs_deflate_history(int i,
golden_test* gt,
wuffs_base__buf1* src,
wuffs_base__buf1* got,
wuffs_base__io_buffer* src,
wuffs_base__io_buffer* got,
wuffs_deflate__decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
@@ -272,8 +272,8 @@ bool do_test_wuffs_deflate_history(int i,
got->wi = 0;
wuffs_deflate__decoder__initialize(dec, WUFFS_VERSION, 0);
wuffs_base__writer1 dst_writer = {.buf = got};
wuffs_base__reader1 src_reader = {.buf = src};
wuffs_base__io_writer dst_writer = {.buf = got};
wuffs_base__io_reader src_reader = {.buf = src};
dec->private_impl.f_history_index = starting_history_index;
@@ -294,9 +294,9 @@ bool do_test_wuffs_deflate_history(int i,
void test_wuffs_deflate_history_full() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
golden_test* gt = &deflate_pi_gt;
if (!read_file(&src, gt->src_filename)) {
@@ -327,7 +327,7 @@ void test_wuffs_deflate_history_full() {
continue;
}
wuffs_base__buf1 history_got = {
wuffs_base__io_buffer history_got = {
.ptr = dec.private_impl.f_history,
.len = full_history_size,
.wi = full_history_size,
@@ -336,12 +336,12 @@ void test_wuffs_deflate_history_full() {
FAIL("i=%d: want file is too short", i);
return;
}
wuffs_base__buf1 history_want = {
wuffs_base__io_buffer history_want = {
.ptr = global_want_buffer + want.wi - (full_history_size - i),
.len = full_history_size,
.wi = full_history_size,
};
if (!buf1s_equal("", &history_got, &history_want)) {
if (!io_buffers_equal("", &history_got, &history_want)) {
return;
}
}
@@ -350,8 +350,8 @@ void test_wuffs_deflate_history_full() {
void test_wuffs_deflate_history_partial() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
golden_test* gt = &deflate_pi_gt;
if (!read_file(&src, gt->src_filename)) {
@@ -544,39 +544,39 @@ void test_wuffs_deflate_table_redirect() {
void test_mimic_deflate_decode_256_bytes() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_256_bytes_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode, &deflate_256_bytes_gt, 0, 0);
}
void test_mimic_deflate_decode_deflate_backref_crosses_blocks() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode,
&deflate_deflate_backref_crosses_blocks_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode,
&deflate_deflate_backref_crosses_blocks_gt, 0, 0);
}
void test_mimic_deflate_decode_deflate_distance_32768() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_deflate_distance_32768_gt, 0,
0);
do_test_io_buffers(mimic_deflate_decode, &deflate_deflate_distance_32768_gt,
0, 0);
}
void test_mimic_deflate_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_midsummer_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode, &deflate_midsummer_gt, 0, 0);
}
void test_mimic_deflate_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_pi_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode, &deflate_pi_gt, 0, 0);
}
void test_mimic_deflate_decode_romeo() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_romeo_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode, &deflate_romeo_gt, 0, 0);
}
void test_mimic_deflate_decode_romeo_fixed() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_deflate_decode, &deflate_romeo_fixed_gt, 0, 0);
do_test_io_buffers(mimic_deflate_decode, &deflate_romeo_fixed_gt, 0, 0);
}
#endif // WUFFS_MIMIC
@@ -585,19 +585,19 @@ void test_mimic_deflate_decode_romeo_fixed() {
void bench_wuffs_deflate_decode_1k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_deflate_decode, tc_dst, &deflate_romeo_gt, 0, 0,
200000);
do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_romeo_gt, 0, 0,
200000);
}
void bench_wuffs_deflate_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_deflate_decode, tc_dst, &deflate_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_midsummer_gt, 0, 0,
30000);
}
void bench_wuffs_deflate_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0, 3000);
do_bench_io_buffers(wuffs_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0, 3000);
}
// ---------------- Mimic Benches
@@ -606,19 +606,19 @@ void bench_wuffs_deflate_decode_100k() {
void bench_mimic_deflate_decode_1k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_deflate_decode, tc_dst, &deflate_romeo_gt, 0, 0,
200000);
do_bench_io_buffers(mimic_deflate_decode, tc_dst, &deflate_romeo_gt, 0, 0,
200000);
}
void bench_mimic_deflate_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_deflate_decode, tc_dst, &deflate_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(mimic_deflate_decode, tc_dst, &deflate_midsummer_gt, 0, 0,
30000);
}
void bench_mimic_deflate_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0, 3000);
do_bench_io_buffers(mimic_deflate_decode, tc_dst, &deflate_pi_gt, 0, 0, 3000);
}
#endif // WUFFS_MIMIC
+49 -45
View File
@@ -51,7 +51,7 @@ the first "./a.out" with "./a.out -bench". Combine these changes with the
void test_basic_bad_receiver() {
CHECK_FOCUS(__func__);
wuffs_base__image_config ic = {{0}};
wuffs_base__reader1 src = {0};
wuffs_base__io_reader src = {0};
wuffs_gif__status status = wuffs_gif__decoder__decode_config(NULL, &ic, src);
if (status != WUFFS_GIF__ERROR_BAD_RECEIVER) {
FAIL("decode_config: got %d, want %d", status,
@@ -63,7 +63,7 @@ void test_basic_initializer_not_called() {
CHECK_FOCUS(__func__);
wuffs_gif__decoder dec = {{0}};
wuffs_base__image_config ic = {{0}};
wuffs_base__reader1 src = {0};
wuffs_base__io_reader src = {0};
wuffs_gif__status status = wuffs_gif__decoder__decode_config(&dec, &ic, src);
if (status != WUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED) {
FAIL("decode_config: got %d, want %d", status,
@@ -177,9 +177,9 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
uint64_t want_size,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, src_filename)) {
return false;
@@ -212,12 +212,12 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
uint64_t rlim = 0;
while (true) {
num_iters++;
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__io_writer got_writer = {.buf = &got};
if (wlimit) {
wlim = wlimit;
got_writer.private_impl.limit.ptr_to_len = &wlim;
}
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
if (rlimit) {
rlim = rlimit;
src_reader.private_impl.limit.ptr_to_len = &rlim;
@@ -272,7 +272,7 @@ bool do_test_wuffs_lzw_decode(const char* src_filename,
}
}
return buf1s_equal("", &got, &want);
return io_buffers_equal("", &got, &want);
}
void test_wuffs_lzw_decode_many_big_reads() {
@@ -308,10 +308,10 @@ void test_wuffs_lzw_decode_pi() {
// ---------------- LZW Benches
bool do_bench_wuffs_lzw_decode(const char* filename, uint64_t reps) {
wuffs_base__buf1 dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__writer1 dst_writer = {.buf = &dst};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_writer dst_writer = {.buf = &dst};
wuffs_base__io_reader src_reader = {.buf = &src};
if (!read_file(&src, filename)) {
return false;
@@ -358,12 +358,13 @@ void bench_wuffs_lzw_decode_100k() {
// ---------------- GIF Tests
const char* wuffs_gif_decode(wuffs_base__buf1* dst, wuffs_base__buf1* src) {
const char* wuffs_gif_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src) {
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__image_config ic = {{0}};
wuffs_base__writer1 dst_writer = {.buf = dst};
wuffs_base__reader1 src_reader = {.buf = src};
wuffs_base__io_writer dst_writer = {.buf = dst};
wuffs_base__io_reader src_reader = {.buf = src};
wuffs_gif__status s =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (s) {
@@ -381,8 +382,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
const char* indexes_filename,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, filename)) {
return false;
@@ -393,7 +394,7 @@ bool do_test_wuffs_gif_decode(const char* filename,
{
wuffs_base__image_config ic = {{0}};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
if (status != WUFFS_GIF__STATUS_OK) {
@@ -432,12 +433,12 @@ bool do_test_wuffs_gif_decode(const char* filename,
uint64_t rlim = 0;
while (true) {
num_iters++;
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__io_writer got_writer = {.buf = &got};
if (wlimit) {
wlim = wlimit;
got_writer.private_impl.limit.ptr_to_len = &wlim;
}
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
if (rlimit) {
rlim = rlimit;
src_reader.private_impl.limit.ptr_to_len = &rlim;
@@ -489,21 +490,24 @@ bool do_test_wuffs_gif_decode(const char* filename,
}
// TODO: provide a public API for getting the palette.
wuffs_base__buf1 pal_got = {.ptr = dec.private_impl.f_gct, .len = 3 * 256};
wuffs_base__buf1 pal_want = {.ptr = global_palette_buffer, .len = 3 * 256};
wuffs_base__io_buffer pal_got = {.ptr = dec.private_impl.f_gct,
.len = 3 * 256};
wuffs_base__io_buffer pal_want = {.ptr = global_palette_buffer,
.len = 3 * 256};
pal_got.wi = 3 * 256;
if (!read_file(&pal_want, palette_filename)) {
return false;
}
if (!buf1s_equal("palette ", &pal_got, &pal_want)) {
if (!io_buffers_equal("palette ", &pal_got, &pal_want)) {
return false;
}
wuffs_base__buf1 ind_want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer ind_want = {.ptr = global_want_buffer,
.len = BUFFER_SIZE};
if (!read_file(&ind_want, indexes_filename)) {
return false;
}
if (!buf1s_equal("indexes ", &got, &ind_want)) {
if (!io_buffers_equal("indexes ", &got, &ind_want)) {
return false;
}
@@ -512,8 +516,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
FAIL("decode_frame returned \"ok\" but src was exhausted");
return false;
}
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_writer got_writer = {.buf = &got};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_frame(&dec, got_writer, src_reader);
if (status != WUFFS_GIF__SUSPENSION_END_OF_DATA) {
@@ -534,8 +538,8 @@ bool do_test_wuffs_gif_decode(const char* filename,
void test_wuffs_gif_call_sequence() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, "../../data/bricks-dither.gif")) {
return;
@@ -544,8 +548,8 @@ void test_wuffs_gif_call_sequence() {
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_writer got_writer = {.buf = &got};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_frame(&dec, got_writer, src_reader);
@@ -561,8 +565,8 @@ void test_wuffs_gif_call_sequence() {
void test_wuffs_gif_decode_animated() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, "../../data/animated-red-blue.gif")) {
return;
@@ -572,8 +576,8 @@ void test_wuffs_gif_decode_animated() {
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__image_config ic = {{0}};
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_writer got_writer = {.buf = &got};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
@@ -657,7 +661,7 @@ void test_wuffs_gif_decode_input_is_a_gif_many_small_writes_reads() {
void test_wuffs_gif_decode_input_is_a_png() {
CHECK_FOCUS(__func__);
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, "../../data/bricks-dither.png")) {
return;
@@ -666,7 +670,7 @@ void test_wuffs_gif_decode_input_is_a_png() {
wuffs_gif__decoder dec;
wuffs_gif__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_base__image_config ic = {{0}};
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
wuffs_gif__status status =
wuffs_gif__decoder__decode_config(&dec, &ic, src_reader);
@@ -683,13 +687,13 @@ void test_wuffs_gif_decode_input_is_a_png() {
#ifdef WUFFS_MIMIC
bool do_test_mimic_gif_decode(const char* filename) {
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, filename)) {
return false;
}
src.ri = 0;
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
const char* got_msg = wuffs_gif_decode(&got, &src);
if (got_msg) {
FAIL("%s", got_msg);
@@ -697,14 +701,14 @@ bool do_test_mimic_gif_decode(const char* filename) {
}
src.ri = 0;
wuffs_base__buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
const char* want_msg = mimic_gif_decode(&want, &src);
if (want_msg) {
FAIL("%s", want_msg);
return false;
}
if (!buf1s_equal("", &got, &want)) {
if (!io_buffers_equal("", &got, &want)) {
return false;
}
@@ -752,12 +756,12 @@ void test_mimic_gif_decode_pjw_thumbnail() {
// ---------------- GIF Benches
bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__buf1*,
wuffs_base__buf1*),
bool do_bench_gif_decode(const char* (*decode_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*),
const char* filename,
uint64_t reps) {
wuffs_base__buf1 dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer dst = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, filename)) {
return false;
+18 -18
View File
@@ -62,8 +62,8 @@ golden_test gzip_pi_gt = {
// ---------------- Gzip Tests
const char* wuffs_gzip_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* wuffs_gzip_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_gzip__decoder dec;
@@ -72,12 +72,12 @@ const char* wuffs_gzip_decode(wuffs_base__buf1* dst,
uint64_t wlim = 0;
uint64_t rlim = 0;
while (true) {
wuffs_base__writer1 dst_writer = {.buf = dst};
wuffs_base__io_writer dst_writer = {.buf = dst};
if (wlimit) {
wlim = wlimit;
dst_writer.private_impl.limit.ptr_to_len = &wlim;
}
wuffs_base__reader1 src_reader = {.buf = src};
wuffs_base__io_reader src_reader = {.buf = src};
if (rlimit) {
rlim = rlimit;
src_reader.private_impl.limit.ptr_to_len = &rlim;
@@ -98,8 +98,8 @@ const char* wuffs_gzip_decode(wuffs_base__buf1* dst,
}
bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, gzip_midsummer_gt.src_filename)) {
return false;
@@ -120,9 +120,9 @@ bool do_test_wuffs_gzip_checksum(bool ignore_checksum, uint32_t bad_checksum) {
wuffs_gzip__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_gzip__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.wi = 0;
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__io_writer got_writer = {.buf = &got};
src.ri = 0;
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
// or isn't zero.
@@ -182,12 +182,12 @@ void test_wuffs_gzip_checksum_verify_good() {
void test_wuffs_gzip_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_gzip_decode, &gzip_midsummer_gt, 0, 0);
do_test_io_buffers(wuffs_gzip_decode, &gzip_midsummer_gt, 0, 0);
}
void test_wuffs_gzip_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_gzip_decode, &gzip_pi_gt, 0, 0);
do_test_io_buffers(wuffs_gzip_decode, &gzip_pi_gt, 0, 0);
}
// ---------------- Mimic Tests
@@ -196,12 +196,12 @@ void test_wuffs_gzip_decode_pi() {
void test_mimic_gzip_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_gzip_decode, &gzip_midsummer_gt, 0, 0);
do_test_io_buffers(mimic_gzip_decode, &gzip_midsummer_gt, 0, 0);
}
void test_mimic_gzip_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_gzip_decode, &gzip_pi_gt, 0, 0);
do_test_io_buffers(mimic_gzip_decode, &gzip_pi_gt, 0, 0);
}
#endif // WUFFS_MIMIC
@@ -210,13 +210,13 @@ void test_mimic_gzip_decode_pi() {
void bench_wuffs_gzip_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0,
30000);
}
void bench_wuffs_gzip_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 3000);
do_bench_io_buffers(wuffs_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 3000);
}
// ---------------- Mimic Benches
@@ -225,13 +225,13 @@ void bench_wuffs_gzip_decode_100k() {
void bench_mimic_gzip_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(mimic_gzip_decode, tc_dst, &gzip_midsummer_gt, 0, 0,
30000);
}
void bench_mimic_gzip_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 3000);
do_bench_io_buffers(mimic_gzip_decode, tc_dst, &gzip_pi_gt, 0, 0, 3000);
}
#endif // WUFFS_MIMIC
+27 -27
View File
@@ -124,7 +124,7 @@ void test_wuffs_adler32_golden() {
int i;
for (i = 0; i < WUFFS_TESTLIB_ARRAY_SIZE(test_cases); i++) {
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, test_cases[i].filename)) {
return;
}
@@ -189,8 +189,8 @@ void test_wuffs_adler32_pi() {
// ---------------- Zlib Tests
const char* wuffs_zlib_decode(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* wuffs_zlib_decode(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
wuffs_zlib__decoder dec;
@@ -199,12 +199,12 @@ const char* wuffs_zlib_decode(wuffs_base__buf1* dst,
uint64_t wlim = 0;
uint64_t rlim = 0;
while (true) {
wuffs_base__writer1 dst_writer = {.buf = dst};
wuffs_base__io_writer dst_writer = {.buf = dst};
if (wlimit) {
wlim = wlimit;
dst_writer.private_impl.limit.ptr_to_len = &wlim;
}
wuffs_base__reader1 src_reader = {.buf = src};
wuffs_base__io_reader src_reader = {.buf = src};
if (rlimit) {
rlim = rlimit;
src_reader.private_impl.limit.ptr_to_len = &rlim;
@@ -225,8 +225,8 @@ const char* wuffs_zlib_decode(wuffs_base__buf1* dst,
}
bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
if (!read_file(&src, zlib_midsummer_gt.src_filename)) {
return false;
@@ -246,9 +246,9 @@ bool do_test_wuffs_zlib_checksum(bool ignore_checksum, bool bad_checksum) {
wuffs_zlib__decoder__initialize(&dec, WUFFS_VERSION, 0);
wuffs_zlib__decoder__set_ignore_checksum(&dec, ignore_checksum);
got.wi = 0;
wuffs_base__writer1 got_writer = {.buf = &got};
wuffs_base__io_writer got_writer = {.buf = &got};
src.ri = 0;
wuffs_base__reader1 src_reader = {.buf = &src};
wuffs_base__io_reader src_reader = {.buf = &src};
// Decode the src data in 1 or 2 chunks, depending on whether end_limit is
// or isn't zero.
@@ -303,12 +303,12 @@ void test_wuffs_zlib_checksum_verify_good() {
void test_wuffs_zlib_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_zlib_decode, &zlib_midsummer_gt, 0, 0);
do_test_io_buffers(wuffs_zlib_decode, &zlib_midsummer_gt, 0, 0);
}
void test_wuffs_zlib_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(wuffs_zlib_decode, &zlib_pi_gt, 0, 0);
do_test_io_buffers(wuffs_zlib_decode, &zlib_pi_gt, 0, 0);
}
// ---------------- Mimic Tests
@@ -317,12 +317,12 @@ void test_wuffs_zlib_decode_pi() {
void test_mimic_zlib_decode_midsummer() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_zlib_decode, &zlib_midsummer_gt, 0, 0);
do_test_io_buffers(mimic_zlib_decode, &zlib_midsummer_gt, 0, 0);
}
void test_mimic_zlib_decode_pi() {
CHECK_FOCUS(__func__);
do_test_buf1_buf1(mimic_zlib_decode, &zlib_pi_gt, 0, 0);
do_test_io_buffers(mimic_zlib_decode, &zlib_pi_gt, 0, 0);
}
#endif // WUFFS_MIMIC
@@ -331,8 +331,8 @@ void test_mimic_zlib_decode_pi() {
uint32_t global_wuffs_zlib_unused_u32;
const char* wuffs_bench_adler32(wuffs_base__buf1* dst,
wuffs_base__buf1* src,
const char* wuffs_bench_adler32(wuffs_base__io_buffer* dst,
wuffs_base__io_buffer* src,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
@@ -349,26 +349,26 @@ const char* wuffs_bench_adler32(wuffs_base__buf1* dst,
void bench_wuffs_adler32_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_bench_adler32, tc_src, &adler32_midsummer_gt, 0, 0,
150000);
do_bench_io_buffers(wuffs_bench_adler32, tc_src, &adler32_midsummer_gt, 0, 0,
150000);
}
void bench_wuffs_adler32_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_bench_adler32, tc_src, &adler32_pi_gt, 0, 0, 15000);
do_bench_io_buffers(wuffs_bench_adler32, tc_src, &adler32_pi_gt, 0, 0, 15000);
}
// ---------------- Zlib Benches
void bench_wuffs_zlib_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0,
30000);
}
void bench_wuffs_zlib_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(wuffs_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 3000);
do_bench_io_buffers(wuffs_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 3000);
}
// ---------------- Mimic Benches
@@ -377,24 +377,24 @@ void bench_wuffs_zlib_decode_100k() {
void bench_mimic_adler32_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_bench_adler32, tc_src, &adler32_midsummer_gt, 0, 0,
150000);
do_bench_io_buffers(mimic_bench_adler32, tc_src, &adler32_midsummer_gt, 0, 0,
150000);
}
void bench_mimic_adler32_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_bench_adler32, tc_src, &adler32_pi_gt, 0, 0, 15000);
do_bench_io_buffers(mimic_bench_adler32, tc_src, &adler32_pi_gt, 0, 0, 15000);
}
void bench_mimic_zlib_decode_10k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0,
30000);
do_bench_io_buffers(mimic_zlib_decode, tc_dst, &zlib_midsummer_gt, 0, 0,
30000);
}
void bench_mimic_zlib_decode_100k() {
CHECK_FOCUS(__func__);
do_bench_buf1_buf1(mimic_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 3000);
do_bench_io_buffers(mimic_zlib_decode, tc_dst, &zlib_pi_gt, 0, 0, 3000);
}
#endif // WUFFS_MIMIC
+42 -42
View File
@@ -264,10 +264,10 @@ int test_main(int argc, char** argv, proc* tests, proc* benches) {
return 0;
}
// WUFFS_BASE_HEADER_H is where wuffs_base__buf1 is defined.
// WUFFS_BASE_HEADER_H is where wuffs_base__io_buffer is defined.
#ifdef WUFFS_BASE_HEADER_H
bool read_file(wuffs_base__buf1* dst, const char* path) {
bool read_file(wuffs_base__io_buffer* dst, const char* path) {
if (!dst || !path) {
FAIL("read_file: NULL argument");
return false;
@@ -322,7 +322,7 @@ bool read_file(wuffs_base__buf1* dst, const char* path) {
return true;
}
char* hex_dump(char* msg, wuffs_base__buf1* buf, size_t i) {
char* hex_dump(char* msg, wuffs_base__io_buffer* buf, size_t i) {
if (!msg || !buf) {
FAIL("hex_dump: NULL argument");
return NULL;
@@ -372,11 +372,11 @@ char* hex_dump(char* msg, wuffs_base__buf1* buf, size_t i) {
return msg;
}
bool buf1s_equal(const char* prefix,
wuffs_base__buf1* got,
wuffs_base__buf1* want) {
bool io_buffers_equal(const char* prefix,
wuffs_base__io_buffer* got,
wuffs_base__io_buffer* want) {
if (!got || !want) {
FAIL("%sbuf1s_equal: NULL argument", prefix);
FAIL("%sio_buffers_equal: NULL argument", prefix);
return false;
}
char* msg = fail_msg;
@@ -387,10 +387,10 @@ bool buf1s_equal(const char* prefix,
}
}
if (got->wi != want->wi) {
INCR_FAIL(msg, "%sbuf1s_equal: wi: got %zu, want %zu.\n", prefix, got->wi,
want->wi);
INCR_FAIL(msg, "%sio_buffers_equal: wi: got %zu, want %zu.\n", prefix,
got->wi, want->wi);
} else if (i < got->wi) {
INCR_FAIL(msg, "%sbuf1s_equal:\n", prefix);
INCR_FAIL(msg, "%sio_buffers_equal:\n", prefix);
} else {
return true;
}
@@ -411,16 +411,16 @@ typedef enum {
tc_src = 2,
} throughput_counter;
bool proc_buf1_buf1(const char* (*codec_func)(wuffs_base__buf1*,
wuffs_base__buf1*,
uint64_t,
uint64_t),
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t reps,
bool bench) {
bool proc_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint64_t,
uint64_t),
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t reps,
bool bench) {
if (!codec_func) {
FAIL("NULL codec_func");
return false;
@@ -430,9 +430,9 @@ bool proc_buf1_buf1(const char* (*codec_func)(wuffs_base__buf1*,
return false;
}
wuffs_base__buf1 src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__buf1 want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer src = {.ptr = global_src_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer got = {.ptr = global_got_buffer, .len = BUFFER_SIZE};
wuffs_base__io_buffer want = {.ptr = global_want_buffer, .len = BUFFER_SIZE};
if (!gt->src_filename) {
src.closed = true;
@@ -486,32 +486,32 @@ bool proc_buf1_buf1(const char* (*codec_func)(wuffs_base__buf1*,
} else if (!read_file(&want, gt->want_filename)) {
return false;
}
if (!buf1s_equal("", &got, &want)) {
if (!io_buffers_equal("", &got, &want)) {
return false;
}
return true;
}
bool do_bench_buf1_buf1(const char* (*codec_func)(wuffs_base__buf1*,
wuffs_base__buf1*,
uint64_t,
uint64_t),
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t reps) {
return proc_buf1_buf1(codec_func, tc, gt, wlimit, rlimit, reps, true);
bool do_bench_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint64_t,
uint64_t),
throughput_counter tc,
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit,
uint64_t reps) {
return proc_io_buffers(codec_func, tc, gt, wlimit, rlimit, reps, true);
}
bool do_test_buf1_buf1(const char* (*codec_func)(wuffs_base__buf1*,
wuffs_base__buf1*,
uint64_t,
uint64_t),
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit) {
return proc_buf1_buf1(codec_func, tc_neither, gt, wlimit, rlimit, 1, false);
bool do_test_io_buffers(const char* (*codec_func)(wuffs_base__io_buffer*,
wuffs_base__io_buffer*,
uint64_t,
uint64_t),
golden_test* gt,
uint64_t wlimit,
uint64_t rlimit) {
return proc_io_buffers(codec_func, tc_neither, gt, wlimit, rlimit, 1, false);
}
#endif // WUFFS_BASE_HEADER_H