Mercurial > hg > xemacs-beta
annotate netinstall/autoload.c @ 5160:ab9ee10a53e4
fix various problems with allocation statistics, track overhead properly
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-20 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 showing the overhead used with each type,
and add it into the grand total memory usage.
src/ChangeLog addition:
2010-03-20 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (init_lrecord_stats):
* alloc.c (free_normal_lisp_object):
* alloc.c (struct):
* alloc.c (clear_lrecord_stats):
* alloc.c (tick_lrecord_stats):
* alloc.c (COUNT_FROB_BLOCK_USAGE):
* alloc.c (COPY_INTO_LRECORD_STATS):
* alloc.c (sweep_strings):
* alloc.c (UNMARK_string):
* alloc.c (gc_sweep_1):
* alloc.c (finish_object_memory_usage_stats):
* alloc.c (object_memory_usage_stats):
* alloc.c (object_dead_p):
* alloc.c (fixed_type_block_overhead):
* alloc.c (lisp_object_storage_size):
* emacs.c (main_1):
* lisp.h:
* lrecord.h:
Export lisp_object_storage_size() and malloced_storage_size() even
when not MEMORY_USAGE_STATS, to get the non-MEMORY_USAGE_STATS
build to compile.
Don't export fixed_type_block_overhead() any more.
Some code cleanup, rearrangement, add some section headers.
Clean up various bugs especially involving computation of overhead
and double-counting certain usage in total_gc_usage. Add
statistics computing the overhead used by all types. Don't add a
special entry for string headers in the object-memory-usage-stats
because it's already present as just "string". But do count the
overhead used by long strings. Don't try to call the
memory_usage() methods when NEW_GC because there's nowhere obvious
in the sweep stage to make the calls.
* marker.c (compute_buffer_marker_usage):
Just use lisp_object_storage_size() rather than trying to
reimplement it.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 20 Mar 2010 20:20:30 -0500 |
parents | 3078fd1074e8 |
children |
rev | line source |
---|---|
448 | 1 /* |
2 * Copyright (c) 2000, Red Hat, Inc. | |
3 * | |
4 * This program is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * A copy of the GNU General Public License can be found at | |
10 * http://www.gnu.org/ | |
11 * | |
12 * Written by DJ Delorie <dj@cygnus.com> | |
13 * | |
14 */ | |
15 | |
16 #include "win32.h" | |
17 | |
18 typedef struct { | |
19 char *name; | |
20 HINSTANCE handle; | |
21 } DllInfo; | |
22 | |
23 #define DLL(n) static DllInfo n ## _info __asm__ (#n "_info") = { #n, 0} | |
24 | |
25 #define Auto(dll, func, size) \ | |
26 __asm__ ("\t.data"); \ | |
27 __asm__ ("\t.global\t_" #func "@" #size); \ | |
28 __asm__ ("_" #func "@" #size ":"); \ | |
29 __asm__ ("\tcall\tautoload_common"); \ | |
30 __asm__ ("\t.long\t" #dll "_info"); \ | |
31 __asm__ ("\t.ascii\t\"" #func "\\0\"") | |
32 | |
33 DLL (wininet); | |
34 | |
35 Auto (wininet, InternetAttemptConnect, 4); | |
36 Auto (wininet, InternetCloseHandle, 4); | |
37 Auto (wininet, InternetGetLastResponseInfoA, 12); | |
38 Auto (wininet, InternetOpenA, 20); | |
39 Auto (wininet, InternetOpenUrlA, 24); | |
40 Auto (wininet, InternetReadFile, 16); | |
41 Auto (wininet, InternetSetOptionA, 16); | |
42 Auto (wininet, InternetQueryOptionA, 16); | |
43 Auto (wininet, HttpQueryInfoA, 20); | |
44 Auto (wininet, HttpSendRequestA, 20); | |
45 | |
46 typedef struct { | |
47 DllInfo *dll; | |
48 char name[100]; | |
49 } AutoEntry; | |
50 | |
51 static void autoload_common () __asm__ ("autoload_common"); | |
52 | |
53 static void | |
54 autoload_common (int x) | |
55 { | |
56 int fp, rel; | |
57 unsigned char *proc; | |
58 HINSTANCE h; | |
59 AutoEntry *a; | |
60 | |
61 a = *(AutoEntry **)(&x - 1); | |
62 if (a->dll->handle == 0) | |
63 { | |
64 h = LoadLibrary (a->dll->name); | |
65 a->dll->handle = h; | |
66 } | |
67 fp = (int) GetProcAddress (a->dll->handle, a->name); | |
68 proc = ((unsigned char *)a) - 5; | |
69 rel = fp - (int)(a); /* now it's a relative call */ | |
70 *proc++ = 0xe9; /* jump near 32-bit relative */ | |
71 *proc++ = rel; | |
72 *proc++ = rel>>8; | |
73 *proc++ = rel>>16; | |
74 *proc++ = rel>>24; | |
75 | |
76 *(int *)(&x-1) = (int)proc-5; | |
77 } |