Mercurial > hg > xemacs-beta
view lib-src/i.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 | 6728e641994e |
children | 01c57eb70ae9 |
line wrap: on
line source
/* I-connector utility Copyright (C) 2000 Kirill M. Katsnelson Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* When run with an argument, i treats it as a command line, and pipes command stdin, stdout and stderr to its own respective streams. How silly it should sound, but windowed program in Win32 cannot do output to the console from which it has been started, and should be run using this utility. This utility is for running [tx]emacs as part of make process so that its output goes to the same console as the rest of the make output does. It can be used also when xemacs should be run as a batch command ina script, especially when its standart output should be obtained programmatically. */ #include <windows.h> #include <stdio.h> #include <string.h> #include <tchar.h> typedef struct { HANDLE source; HANDLE drain; } I_connector; /* * Make new handle as that pointed to by PH but * inheritable, substitute PH with it, and close the * original one */ static void make_inheritable (HANDLE* ph) { HANDLE htmp; DuplicateHandle (GetCurrentProcess(), *ph, GetCurrentProcess(), &htmp, 0, TRUE, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS); *ph = htmp; } /* * Worker thread proc. Reads source, pumps into drain, * till either clogs. */ static DWORD CALLBACK pump (LPVOID pv_i) { I_connector* pi = (I_connector*) pv_i; BYTE buffer [256]; DWORD really_read, unused; while (ReadFile (pi->source, buffer, sizeof (buffer), &really_read, NULL) && WriteFile (pi->drain, buffer, really_read, &unused, NULL)) ; return 0; } /* * Launch a pump for the given I-connector */ static void start_pump (I_connector* pi) { DWORD unused; HANDLE h_thread = CreateThread (NULL, 0, pump, (void*)pi, 0, &unused); CloseHandle (h_thread); } static HANDLE external_event; static BOOL ctrl_c_handler (unsigned long type) { SetEvent (external_event); return FALSE; } /* Skip over the executable name in the given command line. Correctly handles quotes in the name. Return NULL upon error. If REQUIRE_FOLLOWING is non-zero, it's an error if no argument follows the executable name. */ static LPTSTR skip_executable_name (LPTSTR cl, int require_following) { int ix; while (1) { ix = _tcscspn (cl, _T(" \t\"")); if (cl[ix] == '\"') { cl = _tcschr (cl + ix + 1, '\"'); if (cl == NULL) return NULL; /* Unmatched quote */ cl++; } else { cl += ix; cl += _tcsspn (cl, _T(" \t")); if (!require_following) return cl; return *cl ? cl : NULL; } } } /* * Brew coffee and bring snickers */ void usage (void) { fprintf (stderr, "\n" "usage: i command\n" "i executes the command and reroutes its standard handles to the calling\n" "console. Good for seeing output of GUI programs that use standard output." "\n"); } int main (void) { STARTUPINFO si; PROCESS_INFORMATION pi; I_connector I_in, I_out, I_err; DWORD exit_code; LPTSTR command = skip_executable_name (GetCommandLine (), 1); if (command == NULL) { usage (); return 1; } ZeroMemory (&si, sizeof (si)); si.dwFlags = STARTF_USESTDHANDLES; I_in.source = GetStdHandle (STD_INPUT_HANDLE); CreatePipe (&si.hStdInput, &I_in.drain, NULL, 0); make_inheritable (&si.hStdInput); I_out.drain = GetStdHandle (STD_OUTPUT_HANDLE); CreatePipe (&I_out.source, &si.hStdOutput, NULL, 0); make_inheritable (&si.hStdOutput); I_err.drain = GetStdHandle (STD_ERROR_HANDLE); CreatePipe (&I_err.source, &si.hStdError, NULL, 0); make_inheritable (&si.hStdError); { SECURITY_ATTRIBUTES sa; LPTSTR new_command = (LPTSTR) malloc (666 + sizeof (TCHAR) * _tcslen (command)); LPTSTR past_exe; if (!new_command) { _ftprintf (stderr, _T ("Out of memory when launching `%s'\n"), command); return 2; } past_exe = skip_executable_name (command, 0); if (!past_exe) { usage (); return 1; } /* Since XEmacs isn't a console application, it can't easily be terminated using ^C. Therefore, we set up a communication path with it so that when a ^C is sent to us (using GenerateConsoleCtrlEvent), we in turn signals it to commit suicide. (This is cleaner than using TerminateProcess()). This makes (e.g.) the "Stop Build" command from VC++ correctly terminate XEmacs. #### This will cause problems if i.exe is used for commands other than XEmacs. We need to make behavior this a command-line option. */ /* Create the event as inheritable so that we can use it to communicate with the child process */ sa.nLength = sizeof (sa); sa.bInheritHandle = TRUE; sa.lpSecurityDescriptor = NULL; external_event = CreateEvent (&sa, FALSE, FALSE, NULL); if (!external_event) { _ftprintf (stderr, _T ("Error %d creating signal event for `%s'\n"), GetLastError (), command); return 2; } SetConsoleCtrlHandler ((PHANDLER_ROUTINE) ctrl_c_handler, TRUE); _tcsncpy (new_command, command, past_exe - command); _stprintf (new_command + (past_exe - command), /* start with space in case no args past command name */ " -mswindows-termination-handle %d ", (long) external_event); _tcscat (new_command, past_exe); if (CreateProcess (NULL, new_command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi) == 0) { _ftprintf (stderr, _T("Error %d launching `%s'\n"), GetLastError (), command); return 2; } CloseHandle (pi.hThread); } /* Start pump in each I-connector */ start_pump (&I_in); start_pump (&I_out); start_pump (&I_err); /* Wait for the process to complete */ WaitForSingleObject (pi.hProcess, INFINITE); GetExitCodeProcess (pi.hProcess, &exit_code); CloseHandle (pi.hProcess); /* Make pump threads eventually die out. Looks rude, I agree */ CloseHandle (GetStdHandle (STD_INPUT_HANDLE)); CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE)); CloseHandle (GetStdHandle (STD_ERROR_HANDLE)); return exit_code; }