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.

/*
 * Copyright (c) 2000, Red Hat, Inc.
 *
 *     This program is free software; you can redistribute it and/or modify
 *     it under the terms of the GNU General Public License as published by
 *     the Free Software Foundation; either version 2 of the License, or
 *     (at your option) any later version.
 *
 *     A copy of the GNU General Public License can be found at
 *     http://www.gnu.org/
 *
 * Written by DJ Delorie <dj@cygnus.com>
 *
 */

/* The purpose of this file is to doa recursive find on a given
   directory, calling a given function for each file found. */

#include "win32.h"
#include <stdio.h>
#include <stdlib.h>

#include "port.h"

static void (*for_each)(char *, unsigned int);
static char dir[_MAX_PATH], *found_part;

static int
find_sub ()
{
  WIN32_FIND_DATA wfd;
  HANDLE h;
  char *end = dir + strlen (dir);
  int rv = 0;

  *end++ = '/';
  strcpy (end, "*");

  h = FindFirstFile (dir, &wfd);

  if (h == INVALID_HANDLE_VALUE)
    return 0;

  do {
    if (strcmp (wfd.cFileName, ".") == 0
	|| strcmp (wfd.cFileName, "..") == 0)
      continue;

    strcpy (end, wfd.cFileName);

    if (wfd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
      find_sub ();
    else
      {
	for_each (found_part, wfd.nFileSizeLow);
	rv ++;
      }

  } while (FindNextFile (h, &wfd));

  FindClose (h);
  return rv;
}

int
find (char *starting_dir, void (*_for_each)(char *, unsigned int))
{
  strcpy (dir, starting_dir);
  for_each = _for_each;
  found_part = dir + strlen (dir) + 1;

  return find_sub ();
}