Mercurial > hg > xemacs-beta
view netinstall/netio.cc @ 5158:9e0b43d3095c
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.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 19 Mar 2010 14:47:44 -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 coordinate the various access methods known to setup. To add a new method, create a pair of nio-*.[ch] files and add the logic to NetIO::open here */ #include "win32.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "resource.h" #include "state.h" #include "msg.h" #include "netio.h" #include "nio-file.h" #include "nio-ie5.h" #include "nio-http.h" #include "nio-ftp.h" #include "dialog.h" #include "log.h" #include "port.h" NetIO::NetIO (char *Purl) { set_url (Purl); } NetIO::~NetIO () { if (url) free (url); if (proto) free (proto); if (host) free (host); if (path) free (path); } void NetIO::set_url (char *Purl) { char *bp, *ep, c; file_size = 0; url = _strdup (Purl); proto = 0; host = 0; port = 0; path = 0; bp = url; ep = strstr (bp, "://"); if (!ep) { path = url; return; } *ep = 0; proto = _strdup (bp); *ep = ':'; bp = ep+3; ep = bp + strcspn (bp, ":/"); c = *ep; *ep = 0; host = _strdup (bp); *ep = c; if (*ep == ':') { port = atoi (ep+1); ep = strchr (ep, '/'); } if (*ep) path = _strdup (ep); } int NetIO::ok () { return 0; } int NetIO::read (char *buf, int nbytes) { return 0; } NetIO * NetIO::open (char *url) { NetIO *rv = 0; enum {http, ftp, file} proto; if (strncmp (url, "http://", 7) == 0) proto = http; else if (strncmp (url, "ftp://", 6) == 0) proto = ftp; else proto = file; if (proto == file) rv = new NetIO_File (url); else if (net_method == IDC_NET_IE5) rv = new NetIO_IE5 (url); else if (net_method == IDC_NET_PROXY) rv = new NetIO_HTTP (url); else if (net_method == IDC_NET_DIRECT) { switch (proto) { case http: rv = new NetIO_HTTP (url); break; case ftp: rv = new NetIO_FTP (url); break; } } if (!rv->ok ()) { delete rv; return 0; } return rv; } static char **user, **passwd; static int loading = 0; static void check_if_enable_ok (HWND h) { int e = 0; if (*user && *passwd) e = 1; EnableWindow (GetDlgItem (h, IDOK), e); } static void load_dialog (HWND h) { loading = 1; eset (h, IDC_NET_USER, *user); eset (h, IDC_NET_PASSWD, *passwd); check_if_enable_ok (h); loading = 0; } static void save_dialog (HWND h) { *user = eget (h, IDC_NET_USER, *user); *passwd = eget (h, IDC_NET_PASSWD, *passwd); } static BOOL auth_cmd (HWND h, int id, HWND hwndctl, UINT code) { switch (id) { case IDC_NET_USER: case IDC_NET_PASSWD: if (code == EN_CHANGE && !loading) { save_dialog (h); check_if_enable_ok (h); } break; case IDOK: save_dialog (h); EndDialog (h, 0); break; case IDCANCEL: EndDialog (h, 1); exit_setup (1); break; } return FALSE; } static BOOL CALLBACK auth_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_INITDIALOG: load_dialog (h); return FALSE; case WM_COMMAND: return HANDLE_WM_COMMAND (h, wParam, lParam, auth_cmd); } return FALSE; } static int auth_common (HINSTANCE h, int id) { return DialogBox (h, MAKEINTRESOURCE (id), 0, auth_proc); } int NetIO::get_auth () { user = &net_user; passwd = &net_passwd; return auth_common (hinstance, IDD_NET_AUTH); } int NetIO::get_proxy_auth () { user = &net_proxy_user; passwd = &net_proxy_passwd; return auth_common (hinstance, IDD_PROXY_AUTH); }