comparison src/opaque.c @ 934:c925bacdda60

[xemacs-hg @ 2002-07-29 09:21:12 by michaels] 2002-07-17 Marcus Crestani <crestani@informatik.uni-tuebingen.de> Markus Kaltenbach <makalten@informatik.uni-tuebingen.de> Mike Sperber <mike@xemacs.org> configure flag to turn these changes on: --use-kkcc First we added a dumpable flag to lrecord_implementation. It shows, if the object is dumpable and should be processed by the dumper. * lrecord.h (struct lrecord_implementation): added dumpable flag (MAKE_LRECORD_IMPLEMENTATION): fitted the different makro definitions to the new lrecord_implementation and their calls. Then we changed mark_object, that it no longer needs a mark method for those types that have pdump descritions. * alloc.c: (mark_object): If the object has a description, the new mark algorithm is called, and the object is marked according to its description. Otherwise it uses the mark method like before. These procedures mark objects according to their descriptions. They are modeled on the corresponding pdumper procedures. (mark_with_description): (get_indirect_count): (structure_size): (mark_struct_contents): These procedures still call mark_object, this is needed while there are Lisp_Objects without descriptions left. We added pdump descriptions for many Lisp_Objects: * extents.c: extent_auxiliary_description * database.c: database_description * gui.c: gui_item_description * scrollbar.c: scrollbar_instance_description * toolbar.c: toolbar_button_description * event-stream.c: command_builder_description * mule-charset.c: charset_description * device-msw.c: devmode_description * dialog-msw.c: mswindows_dialog_id_description * eldap.c: ldap_description * postgresql.c: pgconn_description pgresult_description * tooltalk.c: tooltalk_message_description tooltalk_pattern_description * ui-gtk.c: emacs_ffi_description emacs_gtk_object_description * events.c: * events.h: * event-stream.c: * event-Xt.c: * event-gtk.c: * event-tty.c: To write a pdump description for Lisp_Event, we converted every struct in the union event to a Lisp_Object. So we created nine new Lisp_Objects: Lisp_Key_Data, Lisp_Button_Data, Lisp_Motion_Data, Lisp_Process_Data, Lisp_Timeout_Data, Lisp_Eval_Data, Lisp_Misc_User_Data, Lisp_Magic_Data, Lisp_Magic_Eval_Data. We also wrote makro selectors and mutators for the fields of the new designed Lisp_Event and added everywhere these new abstractions. We implemented XD_UNION support in (mark_with_description), so we can describe exspecially console/device specific data with XD_UNION. To describe with XD_UNION, we added a field to these objects, which holds the variant type of the object. This field is initialized in the appendant constructor. The variant is an integer, it has also to be described in an description, if XD_UNION is used. XD_UNION is used in following descriptions: * console.c: console_description (get_console_variant): returns the variant (create_console): added variant initialization * console.h (console_variant): the different console types * console-impl.h (struct console): added enum console_variant contype * device.c: device_description (Fmake_device): added variant initialization * device-impl.h (struct device): added enum console_variant devtype * objects.c: image_instance_description font_instance_description (Fmake_color_instance): added variant initialization (Fmake_font_instance): added variant initialization * objects-impl.h (struct Lisp_Color_Instance): added color_instance_type * objects-impl.h (struct Lisp_Font_Instance): added font_instance_type * process.c: process_description (make_process_internal): added variant initialization * process.h (process_variant): the different process types
author michaels
date Mon, 29 Jul 2002 09:21:25 +0000
parents 2b6fa2618f76
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
110 110
111 static const struct lrecord_description opaque_description[] = { 111 static const struct lrecord_description opaque_description[] = {
112 { XD_END } 112 { XD_END }
113 }; 113 };
114 114
115 #ifdef USE_KKCC
116 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("opaque", opaque,
117 1, /*dumpable-flag*/
118 0, print_opaque, 0,
119 equal_opaque, hash_opaque,
120 opaque_description,
121 sizeof_opaque, Lisp_Opaque);
122 #else /* not USE_KKCC */
115 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("opaque", opaque, 123 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("opaque", opaque,
116 0, print_opaque, 0, 124 0, print_opaque, 0,
117 equal_opaque, hash_opaque, 125 equal_opaque, hash_opaque,
118 opaque_description, 126 opaque_description,
119 sizeof_opaque, Lisp_Opaque); 127 sizeof_opaque, Lisp_Opaque);
128 #endif /* not USE_KKCC */
120 129
121 /* stuff to handle opaque pointers */ 130 /* stuff to handle opaque pointers */
122 131
123 /* Should never, ever be called. (except by an external debugger) */ 132 /* Should never, ever be called. (except by an external debugger) */
124 static void 133 static void
142 hash_opaque_ptr (Lisp_Object obj, int depth) 151 hash_opaque_ptr (Lisp_Object obj, int depth)
143 { 152 {
144 return (unsigned long) XOPAQUE_PTR (obj)->ptr; 153 return (unsigned long) XOPAQUE_PTR (obj)->ptr;
145 } 154 }
146 155
156 #ifdef USE_KKCC
157 DEFINE_LRECORD_IMPLEMENTATION ("opaque-ptr", opaque_ptr,
158 0, /*dumpable-flag*/
159 0, print_opaque_ptr, 0,
160 equal_opaque_ptr, hash_opaque_ptr, 0,
161 Lisp_Opaque_Ptr);
162 #else /* not USE_KKCC */
147 DEFINE_LRECORD_IMPLEMENTATION ("opaque-ptr", opaque_ptr, 163 DEFINE_LRECORD_IMPLEMENTATION ("opaque-ptr", opaque_ptr,
148 0, print_opaque_ptr, 0, 164 0, print_opaque_ptr, 0,
149 equal_opaque_ptr, hash_opaque_ptr, 0, 165 equal_opaque_ptr, hash_opaque_ptr, 0,
150 Lisp_Opaque_Ptr); 166 Lisp_Opaque_Ptr);
167 #endif /* not USE_KKCC */
151 168
152 Lisp_Object 169 Lisp_Object
153 make_opaque_ptr (void *val) 170 make_opaque_ptr (void *val)
154 { 171 {
155 Lisp_Object res = allocate_managed_lcrecord (Vopaque_ptr_free_list); 172 Lisp_Object res = allocate_managed_lcrecord (Vopaque_ptr_free_list);