various fixes to memory-usage stats -------------------- ChangeLog entries follow: -------------------- lisp/ChangeLog addition: 2010-03-25 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 in show-object-memory-usage-stats showing the ancillary Lisp overhead used with each type; shrink columns for windows in show-memory-usage to get it to fit in 79 chars. src/ChangeLog addition: 2010-03-25 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (struct): * alloc.c (finish_object_memory_usage_stats): * alloc.c (object_memory_usage_stats): * alloc.c (Fobject_memory_usage): * alloc.c (lisp_object_memory_usage_full): * alloc.c (compute_memusage_stats_length): * lrecord.h: * lrecord.h (struct lrecord_implementation): Add fields to the `lrecord_implementation' structure to list an offset into the array of extra statistics in a `struct generic_usage_stats' and a length, listing the first slice of ancillary Lisp-object memory. Compute automatically in compute_memusage_stats_length(). Use to add an entry `FOO-lisp-ancillary-storage' for object type FOO. Don't crash when an int or char is given to object-memory-usage, signal an error instead. Add functions lisp_object_memory_usage_full() and lisp_object_memory_usage() to compute the total memory usage of an object (sum of object, non-Lisp attached, and Lisp ancillary memory). * array.c: * array.c (gap_array_memory_usage): * array.h: Add function to return memory usage of a gap array. * buffer.c (struct buffer_stats): * buffer.c (compute_buffer_usage): * buffer.c (vars_of_buffer): * extents.c (compute_buffer_extent_usage): * marker.c: * marker.c (compute_buffer_marker_usage): * extents.h: * lisp.h: Remove `struct usage_stats' arg from compute_buffer_marker_usage() and compute_buffer_extent_usage() -- these are ancillary Lisp objects and don't get accumulated into `struct usage_stats'; change the value of `memusage_stats_list' so that `markers' and `extents' memory is in Lisp-ancillary, where it belongs. In compute_buffer_marker_usage(), use lisp_object_memory_usage() rather than lisp_object_storage_size(). * casetab.c: * casetab.c (case_table_memory_usage): * casetab.c (vars_of_casetab): * emacs.c (main_1): Add memory usage stats for case tables. * lisp.h: Add comment explaining the `struct generic_usage_stats' more, as well as the new fields in lrecord_implementation. * console-impl.h: * console-impl.h (struct console_methods): * scrollbar-gtk.c: * scrollbar-gtk.c (gtk_compute_scrollbar_instance_usage): * scrollbar-msw.c: * scrollbar-msw.c (mswindows_compute_scrollbar_instance_usage): * scrollbar-x.c: * scrollbar-x.c (x_compute_scrollbar_instance_usage): * scrollbar.c: * scrollbar.c (struct scrollbar_instance_stats): * scrollbar.c (compute_all_scrollbar_instance_usage): * scrollbar.c (scrollbar_instance_memory_usage): * scrollbar.c (scrollbar_objects_create): * scrollbar.c (vars_of_scrollbar): * scrollbar.h: * symsinit.h: * window.c: * window.c (find_window_mirror_maybe): * window.c (struct window_mirror_stats): * window.c (compute_window_mirror_usage): * window.c (window_mirror_memory_usage): * window.c (compute_window_usage): * window.c (window_objects_create): * window.c (syms_of_window): * window.c (vars_of_window): Redo memory-usage associated with windows, window mirrors, and scrollbar instances. Should fix crash in find_window_mirror, among other things. Properly assign memo ry to object memory, non-Lisp extra memory, and Lisp ancillary memory. For example, redisplay structures are non-Lisp memory hanging off a window mirror, not a window; make it an ancillary Lisp-object field. Window mirrors and scrollbar instances have their own statistics, among other things.

+
−/*
+
− * 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 download all the files we need to
+
−   do the installation. */
+
−
+
−#include <stdio.h>
+
−#include <sys/types.h>
+
−#include <sys/stat.h>
+
−
+
−#include "win32.h"
+
−
+
−#include "resource.h"
+
−#include "msg.h"
+
−#include "ini.h"
+
−#include "dialog.h"
+
−#include "concat.h"
+
−#include "geturl.h"
+
−#include "state.h"
+
−#include "mkdir.h"
+
−#include "log.h"
+
−
+
−static int
+
−download_one (char *name, int expected_size)
+
−{
+
−  char *local = name;
+
−
+
−  struct stat s;
+
−  if (stat (local, &s) >= 0)
+
−    if (s.st_size == expected_size)
+
−      return 0;
+
−
+
−  mkdir_p (0, local);
+
−
+
−  if (get_url_to_file (concat (MIRROR_SITE, "/", name, 0),
+
−		       concat (local, ".tmp", 0),
+
−		       expected_size))
+
−    {
+
−      note (IDS_DOWNLOAD_FAILED, name);
+
−      return 1;
+
−    }
+
−  else
+
−    {
+
−      stat (concat (local, ".tmp", 0), &s);
+
−      if (s.st_size == expected_size)
+
−	{
+
−	  log (0, "Downloaded %s", local);
+
−	  rename (concat (local, ".tmp", 0), local);
+
−	}
+
−      else
+
−	{
+
−	  log (0, "Download %s wrong size (%d actual vs %d expected)",
+
−	       local, s.st_size, expected_size);
+
−	  note (IDS_DOWNLOAD_SHORT, local, s.st_size, expected_size);
+
−	  return 1;
+
−	}
+
−    }
+
−
+
−  return 0;
+
−}
+
−
+
−void
+
−do_download (HINSTANCE h)
+
−{
+
−  int i;
+
−  int errors = 0;
+
−
+
−  for (i=0; i<npackages; i++)
+
−    if (package[i].action == ACTION_NEW || package[i].action == ACTION_UPGRADE)
+
−      {
+
−	int e = download_one (pi.install, pi.install_size);
+
−	if (package[i].srcaction == SRCACTION_YES && pi.source)
+
−	  e += download_one (pi.source, pi.source_size);
+
−	errors += e;
+
−	if (e)
+
−	  package[i].action = ACTION_ERROR;
+
−      }
+
−
+
−  dismiss_url_status_dialog ();
+
−
+
−  if (errors)
+
−    {
+
−      if (yesno (IDS_DOWNLOAD_INCOMPLETE) == IDYES)
+
−	{
+
−	  next_dialog = IDD_SITE;
+
−	  return;
+
−	}
+
−    }
+
−
+
−  if (source == IDC_SOURCE_DOWNLOAD)
+
−    {
+
−      if (errors)
+
−	exit_msg = IDS_DOWNLOAD_INCOMPLETE;
+
−      else
+
−	exit_msg = IDS_DOWNLOAD_COMPLETE;
+
−      next_dialog = 0;
+
−    }
+
−  else
+
−    next_dialog = IDD_S_INSTALL;
+
−}