comparison src/extents.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 d1247f3cc363
children b5df3737028a
comparison
equal deleted inserted replaced
5123:fc85923c49af 5124:623d57b7fbe8
1264 mark_extent_info, 1264 mark_extent_info,
1265 extent_info_description, 1265 extent_info_description,
1266 struct extent_info); 1266 struct extent_info);
1267 #else /* not NEW_GC */ 1267 #else /* not NEW_GC */
1268 static void 1268 static void
1269 finalize_extent_info (void *header, int for_disksave) 1269 finalize_extent_info (void *header)
1270 { 1270 {
1271 struct extent_info *data = (struct extent_info *) header; 1271 struct extent_info *data = (struct extent_info *) header;
1272
1273 if (for_disksave)
1274 return;
1275 1272
1276 data->soe = 0; 1273 data->soe = 0;
1277 data->extents = 0; 1274 data->extents = 0;
1278 if (data->soe) 1275 if (data->soe)
1279 { 1276 {
1286 data->extents = 0; 1283 data->extents = 0;
1287 } 1284 }
1288 } 1285 }
1289 1286
1290 DEFINE_NODUMP_LISP_OBJECT ("extent-info", extent_info, 1287 DEFINE_NODUMP_LISP_OBJECT ("extent-info", extent_info,
1291 mark_extent_info, 0, 1288 mark_extent_info, internal_object_printer,
1292 finalize_extent_info, 0, 0, 1289 finalize_extent_info, 0, 0,
1293 extent_info_description, 1290 extent_info_description,
1294 struct extent_info); 1291 struct extent_info);
1295 #endif /* not NEW_GC */ 1292 #endif /* not NEW_GC */
1296 1293
1297 static Lisp_Object 1294 static Lisp_Object
1298 allocate_extent_info (void) 1295 allocate_extent_info (void)
1299 { 1296 {
1465 1462
1466 /* Don't destroy the extents here -- there may still be children 1463 /* Don't destroy the extents here -- there may still be children
1467 extents pointing to the extents. */ 1464 extents pointing to the extents. */
1468 detach_all_extents (wrap_buffer (b)); 1465 detach_all_extents (wrap_buffer (b));
1469 #ifndef NEW_GC 1466 #ifndef NEW_GC
1470 finalize_extent_info (data, 0); 1467 finalize_extent_info (data);
1471 #endif /* not NEW_GC */ 1468 #endif /* not NEW_GC */
1472 } 1469 }
1473 1470
1474 /* Retrieve the extent list that an extent is a member of; the 1471 /* Retrieve the extent list that an extent is a member of; the
1475 return value will never be 0 except in destroyed buffers (in which 1472 return value will never be 0 except in destroyed buffers (in which
3459 extent_plist (Lisp_Object obj) 3456 extent_plist (Lisp_Object obj)
3460 { 3457 {
3461 return Fextent_properties (obj); 3458 return Fextent_properties (obj);
3462 } 3459 }
3463 3460
3464 DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT_WITH_PROPS ("extent", extent, 3461 DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT ("extent", extent,
3465 mark_extent, 3462 mark_extent,
3466 print_extent, 3463 print_extent,
3467 /* NOTE: If you declare a 3464 /* NOTE: If you declare a
3468 finalization method here, 3465 finalization method here,
3469 it will NOT be called. 3466 it will NOT be called.
3471 0, 3468 0,
3472 extent_equal, extent_hash, 3469 extent_equal, extent_hash,
3473 extent_description, 3470 extent_description,
3474 extent_getprop, extent_putprop, 3471 extent_getprop, extent_putprop,
3475 extent_remprop, extent_plist, 3472 extent_remprop, extent_plist,
3473 0 /* no disksaver */,
3476 struct extent); 3474 struct extent);
3477 3475
3478 /************************************************************************/ 3476 /************************************************************************/
3479 /* basic extent accessors */ 3477 /* basic extent accessors */
3480 /************************************************************************/ 3478 /************************************************************************/