Mercurial > hg > xemacs-beta
view netinstall/fromcwd.cc @ 5170:5ddbab03b0e6
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.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Thu, 25 Mar 2010 06:07:25 -0500 |
parents | 3078fd1074e8 |
children |
line wrap: on
line source
/* * 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 handle the case where we're installing from files that already exist in the current directory. If a setup.ini file is present, we set the mirror site to "." and pretend we're installing from the `internet' ;-) else we have to find all the .tar.gz files, deduce their versions, and try to compare versions in the case where the current directory contains multiple versions of any given package. We do *not* try to compare versions with already installed packages; we always choose a package in the current directory over one that's already installed (otherwise, why would you have asked to install it?). Note that we search recursively. */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <io.h> #include <ctype.h> #ifndef WIN32_NATIVE #include <unistd.h> #endif #include "ini.h" #include "resource.h" #include "concat.h" #include "state.h" #include "dialog.h" #include "msg.h" #include "find.h" #include "version.h" #include "port.h" static int is_test_version (char *v) { int i; for (i=0; v[i] && isdigit (v[i]); i++) ; return (i >= 6) ? 1 : 0; } char * canonicalize_version (char *v) { static char nv[3][100]; static int idx = 0; char *np, *dp; int i; idx = (idx+1) % 3; np = nv[idx]; while (*v) { if (isdigit (*v)) { for (dp=v; *dp && isdigit (*dp); dp++) ; for (i=dp-v; i<12; i++) *np++ = '0'; while (v < dp) *np++ = *v++; } else *np++ = *v++; } *np++ = 0; return nv[idx]; } static void found_file (char *path, unsigned int fsize) { char base[_MAX_PATH], *ver; int l = strlen (path); if (strcmp (path + l - 7, ".tar.gz") != 0) return; if (strstr (path, "-src.")) return; if (strstr (path, "-patch.")) return; char *sl = strrchr (path, '/'); if (sl) sl ++; else sl = path; strcpy (base, sl); base[strlen (base) - 7] = 0; /* remove .tar.gz */ for (ver=base; *ver; ver++) if ((*ver == '-' || *ver == '_') && isdigit (ver[1])) { *ver++ = 0; break; } Package *p = 0; int i; for (i=0; i<npackages; i++) if (strcmp (package[i].name, base) == 0) { p = package + i; break; } if (p == 0) p = new_package (strdup (base)); int trust = is_test_version (ver) ? TRUST_TEST : TRUST_CURR; if (!*ver) trust = TRUST_PREV; /* See if this version is older than what we have */ if (p->info[trust].version) { char *ov = canonicalize_version (p->info[trust].version); char *nv = canonicalize_version (ver); if (strcmp (ov, nv) > 0) return; } l = strlen (base); if (l >= 5 && strcmp (base + l - 5, "win32") == 0) p->type = TY_NATIVE; if (l >= 8 && strcmp (base + l - 8, "cygwin32") == 0) p->type = TY_CYGWIN; p->info[trust].version = strdup (ver); p->info[trust].install = strdup (path); p->info[trust].install_size = fsize; } void do_fromcwd (HINSTANCE h) { if (_access ("./setup.ini", 0) == 0) { mirror_site = "."; next_dialog = IDD_S_LOAD_INI; return; } next_dialog = IDD_CHOOSE; find (".", found_file); // Now see about source tarballs int i, t; Package *p; char srcpath[_MAX_PATH]; for (i=0; i<npackages; i++) { p = package+i; for (t=TRUST_PREV; t<=TRUST_TEST; t++) if (p->info[t].install) { strcpy (srcpath, p->info[t].install); strcpy (srcpath + strlen (srcpath) - 7, "-src.tar.gz"); msg ("looking for %s", srcpath); WIN32_FIND_DATA wfd; HANDLE h = FindFirstFile (srcpath, &wfd); if (h != INVALID_HANDLE_VALUE) { msg("-- got it"); FindClose (h); p->info[t].source = strdup (srcpath); p->info[t].source_size = wfd.nFileSizeLow; } } } return; }