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 hide the mess needed just to figure
   out how full a given disk is.  There is an old API that can't
   handle disks bigger than 2G, and a new API that isn't always
   available. */

#include "win32.h"
#include "diskfull.h"

typedef   BOOL (WINAPI * GDFS)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER,
			      PULARGE_INTEGER);

int
diskfull (char *path)
{
  GDFS gdfs = 0;

  HINSTANCE k = LoadLibrary ("KERNEL32.DLL");
  if (k)
    {
      gdfs = (GDFS) GetProcAddress (k, "GetDiskFreeSpaceExA");

      if (gdfs)
	{
	  ULARGE_INTEGER avail, total, free;
	  if (gdfs (path, &avail, &total, &free))
	    {
	      int perc = avail.QuadPart * 100 / total.QuadPart;
	      return 100-perc;
	    }
	}
    }

  char root[4];
  if (path[1] != ':')
    return 0;

  root[0] = path[0];
  root[1] = ':';
  root[2] = '\\';
  root[3] = 0;

  DWORD junk, free_clusters, total_clusters;

  if (GetDiskFreeSpace (root, &junk, &junk, &free_clusters, &total_clusters))
    {
      int perc = free_clusters * 100 / total_clusters;
      return 100-perc;
    }

  return 0;
}