comparison src/objects.c @ 5124:623d57b7fbe8 ben-lisp-object

separate regular and disksave finalization, print method fixes. Create separate disksave method and make the finalize method only be for actual object finalization, not disksave finalization. Fix places where 0 was given in place of a printer -- print methods are mandatory, and internal objects formerly without a print method now must explicitly specify internal_object_printer(). Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (very_old_free_lcrecord): * alloc.c (disksave_object_finalization_1): * alloc.c (make_lcrecord_list): * alloc.c (alloc_managed_lcrecord): * alloc.c (free_managed_lcrecord): * alloc.c (sweep_lcrecords_1): * buffer.c: * bytecode.c: * bytecode.c (Fcompiled_function_p): * chartab.c: * console-impl.h: * console-impl.h (CONSOLE_TYPE_P): * console.c: * console.c (set_quit_events): * data.c: * data.c (Fmake_ephemeron): * database.c: * database.c (finalize_database): * database.c (Fclose_database): * device-msw.c: * device-msw.c (finalize_devmode): * device-msw.c (allocate_devmode): * device.c: * elhash.c: * elhash.c (finalize_hash_table): * eval.c: * eval.c (bind_multiple_value_limits): * event-stream.c: * event-stream.c (finalize_command_builder): * events.c: * events.c (mark_event): * extents.c: * extents.c (finalize_extent_info): * extents.c (uninit_buffer_extents): * faces.c: * file-coding.c: * file-coding.c (finalize_coding_system): * file-coding.h: * file-coding.h (struct coding_system_methods): * file-coding.h (struct detector): * floatfns.c: * floatfns.c (extract_float): * fns.c: * fns.c (Fidentity): * font-mgr.c (finalize_fc_pattern): * font-mgr.c (finalize_fc_config): * frame.c: * glyphs.c: * glyphs.c (finalize_image_instance): * glyphs.c (unmap_subwindow_instance_cache_mapper): * gui.c: * gui.c (gui_error): * keymap.c: * lisp.h (struct Lisp_Symbol): * lrecord.h: * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (finalize_lstream): * lstream.c (disksave_lstream): * marker.c: * marker.c (finalize_marker): * mule-charset.c (make_charset): * number.c: * objects.c: * objects.c (finalize_color_instance): * objects.c (finalize_font_instance): * opaque.c: * opaque.c (make_opaque_ptr): * process-nt.c: * process-nt.c (nt_finalize_process_data): * process-nt.c (nt_deactivate_process): * process.c: * process.c (finalize_process): * procimpl.h (struct process_methods): * scrollbar.c: * scrollbar.c (free_scrollbar_instance): * specifier.c (finalize_specifier): * symbols.c: * toolbar.c: * toolbar.c (Ftoolbar_button_p): * tooltalk.c: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_finalizer): * ui-gtk.c (allocate_emacs_gtk_boxed_data): * window.c: * window.c (finalize_window): * window.c (mark_window_as_deleted): Separate out regular and disksave finalization. Instead of a FOR_DISKSAVE argument to the finalizer, create a separate object method `disksaver'. Make `finalizer' have only one argument. Go through and separate out all finalize methods into finalize and disksave. Delete lots of thereby redundant disksave checking. Delete places that signal an error if we attempt to disksave -- all of these objects are non-dumpable and we will get an error from pdump anyway if we attempt to dump them. After this is done, only one object remains that has a disksave method -- lstream. Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT, which is used for specifying either property methods or disksave methods (or in the future, any other less-used methods). Remove the for_disksave argument to finalize_process_data. Don't provide a disksaver for processes because no one currently needs it. Clean up various places where objects didn't provide a print method. It was made mandatory in previous changes, and all methods now either provide their own print method or use internal_object_printer or external_object_printer. Change the definition of CONSOLE_LIVE_P to use the contype enum rather than looking into the conmeths structure -- in some weird situations with dead objects, the conmeths structure is NULL, and printing such objects from debug_print() will crash if we try to look into the conmeths structure.
author Ben Wing <ben@xemacs.org>
date Wed, 20 Jan 2010 07:05:57 -0600
parents e0db3c197671
children b5df3737028a
comparison
equal deleted inserted replaced
5123:fc85923c49af 5124:623d57b7fbe8
111 (c, printcharfun, escapeflag)); 111 (c, printcharfun, escapeflag));
112 write_fmt_string (printcharfun, " 0x%x>", c->header.uid); 112 write_fmt_string (printcharfun, " 0x%x>", c->header.uid);
113 } 113 }
114 114
115 static void 115 static void
116 finalize_color_instance (void *header, int for_disksave) 116 finalize_color_instance (void *header)
117 { 117 {
118 Lisp_Color_Instance *c = (Lisp_Color_Instance *) header; 118 Lisp_Color_Instance *c = (Lisp_Color_Instance *) header;
119 119
120 if (!NILP (c->device)) 120 if (!NILP (c->device))
121 { 121 MAYBE_DEVMETH (XDEVICE (c->device), finalize_color_instance, (c));
122 if (for_disksave) finalose (c);
123 MAYBE_DEVMETH (XDEVICE (c->device), finalize_color_instance, (c));
124 }
125 } 122 }
126 123
127 static int 124 static int
128 color_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) 125 color_instance_equal (Lisp_Object obj1, Lisp_Object obj2, int depth)
129 { 126 {
148 : DEVMETH_OR_GIVEN (d, color_instance_hash, (c, depth), 145 : DEVMETH_OR_GIVEN (d, color_instance_hash, (c, depth),
149 LISP_HASH (obj))); 146 LISP_HASH (obj)));
150 } 147 }
151 148
152 DEFINE_NODUMP_LISP_OBJECT ("color-instance", color_instance, 149 DEFINE_NODUMP_LISP_OBJECT ("color-instance", color_instance,
153 mark_color_instance, print_color_instance, 150 mark_color_instance, print_color_instance,
154 finalize_color_instance, color_instance_equal, 151 finalize_color_instance, color_instance_equal,
155 color_instance_hash, 152 color_instance_hash,
156 color_instance_description, 153 color_instance_description,
157 Lisp_Color_Instance); 154 Lisp_Color_Instance);
158 155
159 DEFUN ("make-color-instance", Fmake_color_instance, 1, 3, 0, /* 156 DEFUN ("make-color-instance", Fmake_color_instance, 1, 3, 0, /*
160 Return a new `color-instance' object named NAME (a string). 157 Return a new `color-instance' object named NAME (a string).
161 158
162 Optional argument DEVICE specifies the device this object applies to 159 Optional argument DEVICE specifies the device this object applies to
331 } 328 }
332 write_fmt_string (printcharfun, " 0x%x>", f->header.uid); 329 write_fmt_string (printcharfun, " 0x%x>", f->header.uid);
333 } 330 }
334 331
335 static void 332 static void
336 finalize_font_instance (void *header, int for_disksave) 333 finalize_font_instance (void *header)
337 { 334 {
338 Lisp_Font_Instance *f = (Lisp_Font_Instance *) header; 335 Lisp_Font_Instance *f = (Lisp_Font_Instance *) header;
339 336
340 if (!NILP (f->device)) 337 if (!NILP (f->device))
341 { 338 {
342 if (for_disksave) finalose (f);
343 MAYBE_DEVMETH (XDEVICE (f->device), finalize_font_instance, (f)); 339 MAYBE_DEVMETH (XDEVICE (f->device), finalize_font_instance, (f));
344 } 340 }
345 } 341 }
346 342
347 /* Fonts are equal if they resolve to the same name. 343 /* Fonts are equal if they resolve to the same name.
366 (obj, ERROR_ME_DEBUG_WARN), 362 (obj, ERROR_ME_DEBUG_WARN),
367 depth + 1); 363 depth + 1);
368 } 364 }
369 365
370 DEFINE_NODUMP_LISP_OBJECT ("font-instance", font_instance, 366 DEFINE_NODUMP_LISP_OBJECT ("font-instance", font_instance,
371 mark_font_instance, print_font_instance, 367 mark_font_instance, print_font_instance,
372 finalize_font_instance, font_instance_equal, 368 finalize_font_instance, font_instance_equal,
373 font_instance_hash, font_instance_description, 369 font_instance_hash, font_instance_description,
374 Lisp_Font_Instance); 370 Lisp_Font_Instance);
375 371
376 372
377 /* #### Why is this exposed to Lisp? Used in: 373 /* #### Why is this exposed to Lisp? Used in:
378 x-frob-font-size, gtk-font-menu-load-font, x-font-menu-load-font-xft, 374 x-frob-font-size, gtk-font-menu-load-font, x-font-menu-load-font-xft,
379 x-font-menu-load-font-core, mswindows-font-menu-load-font, 375 x-font-menu-load-font-core, mswindows-font-menu-load-font,