comparison src/process.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 34362f9d6d61
children e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
135 int env_initted; 135 int env_initted;
136 136
137 Lisp_Object Vlisp_EXEC_SUFFIXES; 137 Lisp_Object Vlisp_EXEC_SUFFIXES;
138 138
139 139
140
141 #ifdef USE_KKCC
142 static const struct lrecord_description empty_process_data_description [] = {
143 { XD_END }
144 };
145
146 static const struct lrecord_description unix_process_data_description [] = {
147 { XD_LISP_OBJECT, offsetof (struct unix_process_data, tty_name) },
148 { XD_END }
149 };
150
151 static const struct struct_description process_data_description []= {
152 { unix_process, unix_process_data_description},
153 { nt_process, empty_process_data_description},
154 { XD_END }
155 };
156
157 static const struct lrecord_description process_description [] = {
158 { XD_INT, offsetof (Lisp_Process, process_type) },
159 { XD_LISP_OBJECT, offsetof (Lisp_Process, name) },
160 { XD_LISP_OBJECT, offsetof (Lisp_Process, command) },
161 { XD_LISP_OBJECT, offsetof (Lisp_Process, filter) },
162 { XD_LISP_OBJECT, offsetof (Lisp_Process, stderr_filter) },
163 { XD_LISP_OBJECT, offsetof (Lisp_Process, sentinel) },
164 { XD_LISP_OBJECT, offsetof (Lisp_Process, buffer) },
165 { XD_LISP_OBJECT, offsetof (Lisp_Process, mark) },
166 { XD_LISP_OBJECT, offsetof (Lisp_Process, stderr_buffer) },
167 { XD_LISP_OBJECT, offsetof (Lisp_Process, stderr_mark) },
168 { XD_LISP_OBJECT, offsetof (Lisp_Process, pid) },
169 { XD_LISP_OBJECT, offsetof (Lisp_Process, pipe_instream) },
170 { XD_LISP_OBJECT, offsetof (Lisp_Process, pipe_outstream) },
171 { XD_LISP_OBJECT, offsetof (Lisp_Process, pipe_errstream) },
172 { XD_LISP_OBJECT, offsetof (Lisp_Process, coding_instream) },
173 { XD_LISP_OBJECT, offsetof (Lisp_Process, coding_outstream) },
174 { XD_LISP_OBJECT, offsetof (Lisp_Process, coding_errstream) },
175 { XD_LISP_OBJECT, offsetof (Lisp_Process, status_symbol) },
176 { XD_UNION, offsetof (Lisp_Process, process_data),
177 XD_INDIRECT (0, 0), process_data_description },
178 { XD_END }
179 };
180 #endif /* USE_KKCC */
140 181
141 static Lisp_Object 182 static Lisp_Object
142 mark_process (Lisp_Object object) 183 mark_process (Lisp_Object object)
143 { 184 {
144 Lisp_Process *process = XPROCESS (object); 185 Lisp_Process *process = XPROCESS (object);
212 if (!for_disksave) 253 if (!for_disksave)
213 xfree (p->process_data); 254 xfree (p->process_data);
214 } 255 }
215 } 256 }
216 257
258 #ifdef USE_KKCC
259 DEFINE_LRECORD_IMPLEMENTATION ("process", process,
260 0, /*dumpable-flag*/
261 mark_process, print_process, finalize_process,
262 0, 0, process_description, Lisp_Process);
263 #else /* not USE_KKCC */
217 DEFINE_LRECORD_IMPLEMENTATION ("process", process, 264 DEFINE_LRECORD_IMPLEMENTATION ("process", process,
218 mark_process, print_process, finalize_process, 265 mark_process, print_process, finalize_process,
219 0, 0, 0, Lisp_Process); 266 0, 0, 0, Lisp_Process);
267 #endif /* not USE_KKCC */
220 268
221 /************************************************************************/ 269 /************************************************************************/
222 /* basic process accessors */ 270 /* basic process accessors */
223 /************************************************************************/ 271 /************************************************************************/
224 272
529 p->coding_outstream = Qnil; 577 p->coding_outstream = Qnil;
530 p->coding_errstream = Qnil; 578 p->coding_errstream = Qnil;
531 579
532 p->process_data = 0; 580 p->process_data = 0;
533 MAYBE_PROCMETH (alloc_process_data, (p)); 581 MAYBE_PROCMETH (alloc_process_data, (p));
582
583 #ifdef USE_KKCC
584 #ifdef HAVE_MS_WINDOWS
585 p->process_type = nt_process;
586 #else /*HAVE_MS_WINDOWS*/
587 p->process_type = unix_process;
588 #endif /*HAVE_MS_WINDOWS*/
589 #endif /* USE_KKCC */
534 590
535 val = wrap_process (p); 591 val = wrap_process (p);
536 592
537 Vprocess_list = Fcons (val, Vprocess_list); 593 Vprocess_list = Fcons (val, Vprocess_list);
538 return val; 594 return val;