more cleanups to object-memory-usage stuff -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-19 Ben Wing <ben@xemacs.org> * diagnose.el (show-object-memory-usage-stats): Rewrite to take into account non-lisp-storage statistics returned by garbage-collect-1 and friends. src/ChangeLog addition: 2010-03-19 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (struct): * alloc.c (tick_lrecord_stats): * alloc.c (gc_sweep_1): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (compute_memusage_stats_length): Call new memory-usage mechanism at sweep time to compute extra memory utilization for all objects. Add up the values element-by- element to get an aggregrate set of statistics, where each is the sum of the values of a single statistic across different objects of the same type. At end of sweep time, call finish_object_memory_usage_stats() to add up all the aggreggrate stats that are related to non-Lisp memory storage to compute a single value, and add it to the list of values returned by `garbage-collect' and `object-memory-usage-stats'. * buffer.c (compute_buffer_text_usage): Don't crash on buffers without text (killed buffers?) and don't double-count indirect buffers. * elhash.c: * elhash.c (hash_table_objects_create): * elhash.c (vars_of_elhash): * symsinit.h: Add memory-usage method to count the size of `hentries'. * emacs.c (main_1): Call new functions in elhash.c, frame.c at init. * frame.c: * frame.c (compute_frame_usage): * frame.c (frame_memory_usage): * frame.c (frame_objects_create): * symsinit.h: Add memory-usage method to count gutter display structures, subwindow exposures. * gc.c (gc_finish): * lisp.h: Declare finish_object_memory_usage_stats(), call it in gc_finish(). * lrecord.h (struct lrecord_implementation): * lrecord.h (INIT_MEMORY_USAGE_STATS): New value in implementation struct to track number of non-Lisp-memory statistics. Computed in alloc.c.

/*
 * 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 ();
}