Mercurial > hg > xemacs-beta
view netinstall/nio-http.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> * */ /* This file is responsible for implementing all direct HTTP protocol channels. It is intentionally simplistic. */ #include "win32.h" #include "winsock.h" #include <stdio.h> #include <stdlib.h> #include "resource.h" #include "state.h" #include "simpsock.h" #include "msg.h" #include "netio.h" #include "nio-http.h" static char six2pr[64] = { 'A','B','C','D','E','F','G','H','I','J','K','L','M', 'N','O','P','Q','R','S','T','U','V','W','X','Y','Z', 'a','b','c','d','e','f','g','h','i','j','k','l','m', 'n','o','p','q','r','s','t','u','v','w','x','y','z', '0','1','2','3','4','5','6','7','8','9','+','/' }; static char * base64_encode (char *username, char *password) { unsigned char *ep; char *rp; static char *rv = 0; if (rv) free (rv); rv = (char *) malloc (2 * (strlen (username) + strlen (password)) + 5); char *up = (char *) malloc (strlen (username) + strlen (password) + 6); strcpy (up, username); strcat (up, ":"); strcat (up, password); ep = (unsigned char *)up + strlen (up); *ep++ = 0; *ep++ = 0; *ep++ = 0; char block[4]; rp = rv; for (ep = (unsigned char *)up; *ep; ep += 3) { block[0] = six2pr[ep[0] >> 2]; block[1] = six2pr[((ep[0] << 4) & 0x30) | ((ep[1] >> 4) & 0x0f)]; block[2] = six2pr[((ep[1] << 2) & 0x3c) | ((ep[2] >> 6) & 0x03)]; block[3] = six2pr[ep[2] & 0x3f]; if (ep[1] == 0) block[2] = block[3] = '='; if (ep[2] == 0) block[3] = '='; memcpy (rp, block, 4); rp += 4; } *rp = 0; free (up); return rv; } NetIO_HTTP::NetIO_HTTP (char *Purl) : NetIO (Purl) { retry_get: if (port == 0) port = 80; if (net_method == IDC_NET_PROXY) s = new SimpleSocket (net_proxy_host, net_proxy_port); else s = new SimpleSocket (host, port); if (!s->ok()) { s = 0; return; } if (net_method == IDC_NET_PROXY) s->printf ("GET %s HTTP/1.0\r\n", url); else s->printf ("GET %s HTTP/1.0\r\n", path); s->printf ("Host: %s:%d\r\n", host, port); if (net_user && net_passwd) s->printf ("Authorization: Basic %s\r\n", base64_encode (net_user, net_passwd)); if (net_proxy_user && net_proxy_passwd) s->printf ("Proxy-Authorization: Basic %s\r\n", base64_encode (net_proxy_user, net_proxy_passwd)); s->printf ("\r\n"); char *l = s->gets (); int code; sscanf (l, "%*s %d", &code); if (code >= 300 && code < 400) { do { l = s->gets (); if (_strnicmp (l, "Location:", 9) == 0) { char *u = l + 9; while (*u == ' ' || *u == '\t') u++; set_url (u); delete s; goto retry_get; } } while (*l); } if (code == 401) /* authorization required */ { get_auth (); delete s; goto retry_get; } if (code == 407) /* proxy authorization required */ { get_proxy_auth (); delete s; goto retry_get; } if (code >= 300) { delete s; s = 0; return; } do { l = s->gets (); if (_strnicmp (l, "Content-Length:", 15) == 0) sscanf (l, "%*s %d", &file_size); } while (*l); } NetIO_HTTP::~NetIO_HTTP () { if (s) delete s; } int NetIO_HTTP::ok () { if (s) return 1; return 0; } int NetIO_HTTP::read (char *buf, int nbytes) { return s->read (buf, nbytes); }