Mercurial > emacs
annotate lib-src/profile.c @ 82988:f82e3a6f5ccb
A few more bugfixes and new features.
(Sigh.) I obviously need to remember to separate individual changes
to multiple commits.
src/emacsclient.c: Improved error handling.
(decode_options): Changed frame option (again) from -f to -t.
(print_help_and_exit): Ditto.
(copy_from_to): Check EINTR after write, not EAGAIN. Removed SIGIO hack.
(pty_conversation): Handle errors transmitted through the socket.
Handle pty errors by not reading from it anymore.
(main): Restore correct errno after socket_status failed. Send -tty
on -t, not -pty.
lisp/server.el (server-process-filter): Watch -tty, not -pty.
Use make-frame-on-tty instead of make-terminal-frame.
Don't set newframe to t if make-frame-on-tty failed.
Don't delete frames here. Print correct message when there are no
files to edit, but a new frame was requested.
(server-sentinel): Delete the frame after the process.
(server-handle-delete-frame): New function for delete-frame-functions.
(server-start): Add server-handle-delete-frame to delete-frame-functions.
(server-buffer-done): Don't delete frames here.
src/alloc.c (mark_ttys): Add prototype.
(Fgarbage_collect): Call mark_ttys.
src/emacs.c: (shut_down_emacs): Don't flush stdout before
reset_sys_modes().
src/process.c (add_keyboard_wait_descriptor_called_flag): Removed.
(add_keyboard_wait_descriptor): Removed stdin hack.
src/sysdep.c: Unconditionally include sysselect.h.
(old_fcntl_flags): Changed to an array.
(init_sigio, reset_sigio): Use it.
(narrow_foreground_group, widen_foreground_group): Use setpgid, not
setpgrp.
(old_fcntl_owner): Changed to an array.
(init_sys_modes, reset_sys_modes): Use it. Fix fsync() and reset_sigio() calls.
src/term.c (Qframe_tty_name, Qframe_tty_type): New variables.
(syms_of_term): Initialize them.
(Fframe_tty_name, Fframe_tty_type): New functions.
(term_init): Call add_keyboard_wait_descriptor().
(Fdelete_tty): New function.
(delete_tty): Call delete_keyboard_wait_descriptor().
(get_current_tty): Removed.
(mark_ttys): New function.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-28
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 31 Dec 2003 05:09:29 +0000 |
parents | 695cf19ef79e |
children | a47704955f8d 375f2633d815 |
rev | line source |
---|---|
5810 | 1 /* profile.c --- generate periodic events for profiling of Emacs Lisp code. |
26083
134b57acef68
Add support for large files. Merge glibc 2.1.2.
Paul Eggert <eggert@twinsun.com>
parents:
19337
diff
changeset
|
2 Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. |
5810 | 3 |
4 Author: Boaz Ben-Zvi <boaz@lcs.mit.edu> | |
5 | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
6 This file is part of GNU Emacs. |
5810 | 7 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
8 GNU Emacs is free software; you can redistribute it and/or modify |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
9 it under the terms of the GNU General Public License as published by |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
10 the Free Software Foundation; either version 2, or (at your option) |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
11 any later version. |
5810 | 12 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
13 GNU Emacs is distributed in the hope that it will be useful, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
16 GNU General Public License for more details. |
5810 | 17 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
19 along with GNU Emacs; see the file COPYING. If not, write to |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12723
diff
changeset
|
21 Boston, MA 02111-1307, USA. */ |
5810 | 22 |
23 | |
24 /** | |
25 ** To be run as an emacs process. Input string that starts with: | |
26 ** 'z' -- resets the watch (to zero). | |
27 ** 'p' -- return time (on stdout) as string with format <sec>.<micro-sec> | |
28 ** 'q' -- exit. | |
29 ** | |
30 ** abstraction : a stopwatch | |
31 ** operations: reset_watch, get_time | |
32 */ | |
39661
cbfae3e04e1c
Include config.h, not ../src/config.h and systime.h, not ../src/systime.h.
Pavel Janík <Pavel@Janik.cz>
parents:
26083
diff
changeset
|
33 #include <config.h> |
5810 | 34 #include <stdio.h> |
39661
cbfae3e04e1c
Include config.h, not ../src/config.h and systime.h, not ../src/systime.h.
Pavel Janík <Pavel@Janik.cz>
parents:
26083
diff
changeset
|
35 #include <systime.h> |
5810 | 36 |
9887
be7b66e2cb98
(TV1, TV2): Use EMACS_TIME as type.
Richard M. Stallman <rms@gnu.org>
parents:
9491
diff
changeset
|
37 static EMACS_TIME TV1, TV2; |
5810 | 38 static int watch_not_started = 1; /* flag */ |
39 static char time_string[30]; | |
40 | |
41 /* Reset the stopwatch to zero. */ | |
42 | |
9491
dd3b83e4ceb0
Eliminate some -Wall warnings.
David J. MacKenzie <djm@gnu.org>
parents:
8336
diff
changeset
|
43 void |
5810 | 44 reset_watch () |
45 { | |
8336
52590f967c1e
(reset_watch, get_time): Use EMACS_GET_TIME.
Richard M. Stallman <rms@gnu.org>
parents:
6876
diff
changeset
|
46 EMACS_GET_TIME (TV1); |
5810 | 47 watch_not_started = 0; |
48 } | |
49 | |
50 /* This call returns the time since the last reset_watch call. The time | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
42439
diff
changeset
|
51 is returned as a string with the format <seconds>.<micro-seconds> |
6042
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
52 If reset_watch was not called yet, exit. */ |
5810 | 53 |
54 char * | |
55 get_time () | |
56 { | |
57 if (watch_not_started) | |
6042
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
58 exit (1); /* call reset_watch first ! */ |
8336
52590f967c1e
(reset_watch, get_time): Use EMACS_GET_TIME.
Richard M. Stallman <rms@gnu.org>
parents:
6876
diff
changeset
|
59 EMACS_GET_TIME (TV2); |
9887
be7b66e2cb98
(TV1, TV2): Use EMACS_TIME as type.
Richard M. Stallman <rms@gnu.org>
parents:
9491
diff
changeset
|
60 EMACS_SUB_TIME (TV2, TV2, TV1); |
19337
bd0dd246f9cd
(get_time): Cast arg to fprintf.
Richard M. Stallman <rms@gnu.org>
parents:
15683
diff
changeset
|
61 sprintf (time_string, "%lu.%06lu", (unsigned long)EMACS_SECS (TV2), (unsigned long)EMACS_USECS (TV2)); |
5810 | 62 return time_string; |
63 } | |
64 | |
12723
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
65 #if ! defined (HAVE_GETTIMEOFDAY) && defined (HAVE_TIMEVAL) |
42439
d8a417105504
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
39661
diff
changeset
|
66 |
12723
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
67 /* ARGSUSED */ |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
68 gettimeofday (tp, tzp) |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
69 struct timeval *tp; |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
70 struct timezone *tzp; |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
71 { |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
72 extern long time (); |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
73 |
42439
d8a417105504
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
39661
diff
changeset
|
74 tp->tv_sec = time ((long *)0); |
12723
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
75 tp->tv_usec = 0; |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
76 if (tzp != 0) |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
77 tzp->tz_minuteswest = -1; |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
78 } |
42439
d8a417105504
Remove unnecessary whitespaces.
Pavel Janík <Pavel@Janik.cz>
parents:
39661
diff
changeset
|
79 |
12723
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
80 #endif |
48786c683506
(gettimeofday): New function, defined if necessary.
Richard M. Stallman <rms@gnu.org>
parents:
10087
diff
changeset
|
81 |
15683 | 82 int |
5810 | 83 main () |
84 { | |
6042
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
85 int c; |
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
86 while ((c = getchar ()) != EOF) |
5810 | 87 { |
6042
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
88 switch (c) |
5810 | 89 { |
90 case 'z': | |
91 reset_watch (); | |
92 break; | |
93 case 'p': | |
94 puts (get_time ()); | |
95 break; | |
96 case 'q': | |
97 exit (0); | |
98 } | |
6042
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
99 /* Anything remaining on the line is ignored. */ |
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
100 while (c != '\n' && c != EOF) |
5bffd741340e
(main, get_time): Don't crash on invalid input.
Karl Heuer <kwzh@gnu.org>
parents:
6026
diff
changeset
|
101 c = getchar (); |
5810 | 102 } |
6026
45b117ac2dbc
(get_time): Simplify; avoid calling index.
Karl Heuer <kwzh@gnu.org>
parents:
5810
diff
changeset
|
103 exit (1); |
5810 | 104 } |
52401 | 105 |
106 /* arch-tag: 8db68f7e-2322-4944-a315-dba349bdbf39 | |
107 (do not change this comment) */ |