From a08759985ce25cda9b340a85eef30f572a8ceacc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 26 Nov 2018 22:14:39 +0100 Subject: Add extensible logging API --- src/reader.c | 8 ++- src/reader.h | 2 +- src/serdi.c | 10 +--- src/world.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- src/world.h | 33 +++++++++++-- src/writer.c | 20 ++++---- 6 files changed, 178 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/reader.c b/src/reader.c index a79073ee..a88e128d 100644 --- a/src/reader.c +++ b/src/reader.c @@ -35,8 +35,12 @@ r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...) { va_list args; va_start(args, fmt); - const SerdError e = { st, &reader->source.cur, fmt, &args }; - serd_world_error(reader->world, &e); + serd_world_vlogf_internal(reader->world, + st, + SERD_LOG_LEVEL_ERR, + &reader->source.cur, + fmt, + args); va_end(args); return st; } diff --git a/src/reader.h b/src/reader.h index dcee87d7..21dc2e04 100644 --- a/src/reader.h +++ b/src/reader.h @@ -52,7 +52,7 @@ typedef struct { struct SerdReaderImpl { SerdWorld* world; const SerdSink* sink; - SerdErrorSink error_sink; + SerdLogFunc log_func; void* error_handle; SerdNode* rdf_first; SerdNode* rdf_rest; diff --git a/src/serdi.c b/src/serdi.c index 32a983c6..de1a6efd 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -75,14 +75,6 @@ missing_arg(const char* name, char opt) return print_usage(name, true); } -static SerdStatus -quiet_error_sink(void* handle, const SerdError* e) -{ - (void)handle; - (void)e; - return SERD_SUCCESS; -} - int main(int argc, char** argv) { @@ -224,7 +216,7 @@ main(int argc, char** argv) serd_reader_set_strict(reader, !lax); if (quiet) { - serd_world_set_error_sink(world, quiet_error_sink, NULL); + serd_world_set_log_func(world, serd_quiet_error_func, NULL); } SerdNode* root = serd_new_uri(root_uri); diff --git a/src/world.c b/src/world.c index f449ed50..690ef2a4 100644 --- a/src/world.c +++ b/src/world.c @@ -18,7 +18,6 @@ #include "world.h" -#include "cursor.h" #include "node.h" #include "serd_config.h" #include "serd_internal.h" @@ -35,14 +34,21 @@ #define BLANK_CHARS 11 +static const char* const log_level_strings[] = { "emergengy", "alert", + "critical", "error", + "warning", "note", + "info", "debug" }; + FILE* serd_world_fopen(SerdWorld* world, const char* path, const char* mode) { FILE* fd = fopen(path, mode); if (!fd) { - serd_world_errorf(world, SERD_ERR_INTERNAL, - "failed to open file %s (%s)\n", - path, strerror(errno)); + char errno_str[24]; + snprintf(errno_str, sizeof(errno_str), "%d", errno); + const SerdLogField fields[] = { { "ERRNO", errno_str } }; + serd_world_logf(world, "serd", SERD_LOG_LEVEL_ERR, 1, fields, + "failed to open file %s (%s)\n", path, strerror(errno)); return NULL; } #if defined(HAVE_POSIX_FADVISE) && defined(HAVE_FILENO) @@ -52,31 +58,134 @@ serd_world_fopen(SerdWorld* world, const char* path, const char* mode) } SerdStatus -serd_world_error(const SerdWorld* world, const SerdError* e) +serd_quiet_error_func(void* handle, const SerdLogEntry* entry) +{ + (void)handle; + (void)entry; + return SERD_SUCCESS; +} + +static const char* +get_log_field(const SerdLogField* const fields, + const size_t n_fields, + const char* const key) { - if (world->error_sink) { - world->error_sink(world->error_handle, e); + for (size_t i = 0; i < n_fields; ++i) { + if (!strcmp(fields[i].key, key)) { + return fields[i].value; + } + } + + return NULL; +} + +const char* +serd_log_entry_get_field(const SerdLogEntry* const entry, const char* const key) +{ + return get_log_field(entry->fields, entry->n_fields, key); +} + +SerdStatus +serd_world_vlogf(const SerdWorld* world, + const char* domain, + SerdLogLevel level, + const size_t n_fields, + const SerdLogField* fields, + const char* fmt, + va_list args) +{ + // Copy args (which may be an array) to portably get a pointer + va_list ap; + va_copy(ap, args); + + const SerdLogEntry e = {domain, fields, fmt, &ap, level, n_fields}; + SerdStatus st = SERD_SUCCESS; + + if (world->log_func) { + st = world->log_func(world->log_handle, &e); } else { - fprintf(stderr, "error: "); - if (e->cursor) { - fprintf(stderr, - "%s:%u:%u: ", - serd_node_string(e->cursor->file), - e->cursor->line, - e->cursor->col); + // Print GCC-style level prefix (error, warning, etc) + fprintf(stderr, "%s: ", log_level_strings[level]); + + // Add input file and position to prefix if available + const char* const file = serd_log_entry_get_field(&e, "SERD_FILE"); + const char* const line = serd_log_entry_get_field(&e, "SERD_LINE"); + const char* const col = serd_log_entry_get_field(&e, "SERD_COL"); + if (file && line && col) { + fprintf(stderr, "%s:%s:%s: ", file, line, col); } - vfprintf(stderr, e->fmt, *e->args); + + // Using a copy isn't necessary here, but it avoids a clang-tidy bug + vfprintf(stderr, fmt, ap); } - return e->status; + + va_end(ap); + return st; +} + +SerdStatus +serd_world_logf(const SerdWorld* world, + const char* domain, + SerdLogLevel level, + const size_t n_fields, + const SerdLogField* fields, + const char* fmt, + ...) +{ + va_list args; + va_start(args, fmt); + + const SerdStatus st = + serd_world_vlogf(world, domain, level, n_fields, fields, fmt, args); + + va_end(args); + return st; +} + +SerdStatus +serd_world_vlogf_internal(const SerdWorld* world, + SerdStatus st, + SerdLogLevel level, + const SerdCursor* cursor, + const char* fmt, + va_list args) +{ + char st_str[8]; + snprintf(st_str, sizeof(st_str), "%u", st); + if (cursor) { + const char* file = serd_node_string(serd_cursor_name(cursor)); + + char line[24]; + snprintf(line, sizeof(line), "%u", serd_cursor_line(cursor)); + + char col[24]; + snprintf(col, sizeof(col), "%u", serd_cursor_column(cursor)); + + const SerdLogField fields[] = { { "SERD_STATUS", st_str }, + { "SERD_FILE", file }, + { "SERD_LINE", line }, + { "SERD_COL", col } }; + + serd_world_vlogf(world, "serd", level, 4, fields, fmt, args); + } else { + const SerdLogField fields[] = { { "SERD_STATUS", st_str } }; + serd_world_vlogf(world, "serd", level, 1, fields, fmt, args); + } + + return st; } SerdStatus -serd_world_errorf(const SerdWorld* world, SerdStatus st, const char* fmt, ...) +serd_world_logf_internal(const SerdWorld* world, + SerdStatus st, + SerdLogLevel level, + const SerdCursor* cursor, + const char* fmt, + ...) { va_list args; va_start(args, fmt); - const SerdError e = { st, NULL, fmt, &args }; - serd_world_error(world, &e); + serd_world_vlogf_internal(world, st, level, cursor, fmt, args); va_end(args); return st; } @@ -128,10 +237,8 @@ serd_world_get_blank(SerdWorld* world) } void -serd_world_set_error_sink(SerdWorld* world, - SerdErrorSink error_sink, - void* handle) +serd_world_set_log_func(SerdWorld* world, SerdLogFunc log_func, void* handle) { - world->error_sink = error_sink; - world->error_handle = handle; + world->log_func = log_func; + world->log_handle = handle; } diff --git a/src/world.h b/src/world.h index 11f36e21..7328afe3 100644 --- a/src/world.h +++ b/src/world.h @@ -19,13 +19,14 @@ #include "serd/serd.h" +#include #include #include struct SerdWorldImpl { SerdNodes* nodes; - SerdErrorSink error_sink; - void* error_handle; + SerdLogFunc log_func; + void* log_handle; SerdNode* blank_node; const SerdNode* rdf_first; const SerdNode* rdf_nil; @@ -39,9 +40,33 @@ struct SerdWorldImpl { FILE* serd_world_fopen(SerdWorld* world, const char* path, const char* mode); -SerdStatus serd_world_error(const SerdWorld* world, const SerdError* e); +/// Write a message to the log +SERD_API +SERD_LOG_FUNC(5, 0) +SerdStatus +serd_world_vlogf_internal(const SerdWorld* world, + SerdStatus st, + SerdLogLevel level, + const SerdCursor* cursor, + const char* fmt, + va_list args); +/// Write a message to the log +SERD_API +SERD_LOG_FUNC(5, 6) SerdStatus -serd_world_errorf(const SerdWorld* world, SerdStatus st, const char* fmt, ...); +serd_world_logf_internal(const SerdWorld* world, + SerdStatus st, + SerdLogLevel level, + const SerdCursor* cursor, + const char* fmt, + ...); + +#define SERD_LOG_ERRORF(world, st, fmt, ...) \ + serd_world_logf_internal( \ + world, st, SERD_LOG_LEVEL_ERR, NULL, fmt, __VA_ARGS__) + +#define SERD_LOG_ERROR(world, st, msg) \ + serd_world_logf_internal(world, st, SERD_LOG_LEVEL_ERR, NULL, msg) #endif // SERD_WORLD_H diff --git a/src/writer.c b/src/writer.c index d84600e1..891f2413 100644 --- a/src/writer.c +++ b/src/writer.c @@ -114,8 +114,8 @@ struct SerdWriterImpl { SerdStack anon_stack; SerdWriteFunc write_func; void* stream; - SerdErrorSink error_sink; - void* msg_handle; + SerdLogFunc log_func; + void* log_handle; WriteContext context; unsigned indent; char* bprefix; @@ -212,8 +212,9 @@ write_character(SerdWriter* writer, const uint8_t* utf8, size_t* size) const uint32_t c = parse_utf8_char(utf8, size); switch (*size) { case 0: - serd_world_errorf( - writer->world, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", utf8[0]); + SERD_LOG_ERRORF(writer->world, SERD_ERR_BAD_ARG, + "invalid UTF-8: %X\n", + utf8[0]); return sink(replacement_char, sizeof(replacement_char), writer); case 1: snprintf(escape, sizeof(escape), "\\u%04X", utf8[0]); @@ -621,10 +622,9 @@ write_curie(SerdWriter* const writer, case SERD_NQUADS: if ((st = serd_env_expand_in_place( writer->env, node, &prefix, &suffix))) { - serd_world_errorf(writer->world, - st, - "undefined namespace prefix `%s'\n", - serd_node_string(node)); + SERD_LOG_ERRORF(writer->world, st, + "undefined namespace prefix `%s'\n", + serd_node_string(node)); return false; } sink("<", 1, writer); @@ -901,8 +901,8 @@ serd_writer_end_anon(SerdWriter* writer, if (writer->syntax == SERD_NTRIPLES || writer->syntax == SERD_NQUADS) { return SERD_SUCCESS; } else if (serd_stack_is_empty(&writer->anon_stack)) { - return serd_world_errorf(writer->world, SERD_ERR_UNKNOWN, - "unexpected end of anonymous node\n"); + return SERD_LOG_ERROR(writer->world, SERD_ERR_UNKNOWN, + "unexpected end of anonymous node\n"); } write_sep(writer, SEP_ANON_END); -- cgit v1.2.1