From 162c87b1b810770f75920a51682a8f6b63adeba4 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 28 Jul 2019 18:44:50 +0100 Subject: [PATCH] Minor code clean-up --- core/log/log.odin | 67 +++++++++++++++++++++------------------- core/mem/allocators.odin | 2 -- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/core/log/log.odin b/core/log/log.odin index 13e370b91..76b8550e8 100644 --- a/core/log/log.odin +++ b/core/log/log.odin @@ -11,30 +11,30 @@ Level :: enum { } Option :: enum { - Level, - Date, - Time, - Short_File_Path, - Long_File_Path, - Line, - Procedure, - Terminal_Color + Level, + Date, + Time, + Short_File_Path, + Long_File_Path, + Line, + Procedure, + Terminal_Color } Options :: bit_set[Option]; Full_Timestamp_Opts :: Options{ - Option.Date, - Option.Time + .Date, + .Time }; Location_Header_Opts :: Options{ - Option.Short_File_Path, - Option.Long_File_Path, - Option.Line, - Option.Procedure, + .Short_File_Path, + .Long_File_Path, + .Line, + .Procedure, }; Location_File_Opts :: Options{ - Option.Short_File_Path, - Option.Long_File_Path + .Short_File_Path, + .Long_File_Path }; Logger_Proc :: #type proc(data: rawptr, level: Level, text: string, options: Options, location := #caller_location); @@ -42,30 +42,34 @@ Logger_Proc :: #type proc(data: rawptr, level: Level, text: string, options: Opt Logger :: struct { procedure: Logger_Proc, data: rawptr, - options: Options, + options: Options, } Multi_Logger_Data :: struct { - loggers : []Logger, + loggers : []Logger, } create_multi_logger :: proc(logs: ..Logger) -> Logger { - data := new(Multi_Logger_Data); - data.loggers = make([]Logger, len(logs)); - copy(data.loggers, logs); - return Logger{multi_logger_proc, data, nil}; + data := new(Multi_Logger_Data); + data.loggers = make([]Logger, len(logs)); + copy(data.loggers, logs); + return Logger{multi_logger_proc, data, nil}; } -destroy_multi_logger ::proc(log : ^Logger) { - free(log.data); - log^ = nil_logger(); +destroy_multi_logger :: proc(log : ^Logger) { + free(log.data); + log^ = nil_logger(); } multi_logger_proc :: proc(logger_data: rawptr, level: Level, text: string, options: Options, location := #caller_location) { - data := cast(^Multi_Logger_Data)logger_data; - if data.loggers == nil || len(data.loggers) == 0 do return; - for log in data.loggers do log.procedure(log.data, level, text, log.options, location); + data := cast(^Multi_Logger_Data)logger_data; + if data.loggers == nil || len(data.loggers) == 0 { + return; + } + for log in data.loggers { + log.procedure(log.data, level, text, log.options, location); + } } nil_logger_proc :: proc(data: rawptr, level: Level, text: string, options: Options, location := #caller_location) { @@ -76,6 +80,7 @@ nil_logger :: proc() -> Logger { return Logger{nil_logger_proc, nil, nil}; } +// TODO(bill): Should these be redesigned so that they are do not rely upon `package fmt`? debug :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Debug, fmt_str=fmt_str, args=args, location=location); info :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Info, fmt_str=fmt_str, args=args, location=location); warn :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Warning, fmt_str=fmt_str, args=args, location=location); @@ -83,7 +88,7 @@ error :: proc(fmt_str : string, args : ..any, location := #caller_location) do l fatal :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Fatal, fmt_str=fmt_str, args=args, location=location); logf :: proc(level : Level, fmt_str : string, args : ..any, location := #caller_location) { - logger := context.logger; - str := len(args) > 0 ? fmt.tprintf(fmt_str, ..args) : fmt.tprint(fmt_str); //NOTE(Hoej): While tprint isn't thread-safe, no logging is. - logger.procedure(logger.data, level, str, logger.options, location); + logger := context.logger; + str := len(args) > 0 ? fmt.tprintf(fmt_str, ..args) : fmt.tprint(fmt_str); //NOTE(Hoej): While tprint isn't thread-safe, no logging is. + logger.procedure(logger.data, level, str, logger.options, location); } diff --git a/core/mem/allocators.odin b/core/mem/allocators.odin index 04b0fd0b1..7ef094bc1 100644 --- a/core/mem/allocators.odin +++ b/core/mem/allocators.odin @@ -1,7 +1,5 @@ package mem - - nil_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode, size, alignment: int, old_memory: rawptr, old_size: int, flags: u64 = 0, loc := #caller_location) -> rawptr {