Browse Source

tidying up Query_Info return value when not in query features

Ian Lilley 3 years ago
parent
commit
dda2ed290a

+ 4 - 5
core/mem/allocators.odin

@@ -886,6 +886,10 @@ tracking_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
 		}
 		}
 	case .Free:
 	case .Free:
 		delete_key(&data.allocation_map, old_memory)
 		delete_key(&data.allocation_map, old_memory)
+	case .Free_All:
+		if data.clear_on_free_all {
+			clear_map(&data.allocation_map)
+		}	
 	case .Resize:
 	case .Resize:
 		if old_memory != result_ptr {
 		if old_memory != result_ptr {
 			delete_key(&data.allocation_map, old_memory)
 			delete_key(&data.allocation_map, old_memory)
@@ -898,11 +902,6 @@ tracking_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
 			location = loc,
 			location = loc,
 		}
 		}
 
 
-	case .Free_All:
-		if data.clear_on_free_all {
-			clear_map(&data.allocation_map)
-		}
-
 	case .Query_Features:
 	case .Query_Features:
 		set := (^Allocator_Mode_Set)(old_memory)
 		set := (^Allocator_Mode_Set)(old_memory)
 		if set != nil {
 		if set != nil {

+ 1 - 1
core/os/os2/heap_windows.odin

@@ -99,7 +99,7 @@ _heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
 		return nil, nil
 		return nil, nil
 
 
 	case .Query_Info:
 	case .Query_Info:
-		return nil, nil
+		return nil, .Mode_Not_Implemented
 	}
 	}
 
 
 	return nil, nil
 	return nil, nil

+ 2 - 2
core/runtime/default_allocators_windows.odin

@@ -17,7 +17,7 @@ when ODIN_DEFAULT_TO_NIL_ALLOCATOR {
 			_windows_default_free(old_memory)
 			_windows_default_free(old_memory)
 
 
 		case .Free_All:
 		case .Free_All:
-			// NOTE(tetra): Do nothing.
+			return nil, .Mode_Not_Implemented
 
 
 		case .Resize:
 		case .Resize:
 			data, err = _windows_default_resize(old_memory, old_size, size, alignment)
 			data, err = _windows_default_resize(old_memory, old_size, size, alignment)
@@ -29,7 +29,7 @@ when ODIN_DEFAULT_TO_NIL_ALLOCATOR {
 			}
 			}
 
 
 		case .Query_Info:
 		case .Query_Info:
-			// Do nothing
+			return nil, .Mode_Not_Implemented
 		}
 		}
 
 
 		return
 		return

+ 1 - 1
core/runtime/default_temporary_allocator.odin

@@ -185,7 +185,7 @@ when ODIN_OS == .Freestanding || ODIN_OS == .JS || ODIN_DEFAULT_TO_NIL_ALLOCATOR
 			}
 			}
 
 
 		case .Query_Info:
 		case .Query_Info:
-			// Nothing to give
+			return nil, .Mode_Not_Implemented
 		}
 		}
 
 
 		return
 		return