mirror of
https://github.com/python/cpython.git
synced 2024-12-01 13:55:45 +08:00
4d70c3d9dd
merge in bad ways, so I'll have to merge that extra-carefully (probably manually.) Merged revisions 46495-46605 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46495 | tim.peters | 2006-05-28 03:52:38 +0200 (Sun, 28 May 2006) | 2 lines Added missing svn:eol-style property to text files. ........ r46497 | tim.peters | 2006-05-28 12:41:29 +0200 (Sun, 28 May 2006) | 3 lines PyErr_Display(), PyErr_WriteUnraisable(): Coverity found a cut-and-paste bug in both: `className` was referenced before being checked for NULL. ........ r46499 | fredrik.lundh | 2006-05-28 14:06:46 +0200 (Sun, 28 May 2006) | 5 lines needforspeed: added Py_MEMCPY macro (currently tuned for Visual C only), and use it for string copy operations. this gives a 20% speedup on some string benchmarks. ........ r46501 | michael.hudson | 2006-05-28 17:51:40 +0200 (Sun, 28 May 2006) | 26 lines Quality control, meet exceptions.c. Fix a number of problems with the need for speed code: One is doing this sort of thing: Py_DECREF(self->field); self->field = newval; Py_INCREF(self->field); without being very sure that self->field doesn't start with a value that has a __del__, because that almost certainly can lead to segfaults. As self->args is constrained to be an exact tuple we may as well exploit this fact consistently. This leads to quite a lot of simplification (and, hey, probably better performance). Add some error checking in places lacking it. Fix some rather strange indentation in the Unicode code. Delete some trailing whitespace. More to come, I haven't fixed all the reference leaks yet... ........ r46502 | george.yoshida | 2006-05-28 18:39:09 +0200 (Sun, 28 May 2006) | 3 lines Patch #1080727: add "encoding" parameter to doctest.DocFileSuite Contributed by Bjorn Tillenius. ........ r46503 | martin.v.loewis | 2006-05-28 18:57:38 +0200 (Sun, 28 May 2006) | 4 lines Rest of patch #1490384: Commit icon source, remove claim that Erik von Blokland is the author of the installer picture. ........ r46504 | michael.hudson | 2006-05-28 19:40:29 +0200 (Sun, 28 May 2006) | 16 lines Quality control, meet exceptions.c, round two. Make some functions that should have been static static. Fix a bunch of refleaks by fixing the definition of MiddlingExtendsException. Remove all the __new__ implementations apart from BaseException_new. Rewrite most code that needs it to cope with NULL fields (such code could get excercised anyway, the __new__-removal just makes it more likely). This involved editing the code for WindowsError, which I can't test. This fixes all the refleaks in at least the start of a regrtest -R :: run. ........ r46505 | marc-andre.lemburg | 2006-05-28 19:46:58 +0200 (Sun, 28 May 2006) | 10 lines Initial version of systimes - a module to provide platform dependent performance measurements. The module is currently just a proof-of-concept implementation, but will integrated into pybench once it is stable enough. License: pybench license. Author: Marc-Andre Lemburg. ........ r46507 | armin.rigo | 2006-05-28 21:13:17 +0200 (Sun, 28 May 2006) | 15 lines ("Forward-port" of r46506) Remove various dependencies on dictionary order in the standard library tests, and one (clearly an oversight, potentially critical) in the standard library itself - base64.py. Remaining open issues: * test_extcall is an output test, messy to make robust * tarfile.py has a potential bug here, but I'm not familiar enough with this code. Filed in as SF bug #1496501. * urllib2.HTTPPasswordMgr() returns a random result if there is more than one matching root path. I'm asking python-dev for clarification... ........ r46508 | georg.brandl | 2006-05-28 22:11:45 +0200 (Sun, 28 May 2006) | 4 lines The empty string is a valid import path. (fixes #1496539) ........ r46509 | georg.brandl | 2006-05-28 22:23:12 +0200 (Sun, 28 May 2006) | 3 lines Patch #1496206: urllib2 PasswordMgr ./. default ports ........ r46510 | georg.brandl | 2006-05-28 22:57:09 +0200 (Sun, 28 May 2006) | 3 lines Fix refleaks in UnicodeError get and set methods. ........ r46511 | michael.hudson | 2006-05-28 23:19:03 +0200 (Sun, 28 May 2006) | 3 lines use the UnicodeError traversal and clearing functions in UnicodeError subclasses. ........ r46512 | thomas.wouters | 2006-05-28 23:32:12 +0200 (Sun, 28 May 2006) | 4 lines Make last patch valid C89 so Windows compilers can deal with it. ........ r46513 | georg.brandl | 2006-05-28 23:42:54 +0200 (Sun, 28 May 2006) | 3 lines Fix ref-antileak in _struct.c which eventually lead to deallocating None. ........ r46514 | georg.brandl | 2006-05-28 23:57:35 +0200 (Sun, 28 May 2006) | 4 lines Correct None refcount issue in Mac modules. (Are they still used?) ........ r46515 | armin.rigo | 2006-05-29 00:07:08 +0200 (Mon, 29 May 2006) | 3 lines A clearer error message when passing -R to regrtest.py with release builds of Python. ........ r46516 | georg.brandl | 2006-05-29 00:14:04 +0200 (Mon, 29 May 2006) | 3 lines Fix C function calling conventions in _sre module. ........ r46517 | georg.brandl | 2006-05-29 00:34:51 +0200 (Mon, 29 May 2006) | 3 lines Convert audioop over to METH_VARARGS. ........ r46518 | georg.brandl | 2006-05-29 00:38:57 +0200 (Mon, 29 May 2006) | 3 lines METH_NOARGS functions do get called with two args. ........ r46519 | georg.brandl | 2006-05-29 11:46:51 +0200 (Mon, 29 May 2006) | 4 lines Fix refleak in socketmodule. Replace bogus Py_BuildValue calls. Fix refleak in exceptions. ........ r46520 | nick.coghlan | 2006-05-29 14:43:05 +0200 (Mon, 29 May 2006) | 7 lines Apply modified version of Collin Winter's patch #1478788 Renames functional extension module to _functools and adds a Python functools module so that utility functions like update_wrapper can be added easily. ........ r46522 | georg.brandl | 2006-05-29 15:53:16 +0200 (Mon, 29 May 2006) | 3 lines Convert fmmodule to METH_VARARGS. ........ r46523 | georg.brandl | 2006-05-29 16:13:21 +0200 (Mon, 29 May 2006) | 3 lines Fix #1494605. ........ r46524 | georg.brandl | 2006-05-29 16:28:05 +0200 (Mon, 29 May 2006) | 3 lines Handle PyMem_Malloc failure in pystrtod.c. Closes #1494671. ........ r46525 | georg.brandl | 2006-05-29 16:33:55 +0200 (Mon, 29 May 2006) | 3 lines Fix compiler warning. ........ r46526 | georg.brandl | 2006-05-29 16:39:00 +0200 (Mon, 29 May 2006) | 3 lines Fix #1494787 (pyclbr counts whitespace as superclass name) ........ r46527 | bob.ippolito | 2006-05-29 17:47:29 +0200 (Mon, 29 May 2006) | 1 line simplify the struct code a bit (no functional changes) ........ r46528 | armin.rigo | 2006-05-29 19:59:47 +0200 (Mon, 29 May 2006) | 2 lines Silence a warning. ........ r46529 | georg.brandl | 2006-05-29 21:39:45 +0200 (Mon, 29 May 2006) | 3 lines Correct some value converting strangenesses. ........ r46530 | nick.coghlan | 2006-05-29 22:27:44 +0200 (Mon, 29 May 2006) | 1 line When adding a module like functools, it helps to let SVN know about the file. ........ r46531 | georg.brandl | 2006-05-29 22:52:54 +0200 (Mon, 29 May 2006) | 4 lines Patches #1497027 and #972322: try HTTP digest auth first, and watch out for handler name collisions. ........ r46532 | georg.brandl | 2006-05-29 22:57:01 +0200 (Mon, 29 May 2006) | 3 lines Add News entry for last commit. ........ r46533 | georg.brandl | 2006-05-29 23:04:52 +0200 (Mon, 29 May 2006) | 4 lines Make use of METH_O and METH_NOARGS where possible. Use Py_UnpackTuple instead of PyArg_ParseTuple where possible. ........ r46534 | georg.brandl | 2006-05-29 23:58:42 +0200 (Mon, 29 May 2006) | 3 lines Convert more modules to METH_VARARGS. ........ r46535 | georg.brandl | 2006-05-30 00:00:30 +0200 (Tue, 30 May 2006) | 3 lines Whoops. ........ r46536 | fredrik.lundh | 2006-05-30 00:42:07 +0200 (Tue, 30 May 2006) | 4 lines fixed "abc".count("", 100) == -96 error (hopefully, nobody's relying on the current behaviour ;-) ........ r46537 | bob.ippolito | 2006-05-30 00:55:48 +0200 (Tue, 30 May 2006) | 1 line struct: modulo math plus warning on all endian-explicit formats for compatibility with older struct usage (ugly) ........ r46539 | bob.ippolito | 2006-05-30 02:26:01 +0200 (Tue, 30 May 2006) | 1 line Add a length check to aifc to ensure it doesn't write a bogus file ........ r46540 | tim.peters | 2006-05-30 04:25:25 +0200 (Tue, 30 May 2006) | 10 lines deprecated_err(): Stop bizarre warning messages when the tests are run in the order: test_genexps (or any other doctest-based test) test_struct test_doctest The `warnings` module needs an advertised way to save/restore its internal filter list. ........ r46541 | tim.peters | 2006-05-30 04:26:46 +0200 (Tue, 30 May 2006) | 2 lines Whitespace normalization. ........ r46542 | tim.peters | 2006-05-30 04:30:30 +0200 (Tue, 30 May 2006) | 2 lines Set a binary svn:mime-type property on this UTF-8 encoded file. ........ r46543 | neal.norwitz | 2006-05-30 05:18:50 +0200 (Tue, 30 May 2006) | 1 line Simplify further by using AddStringConstant ........ r46544 | tim.peters | 2006-05-30 06:16:25 +0200 (Tue, 30 May 2006) | 6 lines Convert relevant dict internals to Py_ssize_t. I don't have a box with nearly enough RAM, or an OS, that could get close to tickling this, though (requires a dict w/ at least 2**31 entries). ........ r46545 | neal.norwitz | 2006-05-30 06:19:21 +0200 (Tue, 30 May 2006) | 1 line Remove stray | in comment ........ r46546 | neal.norwitz | 2006-05-30 06:25:05 +0200 (Tue, 30 May 2006) | 1 line Use Py_SAFE_DOWNCAST for safety. Fix format strings. Remove 2 more stray | in comment ........ r46547 | neal.norwitz | 2006-05-30 06:43:23 +0200 (Tue, 30 May 2006) | 1 line No DOWNCAST is required since sizeof(Py_ssize_t) >= sizeof(int) and Py_ReprEntr returns an int ........ r46548 | tim.peters | 2006-05-30 07:04:59 +0200 (Tue, 30 May 2006) | 3 lines dict_print(): Explicitly narrow the return value from a (possibly) wider variable. ........ r46549 | tim.peters | 2006-05-30 07:23:59 +0200 (Tue, 30 May 2006) | 5 lines dict_print(): So that Neal & I don't spend the rest of our lives taking turns rewriting code that works ;-), get rid of casting illusions by declaring a new variable with the obvious type. ........ r46550 | georg.brandl | 2006-05-30 09:04:55 +0200 (Tue, 30 May 2006) | 3 lines Restore exception pickle support. #1497319. ........ r46551 | georg.brandl | 2006-05-30 09:13:29 +0200 (Tue, 30 May 2006) | 3 lines Add a test case for exception pickling. args is never NULL. ........ r46552 | neal.norwitz | 2006-05-30 09:21:10 +0200 (Tue, 30 May 2006) | 1 line Don't fail if the (sub)pkgname already exist. ........ r46553 | georg.brandl | 2006-05-30 09:34:45 +0200 (Tue, 30 May 2006) | 3 lines Disallow keyword args for exceptions. ........ r46554 | neal.norwitz | 2006-05-30 09:36:54 +0200 (Tue, 30 May 2006) | 5 lines I'm impatient. I think this will fix a few more problems with the buildbots. I'm not sure this is the best approach, but I can't think of anything better. If this creates problems, feel free to revert, but I think it's safe and should make things a little better. ........ r46555 | georg.brandl | 2006-05-30 10:17:00 +0200 (Tue, 30 May 2006) | 4 lines Do the check for no keyword arguments in __init__ so that subclasses of Exception can be supplied keyword args ........ r46556 | georg.brandl | 2006-05-30 10:47:19 +0200 (Tue, 30 May 2006) | 3 lines Convert test_exceptions to unittest. ........ r46557 | andrew.kuchling | 2006-05-30 14:52:01 +0200 (Tue, 30 May 2006) | 1 line Add SoC name, and reorganize this section a bit ........ r46559 | tim.peters | 2006-05-30 17:53:34 +0200 (Tue, 30 May 2006) | 11 lines PyLong_FromString(): Continued fraction analysis (explained in a new comment) suggests there are almost certainly large input integers in all non-binary input bases for which one Python digit too few is initally allocated to hold the final result. Instead of assert-failing when that happens, allocate more space. Alas, I estimate it would take a few days to find a specific such case, so this isn't backed up by a new test (not to mention that such a case may take hours to run, since conversion time is quadratic in the number of digits, and preliminary attempts suggested that the smallest such inputs contain at least a million digits). ........ r46560 | fredrik.lundh | 2006-05-30 19:11:48 +0200 (Tue, 30 May 2006) | 3 lines changed find/rfind to return -1 for matches outside the source string ........ r46561 | bob.ippolito | 2006-05-30 19:37:54 +0200 (Tue, 30 May 2006) | 1 line Change wrapping terminology to overflow masking ........ r46562 | fredrik.lundh | 2006-05-30 19:39:58 +0200 (Tue, 30 May 2006) | 3 lines changed count to return 0 for slices outside the source string ........ r46568 | tim.peters | 2006-05-31 01:28:02 +0200 (Wed, 31 May 2006) | 2 lines Whitespace normalization. ........ r46569 | brett.cannon | 2006-05-31 04:19:54 +0200 (Wed, 31 May 2006) | 5 lines Clarify wording on default values for strptime(); defaults are used when better values cannot be inferred. Closes bug #1496315. ........ r46572 | neal.norwitz | 2006-05-31 09:43:27 +0200 (Wed, 31 May 2006) | 1 line Calculate smallest properly (it was off by one) and use proper ssize_t types for Win64 ........ r46573 | neal.norwitz | 2006-05-31 10:01:08 +0200 (Wed, 31 May 2006) | 1 line Revert last checkin, it is better to do make distclean ........ r46574 | neal.norwitz | 2006-05-31 11:02:44 +0200 (Wed, 31 May 2006) | 3 lines On 64-bit platforms running test_struct after test_tarfile would fail since the deprecation warning wouldn't be raised. ........ r46575 | thomas.heller | 2006-05-31 13:37:58 +0200 (Wed, 31 May 2006) | 3 lines PyTuple_Pack is not available in Python 2.3, but ctypes must stay compatible with that. ........ r46576 | andrew.kuchling | 2006-05-31 15:18:56 +0200 (Wed, 31 May 2006) | 1 line 'functional' module was renamed to 'functools' ........ r46577 | kristjan.jonsson | 2006-05-31 15:35:41 +0200 (Wed, 31 May 2006) | 1 line Fixup the PCBuild8 project directory. exceptions.c have moved to Objects, and the functionalmodule.c has been replaced with _functoolsmodule.c. Other minor changes to .vcproj files and .sln to fix compilation ........ r46578 | andrew.kuchling | 2006-05-31 16:08:48 +0200 (Wed, 31 May 2006) | 15 lines [Bug #1473048] SimpleXMLRPCServer and DocXMLRPCServer don't look at the path of the HTTP request at all; you can POST or GET from / or /RPC2 or /blahblahblah with the same results. Security scanners that look for /cgi-bin/phf will therefore report lots of vulnerabilities. Fix: add a .rpc_paths attribute to the SimpleXMLRPCServer class, and report a 404 error if the path isn't on the allowed list. Possibly-controversial aspect of this change: the default makes only '/' and '/RPC2' legal. Maybe this will break people's applications (though I doubt it). We could just set the default to an empty tuple, which would exactly match the current behaviour. ........ r46579 | andrew.kuchling | 2006-05-31 16:12:47 +0200 (Wed, 31 May 2006) | 1 line Mention SimpleXMLRPCServer change ........ r46580 | tim.peters | 2006-05-31 16:28:07 +0200 (Wed, 31 May 2006) | 2 lines Trimmed trailing whitespace. ........ r46581 | tim.peters | 2006-05-31 17:33:22 +0200 (Wed, 31 May 2006) | 4 lines _range_error(): Speed and simplify (there's no real need for loops here). Assert that size_t is actually big enough, and that f->size is at least one. Wrap a long line. ........ r46582 | tim.peters | 2006-05-31 17:34:37 +0200 (Wed, 31 May 2006) | 2 lines Repaired error in new comment. ........ r46584 | neal.norwitz | 2006-06-01 07:32:49 +0200 (Thu, 01 Jun 2006) | 4 lines Remove ; at end of macro. There was a compiler recently that warned about extra semi-colons. It may have been the HP C compiler. This file will trigger a bunch of those warnings now. ........ r46585 | georg.brandl | 2006-06-01 08:39:19 +0200 (Thu, 01 Jun 2006) | 3 lines Correctly unpickle 2.4 exceptions via __setstate__ (patch #1498571) ........ r46586 | georg.brandl | 2006-06-01 10:27:32 +0200 (Thu, 01 Jun 2006) | 3 lines Correctly allocate complex types with tp_alloc. (bug #1498638) ........ r46587 | georg.brandl | 2006-06-01 14:30:46 +0200 (Thu, 01 Jun 2006) | 2 lines Correctly dispatch Faults in loads (patch #1498627) ........ r46588 | georg.brandl | 2006-06-01 15:00:49 +0200 (Thu, 01 Jun 2006) | 3 lines Some code style tweaks, and remove apply. ........ r46589 | armin.rigo | 2006-06-01 15:19:12 +0200 (Thu, 01 Jun 2006) | 5 lines [ 1497053 ] Let dicts propagate the exceptions in user __eq__(). [ 1456209 ] dictresize() vulnerability ( <- backport candidate ). ........ r46590 | tim.peters | 2006-06-01 15:41:46 +0200 (Thu, 01 Jun 2006) | 2 lines Whitespace normalization. ........ r46591 | tim.peters | 2006-06-01 15:49:23 +0200 (Thu, 01 Jun 2006) | 2 lines Record bugs 1275608 and 1456209 as being fixed. ........ r46592 | tim.peters | 2006-06-01 15:56:26 +0200 (Thu, 01 Jun 2006) | 5 lines Re-enable a new empty-string test added during the NFS sprint, but disabled then because str and unicode strings gave different results. The implementations were repaired later during the sprint, but the new test remained disabled. ........ r46594 | tim.peters | 2006-06-01 17:50:44 +0200 (Thu, 01 Jun 2006) | 7 lines Armin committed his patch while I was reviewing it (I'm sure he didn't know this), so merged in some changes I made during review. Nothing material apart from changing a new `mask` local from int to Py_ssize_t. Mostly this is repairing comments that were made incorrect, and adding new comments. Also a few minor code rewrites for clarity or helpful succinctness. ........ r46599 | neal.norwitz | 2006-06-02 06:45:53 +0200 (Fri, 02 Jun 2006) | 1 line Convert docstrings to comments so regrtest -v prints method names ........ r46600 | neal.norwitz | 2006-06-02 06:50:49 +0200 (Fri, 02 Jun 2006) | 2 lines Fix memory leak found by valgrind. ........ r46601 | neal.norwitz | 2006-06-02 06:54:52 +0200 (Fri, 02 Jun 2006) | 1 line More memory leaks from valgrind ........ r46602 | neal.norwitz | 2006-06-02 08:23:00 +0200 (Fri, 02 Jun 2006) | 11 lines Patch #1357836: Prevent an invalid memory read from test_coding in case the done flag is set. In that case, the loop isn't entered. I wonder if rather than setting the done flag in the cases before the loop, if they should just exit early. This code looks like it should be refactored. Backport candidate (also the early break above if decoding_fgets fails) ........ r46603 | martin.blais | 2006-06-02 15:03:43 +0200 (Fri, 02 Jun 2006) | 1 line Fixed struct test to not use unittest. ........ r46605 | tim.peters | 2006-06-03 01:22:51 +0200 (Sat, 03 Jun 2006) | 10 lines pprint functions used to sort a dict (by key) if and only if the output required more than one line. "Small" dicts got displayed in seemingly random order (the hash-induced order produced by dict.__repr__). None of this was documented. Now pprint functions always sort dicts by key, and the docs promise it. This was proposed and agreed to during the PyCon 2006 core sprint -- I just didn't have time for it before now. ........
987 lines
26 KiB
C
987 lines
26 KiB
C
|
|
/* Time module */
|
|
|
|
#include "Python.h"
|
|
#include "structseq.h"
|
|
#include "timefuncs.h"
|
|
|
|
#ifdef __APPLE__
|
|
#if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_FTIME)
|
|
/*
|
|
* floattime falls back to ftime when getttimeofday fails because the latter
|
|
* might fail on some platforms. This fallback is unwanted on MacOSX because
|
|
* that makes it impossible to use a binary build on OSX 10.4 on earlier
|
|
* releases of the OS. Therefore claim we don't support ftime.
|
|
*/
|
|
# undef HAVE_FTIME
|
|
#endif
|
|
#endif
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#ifdef QUICKWIN
|
|
#include <io.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_FTIME
|
|
#include <sys/timeb.h>
|
|
#if !defined(MS_WINDOWS) && !defined(PYOS_OS2)
|
|
extern int ftime(struct timeb *);
|
|
#endif /* MS_WINDOWS */
|
|
#endif /* HAVE_FTIME */
|
|
|
|
#if defined(__WATCOMC__) && !defined(__QNX__)
|
|
#include <i86.h>
|
|
#else
|
|
#ifdef MS_WINDOWS
|
|
#define WIN32_LEAN_AND_MEAN
|
|
#include <windows.h>
|
|
#include "pythread.h"
|
|
|
|
/* helper to allow us to interrupt sleep() on Windows*/
|
|
static HANDLE hInterruptEvent = NULL;
|
|
static BOOL WINAPI PyCtrlHandler(DWORD dwCtrlType)
|
|
{
|
|
SetEvent(hInterruptEvent);
|
|
/* allow other default handlers to be called.
|
|
Default Python handler will setup the
|
|
KeyboardInterrupt exception.
|
|
*/
|
|
return FALSE;
|
|
}
|
|
static long main_thread;
|
|
|
|
|
|
#if defined(__BORLANDC__)
|
|
/* These overrides not needed for Win32 */
|
|
#define timezone _timezone
|
|
#define tzname _tzname
|
|
#define daylight _daylight
|
|
#endif /* __BORLANDC__ */
|
|
#endif /* MS_WINDOWS */
|
|
#endif /* !__WATCOMC__ || __QNX__ */
|
|
|
|
#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
|
|
/* Win32 has better clock replacement; we have our own version below. */
|
|
#undef HAVE_CLOCK
|
|
#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
|
|
|
|
#if defined(PYOS_OS2)
|
|
#define INCL_DOS
|
|
#define INCL_ERRORS
|
|
#include <os2.h>
|
|
#endif
|
|
|
|
#if defined(PYCC_VACPP)
|
|
#include <sys/time.h>
|
|
#endif
|
|
|
|
#ifdef __BEOS__
|
|
#include <time.h>
|
|
/* For bigtime_t, snooze(). - [cjh] */
|
|
#include <support/SupportDefs.h>
|
|
#include <kernel/OS.h>
|
|
#endif
|
|
|
|
#ifdef RISCOS
|
|
extern int riscos_sleep(double);
|
|
#endif
|
|
|
|
/* Forward declarations */
|
|
static int floatsleep(double);
|
|
static double floattime(void);
|
|
|
|
/* For Y2K check */
|
|
static PyObject *moddict;
|
|
|
|
/* Exposed in timefuncs.h. */
|
|
time_t
|
|
_PyTime_DoubleToTimet(double x)
|
|
{
|
|
time_t result;
|
|
double diff;
|
|
|
|
result = (time_t)x;
|
|
/* How much info did we lose? time_t may be an integral or
|
|
* floating type, and we don't know which. If it's integral,
|
|
* we don't know whether C truncates, rounds, returns the floor,
|
|
* etc. If we lost a second or more, the C rounding is
|
|
* unreasonable, or the input just doesn't fit in a time_t;
|
|
* call it an error regardless. Note that the original cast to
|
|
* time_t can cause a C error too, but nothing we can do to
|
|
* worm around that.
|
|
*/
|
|
diff = x - (double)result;
|
|
if (diff <= -1.0 || diff >= 1.0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"timestamp out of range for platform time_t");
|
|
result = (time_t)-1;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static PyObject *
|
|
time_time(PyObject *self, PyObject *unused)
|
|
{
|
|
double secs;
|
|
secs = floattime();
|
|
if (secs == 0.0) {
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return NULL;
|
|
}
|
|
return PyFloat_FromDouble(secs);
|
|
}
|
|
|
|
PyDoc_STRVAR(time_doc,
|
|
"time() -> floating point number\n\
|
|
\n\
|
|
Return the current time in seconds since the Epoch.\n\
|
|
Fractions of a second may be present if the system clock provides them.");
|
|
|
|
#ifdef HAVE_CLOCK
|
|
|
|
#ifndef CLOCKS_PER_SEC
|
|
#ifdef CLK_TCK
|
|
#define CLOCKS_PER_SEC CLK_TCK
|
|
#else
|
|
#define CLOCKS_PER_SEC 1000000
|
|
#endif
|
|
#endif
|
|
|
|
static PyObject *
|
|
time_clock(PyObject *self, PyObject *unused)
|
|
{
|
|
return PyFloat_FromDouble(((double)clock()) / CLOCKS_PER_SEC);
|
|
}
|
|
#endif /* HAVE_CLOCK */
|
|
|
|
#if defined(MS_WINDOWS) && !defined(__BORLANDC__)
|
|
/* Due to Mark Hammond and Tim Peters */
|
|
static PyObject *
|
|
time_clock(PyObject *self, PyObject *unused)
|
|
{
|
|
static LARGE_INTEGER ctrStart;
|
|
static double divisor = 0.0;
|
|
LARGE_INTEGER now;
|
|
double diff;
|
|
|
|
if (divisor == 0.0) {
|
|
LARGE_INTEGER freq;
|
|
QueryPerformanceCounter(&ctrStart);
|
|
if (!QueryPerformanceFrequency(&freq) || freq.QuadPart == 0) {
|
|
/* Unlikely to happen - this works on all intel
|
|
machines at least! Revert to clock() */
|
|
return PyFloat_FromDouble(clock());
|
|
}
|
|
divisor = (double)freq.QuadPart;
|
|
}
|
|
QueryPerformanceCounter(&now);
|
|
diff = (double)(now.QuadPart - ctrStart.QuadPart);
|
|
return PyFloat_FromDouble(diff / divisor);
|
|
}
|
|
|
|
#define HAVE_CLOCK /* So it gets included in the methods */
|
|
#endif /* MS_WINDOWS && !defined(__BORLANDC__) */
|
|
|
|
#ifdef HAVE_CLOCK
|
|
PyDoc_STRVAR(clock_doc,
|
|
"clock() -> floating point number\n\
|
|
\n\
|
|
Return the CPU time or real time since the start of the process or since\n\
|
|
the first call to clock(). This has as much precision as the system\n\
|
|
records.");
|
|
#endif
|
|
|
|
static PyObject *
|
|
time_sleep(PyObject *self, PyObject *args)
|
|
{
|
|
double secs;
|
|
if (!PyArg_ParseTuple(args, "d:sleep", &secs))
|
|
return NULL;
|
|
if (floatsleep(secs) != 0)
|
|
return NULL;
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(sleep_doc,
|
|
"sleep(seconds)\n\
|
|
\n\
|
|
Delay execution for a given number of seconds. The argument may be\n\
|
|
a floating point number for subsecond precision.");
|
|
|
|
static PyStructSequence_Field struct_time_type_fields[] = {
|
|
{"tm_year", NULL},
|
|
{"tm_mon", NULL},
|
|
{"tm_mday", NULL},
|
|
{"tm_hour", NULL},
|
|
{"tm_min", NULL},
|
|
{"tm_sec", NULL},
|
|
{"tm_wday", NULL},
|
|
{"tm_yday", NULL},
|
|
{"tm_isdst", NULL},
|
|
{0}
|
|
};
|
|
|
|
static PyStructSequence_Desc struct_time_type_desc = {
|
|
"time.struct_time",
|
|
NULL,
|
|
struct_time_type_fields,
|
|
9,
|
|
};
|
|
|
|
static int initialized;
|
|
static PyTypeObject StructTimeType;
|
|
|
|
static PyObject *
|
|
tmtotuple(struct tm *p)
|
|
{
|
|
PyObject *v = PyStructSequence_New(&StructTimeType);
|
|
if (v == NULL)
|
|
return NULL;
|
|
|
|
#define SET(i,val) PyStructSequence_SET_ITEM(v, i, PyInt_FromLong((long) val))
|
|
|
|
SET(0, p->tm_year + 1900);
|
|
SET(1, p->tm_mon + 1); /* Want January == 1 */
|
|
SET(2, p->tm_mday);
|
|
SET(3, p->tm_hour);
|
|
SET(4, p->tm_min);
|
|
SET(5, p->tm_sec);
|
|
SET(6, (p->tm_wday + 6) % 7); /* Want Monday == 0 */
|
|
SET(7, p->tm_yday + 1); /* Want January, 1 == 1 */
|
|
SET(8, p->tm_isdst);
|
|
#undef SET
|
|
if (PyErr_Occurred()) {
|
|
Py_XDECREF(v);
|
|
return NULL;
|
|
}
|
|
|
|
return v;
|
|
}
|
|
|
|
static PyObject *
|
|
time_convert(double when, struct tm * (*function)(const time_t *))
|
|
{
|
|
struct tm *p;
|
|
time_t whent = _PyTime_DoubleToTimet(when);
|
|
|
|
if (whent == (time_t)-1 && PyErr_Occurred())
|
|
return NULL;
|
|
errno = 0;
|
|
p = function(&whent);
|
|
if (p == NULL) {
|
|
#ifdef EINVAL
|
|
if (errno == 0)
|
|
errno = EINVAL;
|
|
#endif
|
|
return PyErr_SetFromErrno(PyExc_ValueError);
|
|
}
|
|
return tmtotuple(p);
|
|
}
|
|
|
|
/* Parse arg tuple that can contain an optional float-or-None value;
|
|
format needs to be "|O:name".
|
|
Returns non-zero on success (parallels PyArg_ParseTuple).
|
|
*/
|
|
static int
|
|
parse_time_double_args(PyObject *args, char *format, double *pwhen)
|
|
{
|
|
PyObject *ot = NULL;
|
|
|
|
if (!PyArg_ParseTuple(args, format, &ot))
|
|
return 0;
|
|
if (ot == NULL || ot == Py_None)
|
|
*pwhen = floattime();
|
|
else {
|
|
double when = PyFloat_AsDouble(ot);
|
|
if (PyErr_Occurred())
|
|
return 0;
|
|
*pwhen = when;
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static PyObject *
|
|
time_gmtime(PyObject *self, PyObject *args)
|
|
{
|
|
double when;
|
|
if (!parse_time_double_args(args, "|O:gmtime", &when))
|
|
return NULL;
|
|
return time_convert(when, gmtime);
|
|
}
|
|
|
|
PyDoc_STRVAR(gmtime_doc,
|
|
"gmtime([seconds]) -> (tm_year, tm_mon, tm_day, tm_hour, tm_min,\n\
|
|
tm_sec, tm_wday, tm_yday, tm_isdst)\n\
|
|
\n\
|
|
Convert seconds since the Epoch to a time tuple expressing UTC (a.k.a.\n\
|
|
GMT). When 'seconds' is not passed in, convert the current time instead.");
|
|
|
|
static PyObject *
|
|
time_localtime(PyObject *self, PyObject *args)
|
|
{
|
|
double when;
|
|
if (!parse_time_double_args(args, "|O:localtime", &when))
|
|
return NULL;
|
|
return time_convert(when, localtime);
|
|
}
|
|
|
|
PyDoc_STRVAR(localtime_doc,
|
|
"localtime([seconds]) -> (tm_year,tm_mon,tm_day,tm_hour,tm_min,tm_sec,tm_wday,tm_yday,tm_isdst)\n\
|
|
\n\
|
|
Convert seconds since the Epoch to a time tuple expressing local time.\n\
|
|
When 'seconds' is not passed in, convert the current time instead.");
|
|
|
|
static int
|
|
gettmarg(PyObject *args, struct tm *p)
|
|
{
|
|
int y;
|
|
memset((void *) p, '\0', sizeof(struct tm));
|
|
|
|
if (!PyArg_Parse(args, "(iiiiiiiii)",
|
|
&y,
|
|
&p->tm_mon,
|
|
&p->tm_mday,
|
|
&p->tm_hour,
|
|
&p->tm_min,
|
|
&p->tm_sec,
|
|
&p->tm_wday,
|
|
&p->tm_yday,
|
|
&p->tm_isdst))
|
|
return 0;
|
|
if (y < 1900) {
|
|
PyObject *accept = PyDict_GetItemString(moddict,
|
|
"accept2dyear");
|
|
if (accept == NULL || !PyInt_Check(accept) ||
|
|
PyInt_AsLong(accept) == 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"year >= 1900 required");
|
|
return 0;
|
|
}
|
|
if (69 <= y && y <= 99)
|
|
y += 1900;
|
|
else if (0 <= y && y <= 68)
|
|
y += 2000;
|
|
else {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"year out of range");
|
|
return 0;
|
|
}
|
|
}
|
|
p->tm_year = y - 1900;
|
|
p->tm_mon--;
|
|
p->tm_wday = (p->tm_wday + 1) % 7;
|
|
p->tm_yday--;
|
|
return 1;
|
|
}
|
|
|
|
#ifdef HAVE_STRFTIME
|
|
static PyObject *
|
|
time_strftime(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *tup = NULL;
|
|
struct tm buf;
|
|
const char *fmt;
|
|
size_t fmtlen, buflen;
|
|
char *outbuf = 0;
|
|
size_t i;
|
|
|
|
memset((void *) &buf, '\0', sizeof(buf));
|
|
|
|
if (!PyArg_ParseTuple(args, "s|O:strftime", &fmt, &tup))
|
|
return NULL;
|
|
|
|
if (tup == NULL) {
|
|
time_t tt = time(NULL);
|
|
buf = *localtime(&tt);
|
|
} else if (!gettmarg(tup, &buf))
|
|
return NULL;
|
|
|
|
/* Checks added to make sure strftime() does not crash Python by
|
|
indexing blindly into some array for a textual representation
|
|
by some bad index (fixes bug #897625).
|
|
|
|
No check for year since handled in gettmarg().
|
|
*/
|
|
if (buf.tm_mon < 0 || buf.tm_mon > 11) {
|
|
PyErr_SetString(PyExc_ValueError, "month out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_mday < 1 || buf.tm_mday > 31) {
|
|
PyErr_SetString(PyExc_ValueError, "day of month out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_hour < 0 || buf.tm_hour > 23) {
|
|
PyErr_SetString(PyExc_ValueError, "hour out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_min < 0 || buf.tm_min > 59) {
|
|
PyErr_SetString(PyExc_ValueError, "minute out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_sec < 0 || buf.tm_sec > 61) {
|
|
PyErr_SetString(PyExc_ValueError, "seconds out of range");
|
|
return NULL;
|
|
}
|
|
/* tm_wday does not need checking of its upper-bound since taking
|
|
``% 7`` in gettmarg() automatically restricts the range. */
|
|
if (buf.tm_wday < 0) {
|
|
PyErr_SetString(PyExc_ValueError, "day of week out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_yday < 0 || buf.tm_yday > 365) {
|
|
PyErr_SetString(PyExc_ValueError, "day of year out of range");
|
|
return NULL;
|
|
}
|
|
if (buf.tm_isdst < -1 || buf.tm_isdst > 1) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"daylight savings flag out of range");
|
|
return NULL;
|
|
}
|
|
|
|
fmtlen = strlen(fmt);
|
|
|
|
/* I hate these functions that presume you know how big the output
|
|
* will be ahead of time...
|
|
*/
|
|
for (i = 1024; ; i += i) {
|
|
outbuf = (char *)malloc(i);
|
|
if (outbuf == NULL) {
|
|
return PyErr_NoMemory();
|
|
}
|
|
buflen = strftime(outbuf, i, fmt, &buf);
|
|
if (buflen > 0 || i >= 256 * fmtlen) {
|
|
/* If the buffer is 256 times as long as the format,
|
|
it's probably not failing for lack of room!
|
|
More likely, the format yields an empty result,
|
|
e.g. an empty format, or %Z when the timezone
|
|
is unknown. */
|
|
PyObject *ret;
|
|
ret = PyString_FromStringAndSize(outbuf, buflen);
|
|
free(outbuf);
|
|
return ret;
|
|
}
|
|
free(outbuf);
|
|
}
|
|
}
|
|
|
|
PyDoc_STRVAR(strftime_doc,
|
|
"strftime(format[, tuple]) -> string\n\
|
|
\n\
|
|
Convert a time tuple to a string according to a format specification.\n\
|
|
See the library reference manual for formatting codes. When the time tuple\n\
|
|
is not present, current time as returned by localtime() is used.");
|
|
#endif /* HAVE_STRFTIME */
|
|
|
|
static PyObject *
|
|
time_strptime(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *strptime_module = PyImport_ImportModule("_strptime");
|
|
PyObject *strptime_result;
|
|
|
|
if (!strptime_module)
|
|
return NULL;
|
|
strptime_result = PyObject_CallMethod(strptime_module, "strptime", "O", args);
|
|
Py_DECREF(strptime_module);
|
|
return strptime_result;
|
|
}
|
|
|
|
PyDoc_STRVAR(strptime_doc,
|
|
"strptime(string, format) -> struct_time\n\
|
|
\n\
|
|
Parse a string to a time tuple according to a format specification.\n\
|
|
See the library reference manual for formatting codes (same as strftime()).");
|
|
|
|
|
|
static PyObject *
|
|
time_asctime(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *tup = NULL;
|
|
struct tm buf;
|
|
char *p;
|
|
if (!PyArg_UnpackTuple(args, "asctime", 0, 1, &tup))
|
|
return NULL;
|
|
if (tup == NULL) {
|
|
time_t tt = time(NULL);
|
|
buf = *localtime(&tt);
|
|
} else if (!gettmarg(tup, &buf))
|
|
return NULL;
|
|
p = asctime(&buf);
|
|
if (p[24] == '\n')
|
|
p[24] = '\0';
|
|
return PyString_FromString(p);
|
|
}
|
|
|
|
PyDoc_STRVAR(asctime_doc,
|
|
"asctime([tuple]) -> string\n\
|
|
\n\
|
|
Convert a time tuple to a string, e.g. 'Sat Jun 06 16:26:11 1998'.\n\
|
|
When the time tuple is not present, current time as returned by localtime()\n\
|
|
is used.");
|
|
|
|
static PyObject *
|
|
time_ctime(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *ot = NULL;
|
|
time_t tt;
|
|
char *p;
|
|
|
|
if (!PyArg_UnpackTuple(args, "ctime", 0, 1, &ot))
|
|
return NULL;
|
|
if (ot == NULL || ot == Py_None)
|
|
tt = time(NULL);
|
|
else {
|
|
double dt = PyFloat_AsDouble(ot);
|
|
if (PyErr_Occurred())
|
|
return NULL;
|
|
tt = _PyTime_DoubleToTimet(dt);
|
|
if (tt == (time_t)-1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
p = ctime(&tt);
|
|
if (p == NULL) {
|
|
PyErr_SetString(PyExc_ValueError, "unconvertible time");
|
|
return NULL;
|
|
}
|
|
if (p[24] == '\n')
|
|
p[24] = '\0';
|
|
return PyString_FromString(p);
|
|
}
|
|
|
|
PyDoc_STRVAR(ctime_doc,
|
|
"ctime(seconds) -> string\n\
|
|
\n\
|
|
Convert a time in seconds since the Epoch to a string in local time.\n\
|
|
This is equivalent to asctime(localtime(seconds)). When the time tuple is\n\
|
|
not present, current time as returned by localtime() is used.");
|
|
|
|
#ifdef HAVE_MKTIME
|
|
static PyObject *
|
|
time_mktime(PyObject *self, PyObject *tup)
|
|
{
|
|
struct tm buf;
|
|
time_t tt;
|
|
tt = time(&tt);
|
|
buf = *localtime(&tt);
|
|
if (!gettmarg(tup, &buf))
|
|
return NULL;
|
|
tt = mktime(&buf);
|
|
if (tt == (time_t)(-1)) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"mktime argument out of range");
|
|
return NULL;
|
|
}
|
|
return PyFloat_FromDouble((double)tt);
|
|
}
|
|
|
|
PyDoc_STRVAR(mktime_doc,
|
|
"mktime(tuple) -> floating point number\n\
|
|
\n\
|
|
Convert a time tuple in local time to seconds since the Epoch.");
|
|
#endif /* HAVE_MKTIME */
|
|
|
|
#ifdef HAVE_WORKING_TZSET
|
|
void inittimezone(PyObject *module);
|
|
|
|
static PyObject *
|
|
time_tzset(PyObject *self, PyObject *unused)
|
|
{
|
|
PyObject* m;
|
|
|
|
m = PyImport_ImportModule("time");
|
|
if (m == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
tzset();
|
|
|
|
/* Reset timezone, altzone, daylight and tzname */
|
|
inittimezone(m);
|
|
Py_DECREF(m);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(tzset_doc,
|
|
"tzset(zone)\n\
|
|
\n\
|
|
Initialize, or reinitialize, the local timezone to the value stored in\n\
|
|
os.environ['TZ']. The TZ environment variable should be specified in\n\
|
|
standard Unix timezone format as documented in the tzset man page\n\
|
|
(eg. 'US/Eastern', 'Europe/Amsterdam'). Unknown timezones will silently\n\
|
|
fall back to UTC. If the TZ environment variable is not set, the local\n\
|
|
timezone is set to the systems best guess of wallclock time.\n\
|
|
Changing the TZ environment variable without calling tzset *may* change\n\
|
|
the local timezone used by methods such as localtime, but this behaviour\n\
|
|
should not be relied on.");
|
|
#endif /* HAVE_WORKING_TZSET */
|
|
|
|
void inittimezone(PyObject *m) {
|
|
/* This code moved from inittime wholesale to allow calling it from
|
|
time_tzset. In the future, some parts of it can be moved back
|
|
(for platforms that don't HAVE_WORKING_TZSET, when we know what they
|
|
are), and the extranious calls to tzset(3) should be removed.
|
|
I havn't done this yet, as I don't want to change this code as
|
|
little as possible when introducing the time.tzset and time.tzsetwall
|
|
methods. This should simply be a method of doing the following once,
|
|
at the top of this function and removing the call to tzset() from
|
|
time_tzset():
|
|
|
|
#ifdef HAVE_TZSET
|
|
tzset()
|
|
#endif
|
|
|
|
And I'm lazy and hate C so nyer.
|
|
*/
|
|
#if defined(HAVE_TZNAME) && !defined(__GLIBC__) && !defined(__CYGWIN__)
|
|
tzset();
|
|
#ifdef PYOS_OS2
|
|
PyModule_AddIntConstant(m, "timezone", _timezone);
|
|
#else /* !PYOS_OS2 */
|
|
PyModule_AddIntConstant(m, "timezone", timezone);
|
|
#endif /* PYOS_OS2 */
|
|
#ifdef HAVE_ALTZONE
|
|
PyModule_AddIntConstant(m, "altzone", altzone);
|
|
#else
|
|
#ifdef PYOS_OS2
|
|
PyModule_AddIntConstant(m, "altzone", _timezone-3600);
|
|
#else /* !PYOS_OS2 */
|
|
PyModule_AddIntConstant(m, "altzone", timezone-3600);
|
|
#endif /* PYOS_OS2 */
|
|
#endif
|
|
PyModule_AddIntConstant(m, "daylight", daylight);
|
|
PyModule_AddObject(m, "tzname",
|
|
Py_BuildValue("(zz)", tzname[0], tzname[1]));
|
|
#else /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
|
|
#ifdef HAVE_STRUCT_TM_TM_ZONE
|
|
{
|
|
#define YEAR ((time_t)((365 * 24 + 6) * 3600))
|
|
time_t t;
|
|
struct tm *p;
|
|
long janzone, julyzone;
|
|
char janname[10], julyname[10];
|
|
t = (time((time_t *)0) / YEAR) * YEAR;
|
|
p = localtime(&t);
|
|
janzone = -p->tm_gmtoff;
|
|
strncpy(janname, p->tm_zone ? p->tm_zone : " ", 9);
|
|
janname[9] = '\0';
|
|
t += YEAR/2;
|
|
p = localtime(&t);
|
|
julyzone = -p->tm_gmtoff;
|
|
strncpy(julyname, p->tm_zone ? p->tm_zone : " ", 9);
|
|
julyname[9] = '\0';
|
|
|
|
if( janzone < julyzone ) {
|
|
/* DST is reversed in the southern hemisphere */
|
|
PyModule_AddIntConstant(m, "timezone", julyzone);
|
|
PyModule_AddIntConstant(m, "altzone", janzone);
|
|
PyModule_AddIntConstant(m, "daylight",
|
|
janzone != julyzone);
|
|
PyModule_AddObject(m, "tzname",
|
|
Py_BuildValue("(zz)",
|
|
julyname, janname));
|
|
} else {
|
|
PyModule_AddIntConstant(m, "timezone", janzone);
|
|
PyModule_AddIntConstant(m, "altzone", julyzone);
|
|
PyModule_AddIntConstant(m, "daylight",
|
|
janzone != julyzone);
|
|
PyModule_AddObject(m, "tzname",
|
|
Py_BuildValue("(zz)",
|
|
janname, julyname));
|
|
}
|
|
}
|
|
#else
|
|
#endif /* HAVE_STRUCT_TM_TM_ZONE */
|
|
#ifdef __CYGWIN__
|
|
tzset();
|
|
PyModule_AddIntConstant(m, "timezone", _timezone);
|
|
PyModule_AddIntConstant(m, "altzone", _timezone-3600);
|
|
PyModule_AddIntConstant(m, "daylight", _daylight);
|
|
PyModule_AddObject(m, "tzname",
|
|
Py_BuildValue("(zz)", _tzname[0], _tzname[1]));
|
|
#endif /* __CYGWIN__ */
|
|
#endif /* !HAVE_TZNAME || __GLIBC__ || __CYGWIN__*/
|
|
}
|
|
|
|
|
|
static PyMethodDef time_methods[] = {
|
|
{"time", time_time, METH_NOARGS, time_doc},
|
|
#ifdef HAVE_CLOCK
|
|
{"clock", time_clock, METH_NOARGS, clock_doc},
|
|
#endif
|
|
{"sleep", time_sleep, METH_VARARGS, sleep_doc},
|
|
{"gmtime", time_gmtime, METH_VARARGS, gmtime_doc},
|
|
{"localtime", time_localtime, METH_VARARGS, localtime_doc},
|
|
{"asctime", time_asctime, METH_VARARGS, asctime_doc},
|
|
{"ctime", time_ctime, METH_VARARGS, ctime_doc},
|
|
#ifdef HAVE_MKTIME
|
|
{"mktime", time_mktime, METH_O, mktime_doc},
|
|
#endif
|
|
#ifdef HAVE_STRFTIME
|
|
{"strftime", time_strftime, METH_VARARGS, strftime_doc},
|
|
#endif
|
|
{"strptime", time_strptime, METH_VARARGS, strptime_doc},
|
|
#ifdef HAVE_WORKING_TZSET
|
|
{"tzset", time_tzset, METH_NOARGS, tzset_doc},
|
|
#endif
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
|
|
PyDoc_STRVAR(module_doc,
|
|
"This module provides various functions to manipulate time values.\n\
|
|
\n\
|
|
There are two standard representations of time. One is the number\n\
|
|
of seconds since the Epoch, in UTC (a.k.a. GMT). It may be an integer\n\
|
|
or a floating point number (to represent fractions of seconds).\n\
|
|
The Epoch is system-defined; on Unix, it is generally January 1st, 1970.\n\
|
|
The actual value can be retrieved by calling gmtime(0).\n\
|
|
\n\
|
|
The other representation is a tuple of 9 integers giving local time.\n\
|
|
The tuple items are:\n\
|
|
year (four digits, e.g. 1998)\n\
|
|
month (1-12)\n\
|
|
day (1-31)\n\
|
|
hours (0-23)\n\
|
|
minutes (0-59)\n\
|
|
seconds (0-59)\n\
|
|
weekday (0-6, Monday is 0)\n\
|
|
Julian day (day in the year, 1-366)\n\
|
|
DST (Daylight Savings Time) flag (-1, 0 or 1)\n\
|
|
If the DST flag is 0, the time is given in the regular time zone;\n\
|
|
if it is 1, the time is given in the DST time zone;\n\
|
|
if it is -1, mktime() should guess based on the date and time.\n\
|
|
\n\
|
|
Variables:\n\
|
|
\n\
|
|
timezone -- difference in seconds between UTC and local standard time\n\
|
|
altzone -- difference in seconds between UTC and local DST time\n\
|
|
daylight -- whether local time should reflect DST\n\
|
|
tzname -- tuple of (standard time zone name, DST time zone name)\n\
|
|
\n\
|
|
Functions:\n\
|
|
\n\
|
|
time() -- return current time in seconds since the Epoch as a float\n\
|
|
clock() -- return CPU time since process start as a float\n\
|
|
sleep() -- delay for a number of seconds given as a float\n\
|
|
gmtime() -- convert seconds since Epoch to UTC tuple\n\
|
|
localtime() -- convert seconds since Epoch to local time tuple\n\
|
|
asctime() -- convert time tuple to string\n\
|
|
ctime() -- convert time in seconds to string\n\
|
|
mktime() -- convert local time tuple to seconds since Epoch\n\
|
|
strftime() -- convert time tuple to string according to format specification\n\
|
|
strptime() -- parse string to time tuple according to format specification\n\
|
|
tzset() -- change the local timezone");
|
|
|
|
|
|
PyMODINIT_FUNC
|
|
inittime(void)
|
|
{
|
|
PyObject *m;
|
|
char *p;
|
|
m = Py_InitModule3("time", time_methods, module_doc);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
/* Accept 2-digit dates unless PYTHONY2K is set and non-empty */
|
|
p = Py_GETENV("PYTHONY2K");
|
|
PyModule_AddIntConstant(m, "accept2dyear", (long) (!p || !*p));
|
|
/* Squirrel away the module's dictionary for the y2k check */
|
|
moddict = PyModule_GetDict(m);
|
|
Py_INCREF(moddict);
|
|
|
|
/* Set, or reset, module variables like time.timezone */
|
|
inittimezone(m);
|
|
|
|
#ifdef MS_WINDOWS
|
|
/* Helper to allow interrupts for Windows.
|
|
If Ctrl+C event delivered while not sleeping
|
|
it will be ignored.
|
|
*/
|
|
main_thread = PyThread_get_thread_ident();
|
|
hInterruptEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
|
|
SetConsoleCtrlHandler( PyCtrlHandler, TRUE);
|
|
#endif /* MS_WINDOWS */
|
|
if (!initialized) {
|
|
PyStructSequence_InitType(&StructTimeType,
|
|
&struct_time_type_desc);
|
|
}
|
|
Py_INCREF(&StructTimeType);
|
|
PyModule_AddObject(m, "struct_time", (PyObject*) &StructTimeType);
|
|
initialized = 1;
|
|
}
|
|
|
|
|
|
/* Implement floattime() for various platforms */
|
|
|
|
static double
|
|
floattime(void)
|
|
{
|
|
/* There are three ways to get the time:
|
|
(1) gettimeofday() -- resolution in microseconds
|
|
(2) ftime() -- resolution in milliseconds
|
|
(3) time() -- resolution in seconds
|
|
In all cases the return value is a float in seconds.
|
|
Since on some systems (e.g. SCO ODT 3.0) gettimeofday() may
|
|
fail, so we fall back on ftime() or time().
|
|
Note: clock resolution does not imply clock accuracy! */
|
|
#ifdef HAVE_GETTIMEOFDAY
|
|
{
|
|
struct timeval t;
|
|
#ifdef GETTIMEOFDAY_NO_TZ
|
|
if (gettimeofday(&t) == 0)
|
|
return (double)t.tv_sec + t.tv_usec*0.000001;
|
|
#else /* !GETTIMEOFDAY_NO_TZ */
|
|
if (gettimeofday(&t, (struct timezone *)NULL) == 0)
|
|
return (double)t.tv_sec + t.tv_usec*0.000001;
|
|
#endif /* !GETTIMEOFDAY_NO_TZ */
|
|
}
|
|
|
|
#endif /* !HAVE_GETTIMEOFDAY */
|
|
{
|
|
#if defined(HAVE_FTIME)
|
|
struct timeb t;
|
|
ftime(&t);
|
|
return (double)t.time + (double)t.millitm * (double)0.001;
|
|
#else /* !HAVE_FTIME */
|
|
time_t secs;
|
|
time(&secs);
|
|
return (double)secs;
|
|
#endif /* !HAVE_FTIME */
|
|
}
|
|
}
|
|
|
|
|
|
/* Implement floatsleep() for various platforms.
|
|
When interrupted (or when another error occurs), return -1 and
|
|
set an exception; else return 0. */
|
|
|
|
static int
|
|
floatsleep(double secs)
|
|
{
|
|
/* XXX Should test for MS_WINDOWS first! */
|
|
#if defined(HAVE_SELECT) && !defined(__BEOS__) && !defined(__EMX__)
|
|
struct timeval t;
|
|
double frac;
|
|
frac = fmod(secs, 1.0);
|
|
secs = floor(secs);
|
|
t.tv_sec = (long)secs;
|
|
t.tv_usec = (long)(frac*1000000.0);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t) != 0) {
|
|
#ifdef EINTR
|
|
if (errno != EINTR) {
|
|
#else
|
|
if (1) {
|
|
#endif
|
|
Py_BLOCK_THREADS
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return -1;
|
|
}
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
#elif defined(__WATCOMC__) && !defined(__QNX__)
|
|
/* XXX Can't interrupt this sleep */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
delay((int)(secs * 1000 + 0.5)); /* delay() uses milliseconds */
|
|
Py_END_ALLOW_THREADS
|
|
#elif defined(MS_WINDOWS)
|
|
{
|
|
double millisecs = secs * 1000.0;
|
|
unsigned long ul_millis;
|
|
|
|
if (millisecs > (double)ULONG_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"sleep length is too large");
|
|
return -1;
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* Allow sleep(0) to maintain win32 semantics, and as decreed
|
|
* by Guido, only the main thread can be interrupted.
|
|
*/
|
|
ul_millis = (unsigned long)millisecs;
|
|
if (ul_millis == 0 ||
|
|
main_thread != PyThread_get_thread_ident())
|
|
Sleep(ul_millis);
|
|
else {
|
|
DWORD rc;
|
|
ResetEvent(hInterruptEvent);
|
|
rc = WaitForSingleObject(hInterruptEvent, ul_millis);
|
|
if (rc == WAIT_OBJECT_0) {
|
|
/* Yield to make sure real Python signal
|
|
* handler called.
|
|
*/
|
|
Sleep(1);
|
|
Py_BLOCK_THREADS
|
|
errno = EINTR;
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return -1;
|
|
}
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
#elif defined(PYOS_OS2)
|
|
/* This Sleep *IS* Interruptable by Exceptions */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (DosSleep(secs * 1000) != NO_ERROR) {
|
|
Py_BLOCK_THREADS
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return -1;
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
#elif defined(__BEOS__)
|
|
/* This sleep *CAN BE* interrupted. */
|
|
{
|
|
if( secs <= 0.0 ) {
|
|
return;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* BeOS snooze() is in microseconds... */
|
|
if( snooze( (bigtime_t)( secs * 1000.0 * 1000.0 ) ) == B_INTERRUPTED ) {
|
|
Py_BLOCK_THREADS
|
|
PyErr_SetFromErrno( PyExc_IOError );
|
|
return -1;
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
#elif defined(RISCOS)
|
|
if (secs <= 0.0)
|
|
return 0;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
/* This sleep *CAN BE* interrupted. */
|
|
if ( riscos_sleep(secs) )
|
|
return -1;
|
|
Py_END_ALLOW_THREADS
|
|
#elif defined(PLAN9)
|
|
{
|
|
double millisecs = secs * 1000.0;
|
|
if (millisecs > (double)LONG_MAX) {
|
|
PyErr_SetString(PyExc_OverflowError, "sleep length is too large");
|
|
return -1;
|
|
}
|
|
/* This sleep *CAN BE* interrupted. */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if(sleep((long)millisecs) < 0){
|
|
Py_BLOCK_THREADS
|
|
PyErr_SetFromErrno(PyExc_IOError);
|
|
return -1;
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
#else
|
|
/* XXX Can't interrupt this sleep */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sleep((int)secs);
|
|
Py_END_ALLOW_THREADS
|
|
#endif
|
|
|
|
return 0;
|
|
}
|
|
|
|
|