[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110799: Remove EMACS_OUTQSIZE+sleep
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110799: Remove EMACS_OUTQSIZE+sleep hack. |
Date: |
Sun, 04 Nov 2012 14:33:00 -0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110799
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-11-04 14:33:00 -0800
message:
Remove EMACS_OUTQSIZE+sleep hack.
* dispnew.c (update_frame_1): Remove hack for terminals slower
than 2400 bps, which throttled Emacs by having it sleep. This
code hasn't worked since at least 2007, when the multi-tty stuff
was added, and anyway those old terminals are long dead.
* systty.h (EMACS_OUTQSIZE): Remove; unused. The macro isn't used even
without the dispnew.c change, as dispnew.c doesn't include systty.h.
modified:
src/ChangeLog
src/dispnew.c
src/systty.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-11-04 17:29:52 +0000
+++ b/src/ChangeLog 2012-11-04 22:33:00 +0000
@@ -1,5 +1,13 @@
2012-11-04 Paul Eggert <address@hidden>
+ Remove EMACS_OUTQSIZE+sleep hack.
+ * dispnew.c (update_frame_1): Remove hack for terminals slower
+ than 2400 bps, which throttled Emacs by having it sleep. This
+ code hasn't worked since at least 2007, when the multi-tty stuff
+ was added, and anyway those old terminals are long dead.
+ * systty.h (EMACS_OUTQSIZE): Remove; unused. The macro isn't used even
+ without the dispnew.c change, as dispnew.c doesn't include systty.h.
+
Fix data-loss with --version (Bug#9574).
* emacs.c (close_output_streams): Use strerror, not emacs_strerror,
as we can't assume that emacs_strerror is initialized, and strerror
=== modified file 'src/dispnew.c'
--- a/src/dispnew.c 2012-11-02 10:34:26 +0000
+++ b/src/dispnew.c 2012-11-04 22:33:00 +0000
@@ -4650,21 +4650,7 @@
int outq = PENDING_OUTPUT_COUNT (display_output);
if (outq > 900
|| (outq > 20 && ((i - 1) % preempt_count == 0)))
- {
- fflush (display_output);
- if (preempt_count == 1)
- {
-#ifdef EMACS_OUTQSIZE
- if (EMACS_OUTQSIZE (0, &outq) < 0)
- /* Probably not a tty. Ignore the error and reset
- the outq count. */
- outq = PENDING_OUTPUT_COUNT (FRAME_TTY (f->output));
-#endif
- outq *= 10;
- if (baud_rate <= outq && baud_rate > 0)
- sleep (outq / baud_rate);
- }
- }
+ fflush (display_output);
}
}
=== modified file 'src/systty.h'
--- a/src/systty.h 2012-09-13 02:21:28 +0000
+++ b/src/systty.h 2012-11-04 22:33:00 +0000
@@ -52,17 +52,6 @@
#endif /* not CDEL */
#endif /* not _POSIX_VDISABLE */
-/* Get the number of characters queued for output. */
-
-/* EMACS_OUTQSIZE(FD, int *SIZE) stores the number of characters
- queued for output to the terminal FD in *SIZE, if FD is a tty.
- Returns -1 if there was an error (i.e. FD is not a tty), 0
- otherwise. */
-#ifdef TIOCOUTQ
-#define EMACS_OUTQSIZE(fd, size) (ioctl ((fd), TIOCOUTQ, (size)))
-#endif
-
-
/* Manipulate a terminal's current process group. */
/* EMACS_GETPGRP (arg) returns the process group of the process. */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110799: Remove EMACS_OUTQSIZE+sleep hack.,
Paul Eggert <=