Mercurial > hg > xemacs-beta
view src/systime.h @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | e65d9cf16707 |
children | 804517e16990 |
line wrap: on
line source
/* systime.h - System-dependent definitions for time manipulations. Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 2001, 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. */ /* Synched up with: FSF 19.30. */ #ifndef INCLUDED_systime_h_ #define INCLUDED_systime_h_ #ifdef TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> #else # ifdef HAVE_SYS_TIME_H # include <sys/time.h> # else # include <time.h> # endif #endif #ifdef HAVE_SYS_TIMES_H /* Need this for struct tms */ # include <sys/times.h> #endif /* select() is supposed to be (Unix98) defined in sys/time.h, but FreeBSD and Irix 5 put it in unistd.h instead. If we have it, including it can't hurt. */ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef WIN32_NATIVE /* This defines struct timeval */ #include <winsock.h> struct timezone { int tz_minuteswest; /* minutes west of Greenwich */ int tz_dsttime; /* type of dst correction */ }; #ifdef HAVE_X_WINDOWS /* Provides gettimeofday etc */ #include <X11/Xw32defs.h> #include <X11/Xos.h> #else /* X11R6 on NT provides the single parameter version of this command */ void gettimeofday (struct timeval *, struct timezone *); #endif /* HAVE_X_WINDOWS */ #endif /* WIN32_NATIVE */ /* struct utimbuf */ #ifdef HAVE_UTIME # include <utime.h> #endif #ifdef WIN32_NATIVE # include <sys/utime.h> #ifdef emacs int mswindows_utime (Lisp_Object path, struct utimbuf *thymes); #endif #endif #if defined(HAVE_TZNAME) && !defined(WIN32_NATIVE) && !defined(CYGWIN) #ifndef tzname /* For SGI. */ extern char *tzname[]; /* RS6000 and others want it this way. */ #endif #endif /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h disagree about the name of the guard symbol. */ #ifdef HPUX #ifdef _STRUCT_TIMEVAL #ifndef __TIMEVAL__ #define __TIMEVAL__ #endif #endif #endif /* EMACS_TIME is the type to use to represent temporal intervals. At one point this was 'struct timeval' on some systems, int on others. But this is stupid. Other things than select() code like to manipulate time values, and so microsecond precision should be maintained. Separate typedefs and conversion functions are provided for select(). EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS. EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME. EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS. Note that all times are returned in "normalized" format (i.e. the usecs value is in the range 0 <= value < 1000000) and are assumed to be passed in in this format. EMACS_SET_SECS_USECS (TIME, SECS, USECS) sets both components of TIME. EMACS_GET_TIME (TIME) stores the current system time in TIME, which should be an lvalue. set_file_times (PATH, ATIME, MTIME) changes the last-access and last-modification times of the file named PATH to ATIME and MTIME, which are EMACS_TIMEs. EMACS_NORMALIZE_TIME (TIME) coerces TIME into normalized format. EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the result in DEST. Either or both may be negative. EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and stores the result in DEST. Either or both may be negative. EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. EMACS_TIME_EQUAL (TIME1, TIME2) is true iff TIME1 is the same as TIME2. EMACS_TIME_GREATER (TIME1, TIME2) is true iff TIME1 is greater than TIME2. EMACS_TIME_EQUAL_OR_GREATER (TIME1, TIME2) is true iff TIME1 is greater than or equal to TIME2. */ #ifdef HAVE_TIMEVAL #define EMACS_SELECT_TIME struct timeval #define EMACS_TIME_TO_SELECT_TIME(time, select_time) ((select_time) = (time)) #else /* not HAVE_TIMEVAL */ struct timeval { long tv_sec; /* seconds */ long tv_usec; /* microseconds */ }; #define EMACS_SELECT_TIME int #define EMACS_TIME_TO_SELECT_TIME(time, select_time) \ EMACS_TIME_TO_INT (time, select_time) #endif /* not HAVE_TIMEVAL */ #define EMACS_TIME_TO_INT(time, intvar) \ do { \ EMACS_TIME tmptime = time; \ \ if (tmptime.tv_usec > 0) \ (intvar) = tmptime.tv_sec + 1; \ else \ (intvar) = tmptime.tv_sec; \ } while (0) #define EMACS_TIME struct timeval #define EMACS_SECS(time) ((time).tv_sec + 0) #define EMACS_USECS(time) ((time).tv_usec + 0) #define EMACS_SET_SECS(time, seconds) ((time).tv_sec = (seconds)) #define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds)) #if !defined (HAVE_GETTIMEOFDAY) int gettimeofday (struct timeval *, void *); #endif /* On SVR4, the compiler may complain if given this extra BSD arg. */ #ifdef GETTIMEOFDAY_ONE_ARGUMENT #define EMACS_GETTIMEOFDAY(time) gettimeofday(time) #else #define EMACS_GETTIMEOFDAY(time) gettimeofday(time,0) #endif /* According to the Xt sources, some NTP daemons on some systems may return non-normalized values. */ #define EMACS_GET_TIME(time) \ do { \ EMACS_GETTIMEOFDAY (&(time)); \ EMACS_NORMALIZE_TIME (time); \ } while (0) #define EMACS_NORMALIZE_TIME(time) \ do { \ while ((time).tv_usec >= 1000000) \ { \ (time).tv_usec -= 1000000; \ (time).tv_sec++; \ } \ while ((time).tv_usec < 0) \ { \ (time).tv_usec += 1000000; \ (time).tv_sec--; \ } \ } while (0) #define EMACS_ADD_TIME(dest, src1, src2) \ do { \ (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec + (src2).tv_usec; \ EMACS_NORMALIZE_TIME (dest); \ } while (0) #define EMACS_SUB_TIME(dest, src1, src2) \ do { \ (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; \ (dest).tv_usec = (src1).tv_usec - (src2).tv_usec; \ EMACS_NORMALIZE_TIME (dest); \ } while (0) #define EMACS_TIME_NEG_P(time) ((long)(time).tv_sec < 0) #define EMACS_TIME_EQUAL(time1, time2) \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec == (time2).tv_usec) #define EMACS_TIME_GREATER(time1, time2) \ ((time1).tv_sec > (time2).tv_sec || \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec > (time2).tv_usec)) #define EMACS_TIME_EQUAL_OR_GREATER(time1, time2) \ ((time1).tv_sec > (time2).tv_sec || \ ((time1).tv_sec == (time2).tv_sec && \ (time1).tv_usec >= (time2).tv_usec)) #define EMACS_SET_SECS_USECS(time, secs, usecs) \ (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs)) #ifdef emacs int set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime); void get_process_times (double *user_time, double *system_time, double *real_time); Intbyte *qxe_ctime (const time_t *value); #endif #ifdef WIN32_NATIVE /* setitimer emulation for Win32 (see win32.c) */ struct itimerval { struct timeval it_value; struct timeval it_interval; }; #define ITIMER_REAL 1 #define ITIMER_PROF 2 #endif /* WIN32_NATIVE */ #if defined (WIN32_NATIVE) || defined (CYGWIN) int mswindows_setitimer (int kind, const struct itimerval *itnew, struct itimerval *itold); #endif /* defined (WIN32_NATIVE) || defined (CYGWIN) */ /* #### Move this comment elsewhere when we figure out the place. "qxe" is a unique prefix used to identify encapsulations of standard library functions. We used to play pre-processing games but in general this leads to nothing but trouble because someone first encountering the code will have no idea that what appears to be a call to a library function has actually been redefined to be a call somewhere else. This is doubly true when the redefinition occurs in out-of-the way s+m files and only on certainly systems. The name "qxe" was chosen because it is a unique string that is not going to be found anywhere else in the sources (unlike, for example, the prefixes "xemacs" or "sys") and is easy to type. Alternative names are certainly possible, and suggestions are welcome. By making the encapsulation explicit we might be making the code that uses is slightly less pretty, but this is more than compensated for by the huge increase in clarity. "Standard library function" can refer to any function in any standard library. If we are explicitly changing the semantics (e.g. Mule-encapsulating), we should use an extended version of the prefix, e.g. perhaps "qxe_xlat_" for functions that Mule- encapsulate, or "qxe_retry_" for functions that automatically retry a system call interrupted by EINTR. In general, if there is no prefix extension, it means the function is trying to provide (more or less) the same semantics as the standard library function; but be aware that the reimplementation may be incomplete or differ in important respects. This is especially the case when attempts are made to implement Unix functions on MS Windows. (The comment on the particular encapsulation should describe what standard function is being emulated, if this is not obvious, and what the differences, if any, from that standard function are.) An example of this is the qxe_setitimer() function. This attempts to emulate the POSIX (Unix98?) standard setitimer(), as found on all modern versions of Unix. Normally, we just call the system- provided setitimer() function. When emulated on MS Windows and Cygwin, however, the ITNEW and ITOLD values cannot be different from each other if both are non-zero, due to limitations in the underlying multimedia-timer API. By simply using setitimer() with preprocessor tricks, a programmer would almost have to be a mind-reader to figure this out. With the explicit encapsulation, a programmer need only look at the definition of qxe_setitimer() to see what its semantics are. */ int qxe_setitimer (int kind, const struct itimerval *itnew, struct itimerval *itold); #endif /* INCLUDED_systime_h_ */