more progress on code 2

code2/grime/filesystem.odin

@@ -0,0 +1,62 @@
+package grime
+// TODO(Ed): Review when os2 is done.
+
+// TODO(Ed): Make an async option...
+file_copy_sync :: proc( path_src, path_dst: string, allocator := context.allocator ) -> b32
+{
+  file_size : i64
+	{
+		path_info, result := file_status( path_src, allocator )
+		if result != OS_ERROR_NONE {
+			log_fmt("Could not get file info: %v", result, LoggerLevel.Error )
+			return false
+		}
+		file_size = path_info.size
+	}
+
+	src_content, result := file_read_entire( path_src, allocator )
+	if ! result {
+		log_fmt( "Failed to read file to copy: %v", path_src, LoggerLevel.Error )
+		debug_trap()
+		return false
+	}
+
+	result = file_write_entire( path_dst, src_content, false )
+	if ! result {
+		log_fmt( "Failed to copy file: %v", path_dst, LoggerLevel.Error )
+		debug_trap()
+		return false
+	}
+	return true
+}
+
+file_exists :: proc( file_path : string, allocator := context.allocator ) -> b32 {
+	path_info, result := file_status( file_path, allocator )
+	if result != OS_ERROR_NONE {
+		return false
+	}
+	return true;
+}
+
+file_is_locked :: proc( file_path : string ) -> b32 {
+	handle, err := file_open(file_path, FS_Open_Readonly)
+	if err != OS_ERROR_NONE {
+			// If the error indicates the file is in use, return true.
+			return true
+	}
+
+	// If the file opens successfully, close it and return false.
+	file_close(handle)
+	return false
+}
+
+file_rewind :: proc( file : OS_Handle ) {
+	file_seek( file, 0, 0 )
+}
+
+file_read_looped :: proc( file : OS_Handle, data : []byte ) {
+	total_read, result_code := file_read( file, data )
+	if result_code == OS_ERROR_HANDLE_EOF {
+		file_rewind( file )
+	}
+}

code2/grime/logger.odin

