Mercurial > hg > xemacs-beta
annotate netinstall/net.cc @ 5169:6c6d78781d59
cleanup of code related to xfree(), better KKCC backtrace capabilities, document XD_INLINE_LISP_OBJECT_BLOCK_PTR, fix some memory leaks, other code cleanup
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-24 Ben Wing <ben@xemacs.org>
* array.h:
* array.h (XD_LISP_DYNARR_DESC):
* dumper.c (pdump_register_sub):
* dumper.c (pdump_store_new_pointer_offsets):
* dumper.c (pdump_reloc_one_mc):
* elhash.c:
* gc.c (lispdesc_one_description_line_size):
* gc.c (kkcc_marking):
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* lrecord.h (enum memory_description_type):
* lrecord.h (enum data_description_entry_flags):
* lrecord.h (struct opaque_convert_functions):
Rename XD_LISP_OBJECT_BLOCK_PTR to XD_INLINE_LISP_OBJECT_BLOCK_PTR
and document it in lrecord.h.
* data.c:
* data.c (finish_marking_weak_lists):
* data.c (continue_marking_ephemerons):
* data.c (finish_marking_ephemerons):
* elhash.c (MARK_OBJ):
* gc.c:
* gc.c (lispdesc_indirect_count_1):
* gc.c (struct):
* gc.c (kkcc_bt_push):
* gc.c (kkcc_gc_stack_push):
* gc.c (kkcc_gc_stack_push_lisp_object):
* gc.c (kkcc_gc_stack_repush_dirty_object):
* gc.c (KKCC_DO_CHECK_FREE):
* gc.c (mark_object_maybe_checking_free):
* gc.c (mark_struct_contents):
* gc.c (mark_lisp_object_block_contents):
* gc.c (register_for_finalization):
* gc.c (mark_object):
* gc.h:
* lisp.h:
* profile.c:
* profile.c (mark_profiling_info_maphash):
Clean up KKCC code related to DEBUG_XEMACS. Rename
kkcc_backtrace() to kkcc_backtrace_1() and add two params: a
`size' arg to control how many stack elements to print and a
`detailed' arg to control whether Lisp objects are printed using
`debug_print()'. Create front-ends to kkcc_backtrace_1() --
kkcc_detailed_backtrace(), kkcc_short_backtrace(),
kkcc_detailed_backtrace_full(), kkcc_short_backtrace_full(), as
well as shortened versions kbt(), kbts(), kbtf(), kbtsf() -- to
call it with various parameter values. Add an `is_lisp' field to
the stack and backtrace structures and use it to keep track of
whether an object pushed onto the stack is a Lisp object or a
non-Lisp structure; in kkcc_backtrace_1(), don't try to print a
non-Lisp structure as a Lisp object.
* elhash.c:
* extents.c:
* file-coding.c:
* lrecord.h:
* lrecord.h (IF_NEW_GC):
* marker.c:
* marker.c (Fmarker_buffer):
* mule-coding.c:
* number.c:
* rangetab.c:
* specifier.c:
New macros IF_OLD_GC(), IF_NEW_GC() to simplify declaration of
Lisp objects when a finalizer may exist in one but not the other.
Use them appropriately.
* extents.c (finalize_extent_info):
Don't zero out data->soe and data->extents before trying to free,
else we get memory leaks.
* lrecord.h (enum lrecord_type):
Make the first lrecord type have value 1 not 0 so that 0 remains
without implementation and attempts to interpret zeroed memory
as a Lisp object will be more obvious.
* array.c (Dynarr_free):
* device-msw.c (msprinter_delete_device):
* device-tty.c (free_tty_device_struct):
* device-tty.c (tty_delete_device):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-x.c:
* emacs.c (free_argc_argv):
* emodules.c (attempt_module_delete):
* file-coding.c (chain_finalize_coding_stream_1):
* file-coding.c (chain_finalize_coding_stream):
* glyphs-eimage.c:
* glyphs-eimage.c (jpeg_instantiate_unwind):
* glyphs-eimage.c (gif_instantiate_unwind):
* glyphs-eimage.c (png_instantiate_unwind):
* glyphs-eimage.c (tiff_instantiate_unwind):
* imgproc.c:
* imgproc.c (build_EImage_quantable):
* insdel.c (uninit_buffer_text):
* mule-coding.c (iso2022_finalize_detection_state):
* objects-tty.c (tty_finalize_color_instance):
* objects-tty.c (tty_finalize_font_instance):
* objects-tty.c (tty_font_list):
* process.c:
* process.c (finalize_process):
* redisplay.c (add_propagation_runes):
* scrollbar-gtk.c:
* scrollbar-gtk.c (gtk_free_scrollbar_instance):
* scrollbar-gtk.c (gtk_release_scrollbar_instance):
* scrollbar-msw.c:
* scrollbar-msw.c (mswindows_free_scrollbar_instance):
* scrollbar-msw.c (unshow_that_mofo):
* scrollbar-x.c (x_free_scrollbar_instance):
* scrollbar-x.c (x_release_scrollbar_instance):
* select-x.c:
* select-x.c (x_handle_selection_request):
* syntax.c:
* syntax.c (uninit_buffer_syntax_cache):
* text.h (eifree):
If possible, whenever we call xfree() on a field in a structure,
set the field to 0 afterwards. A lot of code is written so that
it checks the value being freed to see if it is non-zero before
freeing it -- doing this and setting the value to 0 afterwards
ensures (a) we won't try to free twice if the cleanup code is
called twice; (b) if the object itself stays around, KKCC won't
crash when attempting to mark the freed field.
* rangetab.c:
Add a finalization method when not NEW_GC to avoid memory leaks.
(#### We still get memory leaks when NEW_GC; need to convert gap
array to Lisp object).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Wed, 24 Mar 2010 01:22:51 -0500 |
| parents | 685b588e92d8 |
| 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 * | |
| 673 | 14 * Sync'ed with cinstall 2001-10-16 |
| 448 | 15 */ |
| 16 | |
| 17 /* The purpose of this file is to get the network configuration | |
| 18 information from the user. */ | |
| 19 | |
| 20 #include "win32.h" | |
| 21 #include <stdio.h> | |
| 22 #include <stdlib.h> | |
| 23 #include "dialog.h" | |
| 24 #include "resource.h" | |
| 25 #include "state.h" | |
| 26 #include "msg.h" | |
| 27 #include "log.h" | |
| 28 | |
| 29 static int rb[] = { IDC_NET_IE5, IDC_NET_DIRECT, IDC_NET_PROXY, 0 }; | |
| 30 | |
| 31 static void | |
| 32 check_if_enable_next (HWND h) | |
| 33 { | |
| 34 int e = 0, p = 0, pu = 0; | |
| 35 if (net_method == IDC_NET_IE5) | |
| 36 pu = 1; | |
| 37 if (net_method == IDC_NET_IE5 || net_method == IDC_NET_DIRECT) | |
| 38 e = 1; | |
| 39 else if (net_method == IDC_NET_PROXY) | |
| 40 { | |
| 41 p = pu = 1; | |
| 42 if (net_proxy_host && net_proxy_port) | |
| 43 e = 1; | |
| 44 } | |
| 45 EnableWindow (GetDlgItem (h, IDOK), e); | |
| 46 EnableWindow (GetDlgItem (h, IDC_PROXY_HOST), p); | |
| 47 EnableWindow (GetDlgItem (h, IDC_PROXY_PORT), p); | |
| 48 } | |
| 49 | |
| 50 static void | |
| 51 load_dialog (HWND h) | |
| 52 { | |
| 53 rbset (h, rb, net_method); | |
| 54 eset (h, IDC_PROXY_HOST, net_proxy_host); | |
| 55 if (net_proxy_port == 0) | |
| 56 net_proxy_port = 80; | |
| 57 eset (h, IDC_PROXY_PORT, net_proxy_port); | |
| 58 check_if_enable_next (h); | |
| 59 } | |
| 60 | |
| 61 static void | |
| 62 save_dialog (HWND h) | |
| 63 { | |
| 64 net_method = rbget (h, rb); | |
| 65 net_proxy_host = eget (h, IDC_PROXY_HOST, net_proxy_host); | |
| 66 net_proxy_port = eget (h, IDC_PROXY_PORT); | |
| 67 } | |
| 68 | |
| 69 static BOOL | |
| 70 dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) | |
| 71 { | |
| 72 switch (id) | |
| 73 { | |
| 74 | |
| 75 case IDC_NET_IE5: | |
| 76 case IDC_NET_DIRECT: | |
| 77 case IDC_NET_PROXY: | |
| 78 case IDC_PROXY_HOST: | |
| 79 case IDC_PROXY_PORT: | |
| 80 save_dialog (h); | |
| 81 check_if_enable_next (h); | |
| 82 break; | |
| 83 | |
| 84 case IDOK: | |
| 85 save_dialog (h); | |
| 86 switch (source) | |
| 87 { | |
| 88 case IDC_SOURCE_NETINST: | |
| 89 case IDC_SOURCE_DOWNLOAD: | |
| 90 NEXT (IDD_SITE); | |
| 91 break; | |
| 92 case IDC_SOURCE_CWD: | |
| 93 NEXT (0); | |
| 94 break; | |
| 95 default: | |
| 96 msg ("source is default? %d\n", source); | |
| 97 NEXT (0); | |
| 98 } | |
| 99 break; | |
| 100 | |
| 101 case IDC_BACK: | |
| 102 save_dialog (h); | |
| 103 switch (source) | |
| 104 { | |
| 105 case IDC_SOURCE_DOWNLOAD: | |
| 106 NEXT (IDD_LOCAL_DIR); | |
| 107 break; | |
| 108 case IDC_SOURCE_NETINST: | |
| 109 case IDC_SOURCE_CWD: | |
| 110 NEXT (IDD_ROOT); | |
| 111 break; | |
| 112 } | |
| 113 break; | |
| 114 | |
| 115 case IDCANCEL: | |
| 116 NEXT (0); | |
| 117 break; | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 static BOOL CALLBACK | |
| 122 dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam) | |
| 123 { | |
| 124 switch (message) | |
| 125 { | |
| 126 case WM_INITDIALOG: | |
| 127 load_dialog (h); | |
| 673 | 128 |
| 129 // Check to see if any radio buttons are selected. If not, select a default. | |
| 130 if ((!SendMessage(GetDlgItem (h, IDC_NET_IE5), BM_GETCHECK, 0, 0) == BST_CHECKED) | |
| 131 && (!SendMessage(GetDlgItem (h, IDC_NET_PROXY), BM_GETCHECK, 0, 0) == BST_CHECKED)) | |
| 132 { | |
| 133 SendMessage(GetDlgItem (h, IDC_NET_DIRECT), BM_CLICK, 0, 0); | |
| 134 } | |
| 448 | 135 return FALSE; |
| 136 case WM_COMMAND: | |
| 137 return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd); | |
| 138 } | |
| 139 return FALSE; | |
| 140 } | |
| 141 | |
| 142 void | |
| 143 do_net (HINSTANCE h) | |
| 144 { | |
| 145 int rv = 0; | |
| 146 | |
| 673 | 147 net_method = IDC_NET_DIRECT; |
| 448 | 148 rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc); |
| 149 if (rv == -1) | |
| 150 fatal (IDS_DIALOG_FAILED); | |
| 151 | |
| 152 log (0, "net: %s", | |
| 153 (net_method == IDC_NET_IE5) ? "IE5" : | |
| 154 (net_method == IDC_NET_DIRECT) ? "Direct" : "Proxy"); | |
| 155 } | |
| 156 |