comparison src/marker.c @ 5160:ab9ee10a53e4

fix various problems with allocation statistics, track overhead properly -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-20 Ben Wing <ben@xemacs.org> * diagnose.el (show-memory-usage): * diagnose.el (show-object-memory-usage-stats): Further changes to correspond with changes in the C code; add an additional column showing the overhead used with each type, and add it into the grand total memory usage. src/ChangeLog addition: 2010-03-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (init_lrecord_stats): * alloc.c (free_normal_lisp_object): * alloc.c (struct): * alloc.c (clear_lrecord_stats): * alloc.c (tick_lrecord_stats): * alloc.c (COUNT_FROB_BLOCK_USAGE): * alloc.c (COPY_INTO_LRECORD_STATS): * alloc.c (sweep_strings): * alloc.c (UNMARK_string): * alloc.c (gc_sweep_1): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (object_dead_p): * alloc.c (fixed_type_block_overhead): * alloc.c (lisp_object_storage_size): * emacs.c (main_1): * lisp.h: * lrecord.h: Export lisp_object_storage_size() and malloced_storage_size() even when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS build to compile. Don't export fixed_type_block_overhead() any more. Some code cleanup, rearrangement, add some section headers. Clean up various bugs especially involving computation of overhead and double-counting certain usage in total_gc_usage. Add statistics computing the overhead used by all types. Don't add a special entry for string headers in the object-memory-usage-stats because it's already present as just "string". But do count the overhead used by long strings. Don't try to call the memory_usage() methods when NEW_GC because there's nowhere obvious in the sweep stage to make the calls. * marker.c (compute_buffer_marker_usage): Just use lisp_object_storage_size() rather than trying to reimplement it.
author Ben Wing <ben@xemacs.org>
date Sat, 20 Mar 2010 20:20:30 -0500
parents 1fae11d56ad2
children 6c6d78781d59
comparison
equal deleted inserted replaced
5159:cb303ff63e76 5160:ab9ee10a53e4
495 } 495 }
496 #endif /* 0 */ 496 #endif /* 0 */
497 497
498 #ifdef MEMORY_USAGE_STATS 498 #ifdef MEMORY_USAGE_STATS
499 499
500 int 500 Bytecount
501 compute_buffer_marker_usage (struct buffer *b, struct usage_stats *ustats) 501 compute_buffer_marker_usage (struct buffer *b, struct usage_stats *ustats)
502 { 502 {
503 Lisp_Marker *m; 503 Lisp_Marker *m;
504 int total = 0; 504 Bytecount total = 0;
505 int overhead;
506 505
507 for (m = BUF_MARKERS (b); m; m = m->next) 506 for (m = BUF_MARKERS (b); m; m = m->next)
508 total += sizeof (Lisp_Marker); 507 total += lisp_object_storage_size (wrap_marker (m), ustats);
509 ustats->was_requested += total; 508 return total;
510 #ifdef NEW_GC
511 overhead = mc_alloced_storage_size (total, 0) - total;
512 #else /* not NEW_GC */
513 overhead = fixed_type_block_overhead (total);
514 #endif /* not NEW_GC */
515 /* #### claiming this is all malloc overhead is not really right,
516 but it has to go somewhere. */
517 ustats->malloc_overhead += overhead;
518 return total + overhead;
519 } 509 }
520 510
521 #endif /* MEMORY_USAGE_STATS */ 511 #endif /* MEMORY_USAGE_STATS */
522 512
523 513