@@ -0,0 +1,160 @@
+package grime
+
+import core_log "core:log"
+
+Max_Logger_Message_Width :: 160
+
+LoggerEntry :: struct {
+	text      : string,
+	timestamp : string,
+	level     : string,
+	location  : string,
+}
+
+Logger :: struct {
+	file_path : string,
+	file      : OS_Handle,
+	id        : string,
+
+	// varena  : VArena,
+	// entries : Array(LoggerEntry),
+}
+
+to_odin_logger :: proc( logger : ^ Logger ) -> Odin_Logger {
+	return { logger_interface, logger, LoggerLevel.Debug, Default_File_Logger_Opts }
+}
+
+logger_init :: proc( logger : ^ Logger,  id : string, file_path : string, file := OS_INVALID_HANDLE )
+{
+	if file == OS_INVALID_HANDLE
+	{
+		logger_file, result_code := file_open( file_path, FS_Open_Readonly | FS_Open_Create )
+		assert( result_code == OS_ERROR_NONE, "Log failures are fatal and must never occur at runtime (there is no logging)" )
+		logger.file = logger_file
+		file_truncate( file_path, 0 )
+	}
+	else {
+		logger.file = file
+	}
+	logger.file_path = file_path
+	logger.id        = id
+
+	LOGGER_VARENA_BASE_ADDRESS : uintptr = 2 * Tera
+	@static vmem_init_counter  : uintptr = 0
+
+	// alloc_error : AllocatorError
+	// logger.varena, alloc_error = varena_init(
+	// 	LOGGER_VARENA_BASE_ADDRESS + vmem_init_counter * 250 * Megabyte,
+	// 	1   * Megabyte,
+	// 	128 * Kilobyte,
+	// 	growth_policy       = nil,
+	// 	allow_any_resize    = true,
+	// 	dbg_name            = "logger varena",
+	// 	enable_mem_tracking = false )
+	// verify( alloc_error == .None, "Failed to allocate logger's virtual arena")
+	vmem_init_counter += 1
+
+	// TODO(Ed): Figure out another solution here...
+	// logger.entries, alloc_error = array_init(Array(LoggerEntry), 8192, runtime.heap_allocator())
+	// verify( alloc_error == .None, "Failed to allocate logger's entries array")
+
+	context.logger = { logger_interface, logger, LoggerLevel.Debug, Default_File_Logger_Opts }
+	log("Initialized Logger")
+	when false {
+		log("This sentence is over 80 characters long on purpose to test the ability of this logger to properfly wrap long as logs with a new line and then at the end of that pad it with the appropraite signature.")
+	}
+}
+
+logger_interface :: proc(
+	logger_data :  rawptr,
+	level       :  LoggerLevel,
+	text        :  string,
+	options     :  LoggerOptions,
+	location    := #caller_location )
+{
+	logger := cast(^ Logger) logger_data
+
+	@static builder_backing : [16 * Kilo] byte; {
+		mem_zero( cursor(builder_backing[:]), len(builder_backing) )
+	}
+	builder := strbuilder_from_bytes( builder_backing[:] )
+
+	first_line_length := len(text) > Max_Logger_Message_Width ? Max_Logger_Message_Width : len(text)
+	first_line        := transmute(string) text[ 0 : first_line_length ]
+
+	str_pfmt_builder( & builder, "%s ", first_line )
+
+	// str_pfmt_builder( & builder, "%-s ", first_line )
+
+	// Signature
+	{
+		when TIME_IS_SUPPORTED
+		{
+			if Logger_Full_Timestamp_Opts & options != nil {
+				str_pfmt_builder( & builder, "[")
+
+				t := time_now()
+				year, month,  day    := time_date(t)
+				hour, minute, second := time_clock(t)
+
+				if .Date in options {
+					str_pfmt_builder( & builder, "%d-%02d-%02d ", year, month, day )
+				}
+				if .Time in options {
+					str_pfmt_builder( & builder, "%02d:%02d:%02d", hour, minute, second)
+				}
+
+				str_pfmt_builder( & builder, "] ")
+			}
+		}
+
+		core_log.do_level_header( options, & builder, level )
+
+		if logger.id != "" {
+			str_pfmt_builder( & builder, "[%s] ", logger.id )
+		}
+		core_log.do_location_header( options, & builder, location  )
+	}
+
+	// Oversized message handling
+	if len(text) > Max_Logger_Message_Width
+	{
+		offset := Max_Logger_Message_Width
+		bytes  := transmute( []u8 ) text
+		for left := len(bytes) - Max_Logger_Message_Width; left > 0; left -= Max_Logger_Message_Width
+		{
+			str_pfmt_builder( & builder, "\n" )
+			subset_length := len(text) - offset
+			if subset_length > Max_Logger_Message_Width {
+				subset_length = Max_Logger_Message_Width
+			}
+			subset := slice( cursor(bytes)[offset:], subset_length )
+			str_pfmt_builder( & builder, "%s", transmute(string) subset )
+			offset += Max_Logger_Message_Width
+		}
+	}
+
+	str_pfmt_file_ln( logger.file, to_string(builder) )
+}
+
+// This buffer is used below excluisvely to prevent any allocator recusion when verbose logging from allocators.
+// This means a single line is limited to 32k buffer (increase naturally if this SOMEHOW becomes a bottleneck...)
+Logger_Allocator_Buffer : [32 * Kilo]u8
+
+log :: proc( msg : string, level := LoggerLevel.Info, loc := #caller_location ) {
+	// TODO(Ed): Finish this
+	// temp_arena : Arena; arena_init(& temp_arena, Logger_Allocator_Buffer[:])
+	// context.allocator      = arena_allocator(& temp_arena)
+	// context.temp_allocator = arena_allocator(& temp_arena)
+
+	// core_log.log( level, msg, location = loc )
+}
+
+log_fmt :: proc( fmt : string, args : ..any,  level := LoggerLevel.Info, loc := #caller_location  ) {
+	// TODO(Ed): Finish this
+	// temp_arena : Arena; arena_init(& temp_arena, Logger_Allocator_Buffer[:])
+	// context.allocator      = arena_allocator(& temp_arena)
+	// context.temp_allocator = arena_allocator(& temp_arena)
+
+	// core_log.logf( level, fmt, ..args, location = loc )
+}

code2/grime/memory.odin

@@ -81,6 +81,13 @@ AllocatorQueryFlag :: enum u64 {
 	Hint_Per_Frame_Temporary,
 	Hint_Debug_Support,
 }
+AllocatorError :: enum byte {
+	None                 = 0,
+	Out_Of_Memory        = 1,
+	Invalid_Pointer      = 2,
+	Invalid_Argument     = 3,
+	Mode_Not_Implemented = 4,
+}
 AllocatorQueryFlags :: bit_set[AllocatorQueryFlag; u64]
 AllocatorSP :: struct {
 	type_sig: AllocatorProc,
@@ -106,7 +113,7 @@ AllocatorProc_Out :: struct {
 	left:             int,
 	max_alloc:        int,
 	min_alloc:        int,
-	continuity_break: b32,
+	error:            AllocatorError,
 }
 AllocatorQueryInfo :: struct {
 	save_point:       AllocatorSP,

code2/grime/pkg_mappings.odin

@@ -12,12 +12,69 @@ import "base:intrinsics"
 
 import "base:runtime"
 	Assertion_Failure_Proc :: runtime.Assertion_Failure_Proc
-	Logger                 :: runtime.Logger
+	debug_trap             :: runtime.debug_trap
+	Odin_Logger            :: runtime.Logger
+	LoggerLevel            :: runtime.Logger_Level
+	LoggerOptions          :: runtime.Logger_Options
 	Random_Generator       :: runtime.Random_Generator
 	slice_copy_overlapping :: runtime.copy_slice
 
+import fmt_io "core:fmt"
+	str_pfmt_out       :: fmt_io.printf
+	str_pfmt_tmp       :: fmt_io.tprintf
+	str_pfmt           :: fmt_io.aprintf // Decided to make aprintf the default. (It will always be the default allocator)
+	str_pfmt_builder   :: fmt_io.sbprintf
+	str_pfmt_buffer    :: fmt_io.bprintf
+	str_pfmt_file_ln   :: fmt_io.fprintln
+	str_tmp_from_any  :: fmt_io.tprint
+
+import "core:log"
+	Default_File_Logger_Opts   :: log.Default_File_Logger_Opts
+	Logger_Full_Timestamp_Opts :: log.Full_Timestamp_Opts
+
 import core_os "core:os"
-	// ODIN_OS :: core_os.ODIN_OS
+	FS_Open_Readonly  :: core_os.O_RDONLY
+	FS_Open_Writeonly :: core_os.O_WRONLY
+	FS_Open_Create    :: core_os.O_CREATE
+	FS_Open_Trunc     :: core_os.O_TRUNC
+
+	OS_ERROR_NONE       :: core_os.ERROR_NONE
+	OS_Handle           :: core_os.Handle
+	OS_ERROR_HANDLE_EOF :: core_os.ERROR_HANDLE_EOF
+	OS_INVALID_HANDLE   :: core_os.INVALID_HANDLE
+
+	FileFlag_Create    :: core_os.O_CREATE
+	FileFlag_ReadWrite :: core_os.O_RDWR
+	FileTime           :: core_os.File_Time
+	file_close         :: core_os.close
+	file_open          :: core_os.open
+	file_read          :: core_os.read
+	file_remove        :: core_os.remove
+	file_seek          :: core_os.seek
+	file_status        :: core_os.stat
+	file_truncate      :: core_os.truncate
+	file_write         :: core_os.write
+
+	file_read_entire  :: core_os.read_entire_file
+	file_write_entire :: core_os.write_entire_file
+
+import "core:strings"
+	StrBuilder            :: strings.Builder
+	strbuilder_from_bytes :: strings.builder_from_bytes
 
 import "core:slice"
 	slice_zero :: slice.zero
+
+import "core:time"
+	TIME_IS_SUPPORTED :: time.IS_SUPPORTED
+	time_clock        :: time.clock
+	time_date         :: time.date
+	time_now          :: time.now
+
+cursor :: proc {
+	slice_cursor,
+}
+
+to_string :: proc {
+	strings.to_string,
+}