annotate netinstall/autoload.c @ 5167:e374ea766cc1

clean up, rearrange allocation statistics code -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-03-21 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (assert_proper_sizing): * alloc.c (c_readonly): * alloc.c (malloced_storage_size): * alloc.c (fixed_type_block_overhead): * alloc.c (lisp_object_storage_size): * alloc.c (inc_lrecord_stats): * alloc.c (dec_lrecord_stats): * alloc.c (pluralize_word): * alloc.c (object_memory_usage_stats): * alloc.c (Fobject_memory_usage): * alloc.c (compute_memusage_stats_length): * alloc.c (disksave_object_finalization_1): * alloc.c (Fgarbage_collect): * mc-alloc.c: * mc-alloc.c (mc_alloced_storage_size): * mc-alloc.h: No functionality change here. Collect the allocations-statistics code that was scattered throughout alloc.c into one place. Add remaining section headings so that all sections have headings clearly identifying the start of the section and its purpose. Expose mc_alloced_storage_size() even when not MEMORY_USAGE_STATS; this fixes build problems and is related to the export of lisp_object_storage_size() and malloced_storage_size() when non-MEMORY_USAGE_STATS in the previous change set.
author Ben Wing <ben@xemacs.org>
date Sun, 21 Mar 2010 04:41:49 -0500
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18 typedef struct {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 char *name;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 HINSTANCE handle;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 } DllInfo;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #define DLL(n) static DllInfo n ## _info __asm__ (#n "_info") = { #n, 0}
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #define Auto(dll, func, size) \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 __asm__ ("\t.data"); \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 __asm__ ("\t.global\t_" #func "@" #size); \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 __asm__ ("_" #func "@" #size ":"); \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 __asm__ ("\tcall\tautoload_common"); \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 __asm__ ("\t.long\t" #dll "_info"); \
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 __asm__ ("\t.ascii\t\"" #func "\\0\"")
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 DLL (wininet);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 Auto (wininet, InternetAttemptConnect, 4);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 Auto (wininet, InternetCloseHandle, 4);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 Auto (wininet, InternetGetLastResponseInfoA, 12);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 Auto (wininet, InternetOpenA, 20);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 Auto (wininet, InternetOpenUrlA, 24);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 Auto (wininet, InternetReadFile, 16);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 Auto (wininet, InternetSetOptionA, 16);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 Auto (wininet, InternetQueryOptionA, 16);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 Auto (wininet, HttpQueryInfoA, 20);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 Auto (wininet, HttpSendRequestA, 20);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 typedef struct {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 DllInfo *dll;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 char name[100];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 } AutoEntry;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 static void autoload_common () __asm__ ("autoload_common");
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 autoload_common (int x)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 int fp, rel;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 unsigned char *proc;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 HINSTANCE h;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 AutoEntry *a;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 a = *(AutoEntry **)(&x - 1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 if (a->dll->handle == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 h = LoadLibrary (a->dll->name);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 a->dll->handle = h;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 fp = (int) GetProcAddress (a->dll->handle, a->name);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 proc = ((unsigned char *)a) - 5;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 rel = fp - (int)(a); /* now it's a relative call */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 *proc++ = 0xe9; /* jump near 32-bit relative */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 *proc++ = rel;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 *proc++ = rel>>8;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 *proc++ = rel>>16;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 *proc++ = rel>>24;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 *(int *)(&x-1) = (int)proc-5;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 }