comparison src/mc-alloc.c @ 5167:e374ea766cc1

clean up, rearrange allocation statistics code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-03-21 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (assert_proper_sizing): * alloc.c (c_readonly): * alloc.c (malloced_storage_size): * alloc.c (fixed_type_block_overhead): * alloc.c (lisp_object_storage_size): * alloc.c (inc_lrecord_stats): * alloc.c (dec_lrecord_stats): * alloc.c (pluralize_word): * alloc.c (object_memory_usage_stats): * alloc.c (Fobject_memory_usage): * alloc.c (compute_memusage_stats_length): * alloc.c (disksave_object_finalization_1): * alloc.c (Fgarbage_collect): * mc-alloc.c: * mc-alloc.c (mc_alloced_storage_size): * mc-alloc.h: No functionality change here. Collect the allocations-statistics code that was scattered throughout alloc.c into one place. Add remaining section headings so that all sections have headings clearly identifying the start of the section and its purpose. Expose mc_alloced_storage_size() even when not MEMORY_USAGE_STATS; this fixes build problems and is related to the export of lisp_object_storage_size() and malloced_storage_size() when non-MEMORY_USAGE_STATS in the previous change set.
author Ben Wing <ben@xemacs.org>
date Sun, 21 Mar 2010 04:41:49 -0500
parents 1fae11d56ad2
children 9b8c2168d231
comparison
equal deleted inserted replaced
5161:125f4119e64d 5167:e374ea766cc1
960 return ((free_index + 1 - FREE_LIST_LOWER_THRESHOLD) 960 return ((free_index + 1 - FREE_LIST_LOWER_THRESHOLD)
961 * FREE_LIST_LIN_STEP) + FREE_LIST_LOWER_THRESHOLD; 961 * FREE_LIST_LIN_STEP) + FREE_LIST_LOWER_THRESHOLD;
962 } 962 }
963 963
964 964
965 #ifdef MEMORY_USAGE_STATS
966 Bytecount 965 Bytecount
967 mc_alloced_storage_size (Bytecount claimed_size, struct usage_stats *stats) 966 mc_alloced_storage_size (Bytecount claimed_size, struct usage_stats *stats)
968 { 967 {
969 size_t used_size = 968 size_t used_size =
970 get_used_list_size_value (get_used_list_index (claimed_size)); 969 get_used_list_size_value (get_used_list_index (claimed_size));
977 stats->malloc_overhead += used_size - claimed_size; 976 stats->malloc_overhead += used_size - claimed_size;
978 } 977 }
979 978
980 return used_size; 979 return used_size;
981 } 980 }
982 #endif /* not MEMORY_USAGE_STATS */
983 981
984 982
985 983
986 /*--- free heap functions ----------------------------------------------*/ 984 /*--- free heap functions ----------------------------------------------*/
987 985