diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/serd-pipe.c | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/tools/serd-pipe.c b/tools/serd-pipe.c index 3d095e2e..480afa6e 100644 --- a/tools/serd-pipe.c +++ b/tools/serd-pipe.c @@ -29,7 +29,6 @@ #define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serd-pipe: " fmt, __VA_ARGS__) #define MAX_DEPTH 128U -#define SERD_PAGE_SIZE 4096U static int print_usage(const char* const name, const bool error) @@ -39,9 +38,8 @@ print_usage(const char* const name, const bool error) "Use - for INPUT to read from standard input.\n\n" " -B BASE_URI Base URI.\n" " -a Write ASCII output.\n" - " -b Write output in blocks for performance.\n" + " -b BYTES I/O block size.\n" " -c PREFIX Chop PREFIX from matching blank node IDs.\n" - " -e Eat input one character at a time.\n" " -f Fast and loose URI pass-through.\n" " -h Display this help and exit.\n" " -i SYNTAX Input syntax: turtle/ntriples/trig/nquads.\n" @@ -85,7 +83,7 @@ read_file(SerdWorld* const world, const size_t stack_size, const char* const filename, const char* const add_prefix, - const bool bulk_read) + const size_t block_size) { SerdInputStream in = serd_open_tool_input(filename); if (!in.stream) { @@ -103,8 +101,7 @@ read_file(SerdWorld* const world, serd_reader_add_blank_prefix(reader, add_prefix); - SerdStatus st = - serd_reader_start(reader, &in, NULL, bulk_read ? SERD_PAGE_SIZE : 1U); + SerdStatus st = serd_reader_start(reader, &in, NULL, block_size); st = st ? st : serd_reader_read_document(reader); @@ -124,10 +121,9 @@ main(int argc, char** argv) SerdSyntax output_syntax = SERD_SYNTAX_EMPTY; SerdReaderFlags reader_flags = 0; SerdWriterFlags writer_flags = 0; - bool bulk_read = true; - bool bulk_write = false; bool osyntax_set = false; bool quiet = false; + size_t block_size = 4096U; size_t stack_size = 1048576U; const char* input_string = NULL; const char* add_prefix = ""; @@ -152,10 +148,6 @@ main(int argc, char** argv) if (opt == 'a') { writer_flags |= SERD_WRITE_ASCII; - } else if (opt == 'b') { - bulk_write = true; - } else if (opt == 'e') { - bulk_read = false; } else if (opt == 'f') { writer_flags |= (SERD_WRITE_UNQUALIFIED | SERD_WRITE_UNRESOLVED); } else if (opt == 'h') { @@ -176,6 +168,19 @@ main(int argc, char** argv) base = serd_new_uri(serd_string(argv[a])); break; + } else if (opt == 'b') { + if (argv[a][o + 1] || ++a == argc) { + return missing_arg(prog, 'b'); + } + + char* endptr = NULL; + const long size = strtol(argv[a], &endptr, 10); + if (size < 1 || size == LONG_MAX || *endptr != '\0') { + SERDI_ERRORF("invalid block size `%s'\n", argv[a]); + return 1; + } + block_size = (size_t)size; + break; } else if (opt == 'c') { if (argv[a][o + 1] || ++a == argc) { return missing_arg(prog, 'c'); @@ -291,8 +296,8 @@ main(int argc, char** argv) return 1; } - SerdWriter* const writer = serd_writer_new( - world, output_syntax, writer_flags, env, &out, bulk_write ? 4096U : 1U); + SerdWriter* const writer = + serd_writer_new(world, output_syntax, writer_flags, env, &out, block_size); if (quiet) { serd_world_set_error_func(world, quiet_error_func, NULL); @@ -352,7 +357,7 @@ main(int argc, char** argv) stack_size, inputs[i], n_inputs > 1 ? prefix : add_prefix, - bulk_read))) { + block_size))) { break; } } |