Clean up package log code

core/fmt/fmt.odin

@@ -1007,7 +1007,9 @@ fmt_enum :: proc(fi: ^Info, v: any, verb: rune) {
 			fmt_arg(fi, any{v.data, runtime.type_info_base(e.base).id}, verb);
 		case 's', 'v':
 			str, ok := enum_value_to_string(v);
-			if !ok do str = "!%(BAD ENUM VALUE)";
+			if !ok {
+				str = "!%(BAD ENUM VALUE)";
+			}
 			strings.write_string(fi.buf, str);
 		}
 	}

core/log/file_console_logger.odin

@@ -5,12 +5,12 @@ import "core:strings";
 import "core:os";
 import "core:time";
 
-Level_Headers := []string{
+Level_Headers := [?]string{
-    "[DEBUG] --- ",
+	 0..<10 = "[DEBUG] --- ",
-    "[INFO ] --- ",
+	10..<20 = "[INFO ] --- ",
-    "[WARN ] --- ",
+	20..<30 = "[WARN ] --- ",
-    "[ERROR] --- ",
+	30..<40 = "[ERROR] --- ",
-    "[FATAL] --- ",
+	40..<50 = "[FATAL] --- ",
 };
 
 Default_Console_Logger_Opts :: Options{
@@ -45,7 +45,6 @@ destroy_file_logger ::proc(log : ^Logger) {
 	data := cast(^File_Console_Logger_Data)log.data;
 	if data.file_handle != os.INVALID_HANDLE do os.close(data.file_handle);
 	free(data);
-    log^ = nil_logger();
 }
 
 create_console_logger :: proc(lowest := Level.Debug, opt := Default_Console_Logger_Opts, ident := "") -> Logger {
@@ -57,7 +56,6 @@ create_console_logger :: proc(lowest := Level.Debug, opt := Default_Console_Logg
 
 destroy_console_logger :: proc(log: ^Logger) {
 	free(log.data);
-    log^ = nil_logger();
 }
 
 file_console_logger_proc :: proc(logger_data: rawptr, level: Level, text: string, options: Options, location := #caller_location) {
@@ -98,10 +96,10 @@ do_level_header :: proc(opts : Options, level : Level, str : ^strings.Builder) {
 
 	col := RESET;
 	switch level {
-    case Level.Debug              : col = DARK_GREY;
+	case .Debug:   col = DARK_GREY;
-    case Level.Info               : col = RESET;
+	case .Info:    col = RESET;
-    case Level.Warning            : col = YELLOW;
+	case .Warning: col = YELLOW;
-    case Level.Error, Level.Fatal : col = RED;
+	case .Error, .Fatal: col = RED;
 	}
 
 	if .Level in opts {

core/log/log.odin

@@ -2,18 +2,19 @@ package log
 
 import "core:runtime"
 import "core:fmt"
+import "core:sync"
 
 
 // NOTE(bill, 2019-12-31): These are defined in `package runtime` as they are used in the `context`. This is to prevent an import definition cycle.
 
 Level :: runtime.Logger_Level;
 /*
-Level :: enum {
+Logger_Level :: enum {
-	Debug,
+	Debug   = 0,
-	Info,
+	Info    = 10,
-	Warning,
+	Warning = 20,
-	Error,
+	Error   = 30,
-	Fatal,
+	Fatal   = 40,
 }
 */
 
@@ -67,33 +68,6 @@ Logger :: struct {
 }
 */
 
-Multi_Logger_Data :: struct {
-	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, Level.Debug, nil};
-}
-
-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 {
-		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) {
 	// Do nothing
 }
@@ -103,28 +77,52 @@ nil_logger :: proc() -> Logger {
 }
 
 // TODO(bill): Should these be redesigned so that they are do not rely upon `package fmt`?
-debugf :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Debug,   fmt_str=fmt_str, args=args, location=location);
+debugf :: proc(fmt_str: string, args: ..any, location := #caller_location) {
-infof  :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Info,    fmt_str=fmt_str, args=args, location=location);
+	logf(level=.Debug,   fmt_str=fmt_str, args=args, location=location);
-warnf  :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Warning, fmt_str=fmt_str, args=args, location=location);
+}
-errorf :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Error,   fmt_str=fmt_str, args=args, location=location);
+infof  :: proc(fmt_str: string, args: ..any, location := #caller_location) {
-fatalf :: proc(fmt_str : string, args : ..any, location := #caller_location) do logf(level=Level.Fatal,   fmt_str=fmt_str, args=args, location=location);
+	logf(level=.Info,    fmt_str=fmt_str, args=args, location=location);
+}
+warnf  :: proc(fmt_str: string, args: ..any, location := #caller_location) {
+	logf(level=.Warning, fmt_str=fmt_str, args=args, location=location);
+}
+errorf :: proc(fmt_str: string, args: ..any, location := #caller_location) {
+	logf(level=.Error,   fmt_str=fmt_str, args=args, location=location);
+}
+fatalf :: proc(fmt_str: string, args: ..any, location := #caller_location) {
+	logf(level=.Fatal,   fmt_str=fmt_str, args=args, location=location);
+}
 
-debug :: proc(args : ..any, location := #caller_location) do log(level=Level.Debug,   args=args, location=location);
+debug :: proc(args: ..any, location := #caller_location) {
-info  :: proc(args : ..any, location := #caller_location) do log(level=Level.Info,    args=args, location=location);
+	log(level=.Debug,   args=args, location=location);
-warn  :: proc(args : ..any, location := #caller_location) do log(level=Level.Warning, args=args, location=location);
+}
-error :: proc(args : ..any, location := #caller_location) do log(level=Level.Error,   args=args, location=location);
+info  :: proc(args: ..any, location := #caller_location) {
-fatal :: proc(args : ..any, location := #caller_location) do log(level=Level.Fatal,   args=args, location=location);
+	log(level=.Info,    args=args, location=location);
+}
+warn  :: proc(args: ..any, location := #caller_location) {
+	log(level=.Warning, args=args, location=location);
+}
+error :: proc(args: ..any, location := #caller_location) {
+	log(level=.Error,   args=args, location=location);
+}
+fatal :: proc(args: ..any, location := #caller_location) {
+	log(level=.Fatal,   args=args, location=location);
+}
 
 log :: proc(level: Level, args: ..any, location := #caller_location) {
 	logger := context.logger;
-	if level < logger.lowest_level do return;
+	if level < logger.lowest_level {
+		return;
+	}
 	str := fmt.tprint(..args); //NOTE(Hoej): While tprint isn't thread-safe, no logging is.
 	logger.procedure(logger.data, level, str, logger.options, location);
 }
 
 logf :: proc(level: Level, fmt_str: string, args: ..any, location := #caller_location) {
 	logger := context.logger;
-	if level < logger.lowest_level do return;
+	if level < logger.lowest_level {
-	str := fmt.tprintf(fmt_str, ..args) if len(args) > 0 else fmt.tprint(fmt_str); //NOTE(Hoej): While tprint isn't thread-safe, no logging is.
+		return;
+	}
+	str := fmt.tprintf(fmt_str, ..args);
 	logger.procedure(logger.data, level, str, logger.options, location);
 }

core/runtime/core.odin

@@ -264,11 +264,11 @@ Allocator :: struct {
 // Logging stuff
 
 Logger_Level :: enum {
-	Debug,
+	Debug   = 0,
-	Info,
+	Info    = 10,
-	Warning,
+	Warning = 20,
-	Error,
+	Error   = 30,
-	Fatal,
+	Fatal   = 40,
 }
 
 Logger_Option :: enum {