Mercurial > hg > xemacs-beta
annotate src/systime.h @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | facf3239ba30 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* systime.h - System-dependent definitions for time manipulations. |
| 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 777 | 3 Copyright (C) 2001, 2002 Ben Wing. |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: FSF 19.30. */ | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_systime_h_ |
| 25 #define INCLUDED_systime_h_ | |
| 428 | 26 |
| 27 #ifdef TIME_WITH_SYS_TIME | |
| 442 | 28 # include <sys/time.h> |
| 29 # include <time.h> | |
| 428 | 30 #else |
| 442 | 31 # ifdef HAVE_SYS_TIME_H |
| 32 # include <sys/time.h> | |
| 33 # else | |
| 34 # include <time.h> | |
| 35 # endif | |
| 428 | 36 #endif |
| 37 | |
| 777 | 38 #ifdef HAVE_SYS_TIMES_H |
| 39 /* Need this for struct tms */ | |
| 771 | 40 # include <sys/times.h> |
| 41 #endif | |
| 42 | |
| 428 | 43 /* select() is supposed to be (Unix98) defined in sys/time.h, |
| 44 but FreeBSD and Irix 5 put it in unistd.h instead. | |
| 45 If we have it, including it can't hurt. */ | |
| 46 #ifdef HAVE_UNISTD_H | |
| 47 #include <unistd.h> | |
| 48 #endif | |
| 49 | |
| 442 | 50 #ifdef WIN32_NATIVE |
| 51 | |
| 52 /* This defines struct timeval */ | |
| 53 #include <winsock.h> | |
| 54 | |
| 55 struct timezone | |
| 56 { | |
| 57 int tz_minuteswest; /* minutes west of Greenwich */ | |
| 58 int tz_dsttime; /* type of dst correction */ | |
| 59 }; | |
| 60 | |
| 61 #ifdef HAVE_X_WINDOWS | |
| 428 | 62 /* Provides gettimeofday etc */ |
| 63 #include <X11/Xw32defs.h> | |
| 64 #include <X11/Xos.h> | |
| 442 | 65 #else |
| 66 /* X11R6 on NT provides the single parameter version of this command */ | |
| 67 void gettimeofday (struct timeval *, struct timezone *); | |
| 68 #endif /* HAVE_X_WINDOWS */ | |
| 69 | |
| 70 #endif /* WIN32_NATIVE */ | |
| 428 | 71 |
| 592 | 72 /* struct utimbuf */ |
| 73 | |
| 460 | 74 #ifdef HAVE_UTIME |
| 428 | 75 # include <utime.h> |
| 76 #endif | |
| 77 | |
| 592 | 78 #ifdef WIN32_NATIVE |
| 79 # include <sys/utime.h> | |
| 771 | 80 #ifdef emacs |
| 81 int mswindows_utime (Lisp_Object path, struct utimbuf *thymes); | |
| 82 #endif | |
| 592 | 83 #endif |
| 84 | |
| 442 | 85 #if defined(HAVE_TZNAME) && !defined(WIN32_NATIVE) && !defined(CYGWIN) |
| 428 | 86 #ifndef tzname /* For SGI. */ |
| 87 extern char *tzname[]; /* RS6000 and others want it this way. */ | |
| 88 #endif | |
| 89 #endif | |
| 90 | |
| 91 /* On some configurations (hpux8.0, X11R4), sys/time.h and X11/Xos.h | |
| 92 disagree about the name of the guard symbol. */ | |
| 93 #ifdef HPUX | |
| 94 #ifdef _STRUCT_TIMEVAL | |
| 95 #ifndef __TIMEVAL__ | |
| 96 #define __TIMEVAL__ | |
| 97 #endif | |
| 98 #endif | |
| 99 #endif | |
| 100 | |
| 101 /* EMACS_TIME is the type to use to represent temporal intervals. | |
| 3025 | 102 At one point this was `struct timeval' on some systems, int on others. |
| 428 | 103 But this is stupid. Other things than select() code like to |
| 104 manipulate time values, and so microsecond precision should be | |
| 105 maintained. Separate typedefs and conversion functions are provided | |
| 106 for select(). | |
| 107 | |
| 108 EMACS_SECS (TIME) is an rvalue for the seconds component of TIME. | |
| 109 EMACS_SET_SECS (TIME, SECONDS) sets that to SECONDS. | |
| 110 | |
| 111 EMACS_USECS (TIME) is an rvalue for the microseconds component of TIME. | |
| 112 EMACS_SET_USECS (TIME, MICROSECONDS) sets that to MICROSECONDS. | |
| 113 | |
| 114 Note that all times are returned in "normalized" format (i.e. the | |
| 115 usecs value is in the range 0 <= value < 1000000) and are assumed | |
| 116 to be passed in in this format. | |
| 117 | |
| 118 EMACS_SET_SECS_USECS (TIME, SECS, USECS) sets both components of TIME. | |
| 119 | |
| 120 EMACS_GET_TIME (TIME) stores the current system time in TIME, which | |
| 121 should be an lvalue. | |
| 122 | |
| 123 set_file_times (PATH, ATIME, MTIME) changes the last-access and | |
| 124 last-modification times of the file named PATH to ATIME and | |
| 125 MTIME, which are EMACS_TIMEs. | |
| 126 | |
| 127 EMACS_NORMALIZE_TIME (TIME) coerces TIME into normalized format. | |
| 128 | |
| 129 EMACS_ADD_TIME (DEST, SRC1, SRC2) adds SRC1 to SRC2 and stores the | |
| 130 result in DEST. Either or both may be negative. | |
| 131 | |
| 132 EMACS_SUB_TIME (DEST, SRC1, SRC2) subtracts SRC2 from SRC1 and | |
| 133 stores the result in DEST. Either or both may be negative. | |
| 134 | |
| 135 EMACS_TIME_NEG_P (TIME) is true iff TIME is negative. | |
| 136 | |
| 137 EMACS_TIME_EQUAL (TIME1, TIME2) is true iff TIME1 is the same as TIME2. | |
| 138 EMACS_TIME_GREATER (TIME1, TIME2) is true iff TIME1 is greater than | |
| 139 TIME2. | |
| 140 EMACS_TIME_EQUAL_OR_GREATER (TIME1, TIME2) is true iff TIME1 is | |
| 141 greater than or equal to TIME2. | |
| 142 | |
| 143 */ | |
| 144 | |
| 145 #ifdef HAVE_TIMEVAL | |
| 146 | |
| 147 #define EMACS_SELECT_TIME struct timeval | |
| 148 #define EMACS_TIME_TO_SELECT_TIME(time, select_time) ((select_time) = (time)) | |
| 149 | |
| 150 #else /* not HAVE_TIMEVAL */ | |
| 151 | |
| 152 struct timeval | |
| 153 { | |
| 154 long tv_sec; /* seconds */ | |
| 155 long tv_usec; /* microseconds */ | |
| 156 }; | |
| 157 | |
| 158 #define EMACS_SELECT_TIME int | |
| 159 #define EMACS_TIME_TO_SELECT_TIME(time, select_time) \ | |
| 160 EMACS_TIME_TO_INT (time, select_time) | |
| 161 | |
| 162 #endif /* not HAVE_TIMEVAL */ | |
| 163 | |
| 164 #define EMACS_TIME_TO_INT(time, intvar) \ | |
| 165 do { \ | |
| 166 EMACS_TIME tmptime = time; \ | |
| 167 \ | |
| 168 if (tmptime.tv_usec > 0) \ | |
| 169 (intvar) = tmptime.tv_sec + 1; \ | |
| 170 else \ | |
| 171 (intvar) = tmptime.tv_sec; \ | |
| 172 } while (0) | |
| 173 | |
| 174 #define EMACS_TIME struct timeval | |
| 175 #define EMACS_SECS(time) ((time).tv_sec + 0) | |
| 176 #define EMACS_USECS(time) ((time).tv_usec + 0) | |
| 177 #define EMACS_SET_SECS(time, seconds) ((time).tv_sec = (seconds)) | |
| 178 #define EMACS_SET_USECS(time, microseconds) ((time).tv_usec = (microseconds)) | |
| 179 | |
| 180 #if !defined (HAVE_GETTIMEOFDAY) | |
| 442 | 181 int gettimeofday (struct timeval *, void *); |
| 428 | 182 #endif |
| 183 | |
| 184 /* On SVR4, the compiler may complain if given this extra BSD arg. */ | |
| 185 #ifdef GETTIMEOFDAY_ONE_ARGUMENT | |
| 442 | 186 #define EMACS_GETTIMEOFDAY(time) gettimeofday(time) |
| 187 #else | |
| 188 #define EMACS_GETTIMEOFDAY(time) gettimeofday(time,0) | |
| 189 #endif | |
| 190 | |
| 428 | 191 /* According to the Xt sources, some NTP daemons on some systems may |
| 192 return non-normalized values. */ | |
| 193 #define EMACS_GET_TIME(time) \ | |
| 194 do { \ | |
| 442 | 195 EMACS_GETTIMEOFDAY (&(time)); \ |
| 428 | 196 EMACS_NORMALIZE_TIME (time); \ |
| 197 } while (0) | |
| 198 | |
| 199 #define EMACS_NORMALIZE_TIME(time) \ | |
| 200 do { \ | |
| 201 while ((time).tv_usec >= 1000000) \ | |
| 202 { \ | |
| 203 (time).tv_usec -= 1000000; \ | |
| 204 (time).tv_sec++; \ | |
| 205 } \ | |
| 206 while ((time).tv_usec < 0) \ | |
| 207 { \ | |
| 208 (time).tv_usec += 1000000; \ | |
| 209 (time).tv_sec--; \ | |
| 210 } \ | |
| 211 } while (0) | |
| 212 | |
| 213 #define EMACS_ADD_TIME(dest, src1, src2) \ | |
| 214 do { \ | |
| 215 (dest).tv_sec = (src1).tv_sec + (src2).tv_sec; \ | |
| 216 (dest).tv_usec = (src1).tv_usec + (src2).tv_usec; \ | |
| 217 EMACS_NORMALIZE_TIME (dest); \ | |
| 218 } while (0) | |
| 219 | |
| 220 #define EMACS_SUB_TIME(dest, src1, src2) \ | |
| 221 do { \ | |
| 222 (dest).tv_sec = (src1).tv_sec - (src2).tv_sec; \ | |
| 223 (dest).tv_usec = (src1).tv_usec - (src2).tv_usec; \ | |
| 224 EMACS_NORMALIZE_TIME (dest); \ | |
| 225 } while (0) | |
| 226 | |
| 227 #define EMACS_TIME_NEG_P(time) ((long)(time).tv_sec < 0) | |
| 228 | |
| 229 #define EMACS_TIME_EQUAL(time1, time2) \ | |
| 230 ((time1).tv_sec == (time2).tv_sec && \ | |
| 231 (time1).tv_usec == (time2).tv_usec) | |
| 232 | |
| 233 #define EMACS_TIME_GREATER(time1, time2) \ | |
| 234 ((time1).tv_sec > (time2).tv_sec || \ | |
| 235 ((time1).tv_sec == (time2).tv_sec && \ | |
| 236 (time1).tv_usec > (time2).tv_usec)) | |
| 237 | |
| 238 #define EMACS_TIME_EQUAL_OR_GREATER(time1, time2) \ | |
| 239 ((time1).tv_sec > (time2).tv_sec || \ | |
| 240 ((time1).tv_sec == (time2).tv_sec && \ | |
| 241 (time1).tv_usec >= (time2).tv_usec)) | |
| 242 | |
| 243 #define EMACS_SET_SECS_USECS(time, secs, usecs) \ | |
| 244 (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs)) | |
| 245 | |
| 592 | 246 #ifdef emacs |
| 247 int set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime); | |
| 428 | 248 void get_process_times (double *user_time, double *system_time, |
| 249 double *real_time); | |
| 867 | 250 Ibyte *qxe_ctime (const time_t *value); |
| 771 | 251 |
| 252 #endif | |
| 428 | 253 |
| 611 | 254 #ifdef WIN32_NATIVE |
| 428 | 255 |
| 611 | 256 /* setitimer emulation for Win32 (see win32.c) */ |
| 428 | 257 |
| 258 struct itimerval | |
| 259 { | |
| 260 struct timeval it_value; | |
| 261 struct timeval it_interval; | |
| 262 }; | |
| 263 | |
| 264 #define ITIMER_REAL 1 | |
| 265 #define ITIMER_PROF 2 | |
| 266 | |
| 442 | 267 #endif /* WIN32_NATIVE */ |
| 428 | 268 |
| 1315 | 269 #ifdef WIN32_ANY |
| 611 | 270 |
| 271 int mswindows_setitimer (int kind, const struct itimerval *itnew, | |
| 272 struct itimerval *itold); | |
| 273 | |
| 1315 | 274 #endif /* WIN32_ANY */ |
| 611 | 275 |
| 276 /* #### Move this comment elsewhere when we figure out the place. | |
| 277 | |
| 278 "qxe" is a unique prefix used to identify encapsulations of standard | |
| 279 library functions. We used to play pre-processing games but in | |
| 280 general this leads to nothing but trouble because someone first | |
| 281 encountering the code will have no idea that what appears to be a | |
| 282 call to a library function has actually been redefined to be a call | |
| 283 somewhere else. This is doubly true when the redefinition occurs | |
| 284 in out-of-the way s+m files and only on certainly systems. | |
| 285 | |
| 617 | 286 The name "qxe" was chosen because it is a unique string that is not |
| 287 going to be found anywhere else in the sources (unlike, for example, | |
| 288 the prefixes "xemacs" or "sys") and is easy to type. Alternative | |
| 289 names are certainly possible, and suggestions are welcome. | |
| 290 | |
| 611 | 291 By making the encapsulation explicit we might be making the code |
| 292 that uses is slightly less pretty, but this is more than compensated | |
| 293 for by the huge increase in clarity. | |
| 294 | |
| 295 "Standard library function" can refer to any function in any | |
| 296 standard library. If we are explicitly changing the semantics | |
| 297 (e.g. Mule-encapsulating), we should use an extended version of | |
| 298 the prefix, e.g. perhaps "qxe_xlat_" for functions that Mule- | |
| 299 encapsulate, or "qxe_retry_" for functions that automatically | |
| 300 retry a system call interrupted by EINTR. In general, if there | |
| 301 is no prefix extension, it means the function is trying to | |
| 302 provide (more or less) the same semantics as the standard library | |
| 303 function; but be aware that the reimplementation may be incomplete | |
| 304 or differ in important respects. This is especially the case | |
| 305 when attempts are made to implement Unix functions on MS Windows. | |
| 617 | 306 |
| 307 (The comment on the particular encapsulation should describe what | |
| 308 standard function is being emulated, if this is not obvious, and | |
| 309 what the differences, if any, from that standard function are.) | |
| 310 | |
| 311 An example of this is the qxe_setitimer() function. This attempts | |
| 312 to emulate the POSIX (Unix98?) standard setitimer(), as found on | |
| 313 all modern versions of Unix. Normally, we just call the system- | |
| 314 provided setitimer() function. When emulated on MS Windows and | |
| 315 Cygwin, however, the ITNEW and ITOLD values cannot be different | |
| 316 from each other if both are non-zero, due to limitations in the | |
| 317 underlying multimedia-timer API. By simply using setitimer() with | |
| 318 preprocessor tricks, a programmer would almost have to be a | |
| 319 mind-reader to figure this out. With the explicit encapsulation, a | |
| 320 programmer need only look at the definition of qxe_setitimer() to | |
| 321 see what its semantics are. | |
| 611 | 322 */ |
| 323 | |
| 324 int qxe_setitimer (int kind, const struct itimerval *itnew, | |
| 325 struct itimerval *itold); | |
| 326 | |
| 440 | 327 #endif /* INCLUDED_systime_h_ */ |