summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-08-05 17:34:27 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-08-05 17:34:27 (GMT)
commit6fc4ade2bb44a176555703ebc2dbfb54b57e1148 (patch)
treec52aa91d4f9e35bb2850ea2aea673e56eabc4ee6 /Python
parent1c5471f319a4e5c7bbb56c7ae349b5fe455dc857 (diff)
downloadcpython-6fc4ade2bb44a176555703ebc2dbfb54b57e1148.zip
cpython-6fc4ade2bb44a176555703ebc2dbfb54b57e1148.tar.gz
cpython-6fc4ade2bb44a176555703ebc2dbfb54b57e1148.tar.bz2
Issue #9079: Added _PyTime_gettimeofday(_PyTime_timeval *tp) to C API
exposed in Python.h. This function is similar to POSIX gettimeofday(struct timeval *tp), but available on platforms without gettimeofday().
Diffstat (limited to 'Python')
-rw-r--r--Python/pythonrun.c2
-rw-r--r--Python/pytime.c60
2 files changed, 62 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f45d7dc..79a19f8 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -268,6 +268,8 @@ Py_InitializeEx(int install_sigs)
/* Initialize _warnings. */
_PyWarnings_Init();
+ _PyTime_Init();
+
initfsencoding();
if (install_sigs)
diff --git a/Python/pytime.c b/Python/pytime.c
new file mode 100644
index 0000000..6fb7695
--- /dev/null
+++ b/Python/pytime.c
@@ -0,0 +1,60 @@
+#include "Python.h"
+
+#ifdef __APPLE__
+#if defined(HAVE_GETTIMEOFDAY) && defined(HAVE_FTIME)
+ /*
+ * _PyTime_gettimeofday 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
+
+#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 */
+
+void
+_PyTime_gettimeofday(_PyTime_timeval *tp)
+{
+ /* 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 in a timeval struct.
+ 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
+#ifdef GETTIMEOFDAY_NO_TZ
+ if (gettimeofday(tp) == 0)
+ return;
+#else /* !GETTIMEOFDAY_NO_TZ */
+ if (gettimeofday(tp, (struct timezone *)NULL) == 0)
+ return;
+#endif /* !GETTIMEOFDAY_NO_TZ */
+#endif /* !HAVE_GETTIMEOFDAY */
+#if defined(HAVE_FTIME)
+ {
+ struct timeb t;
+ ftime(&t);
+ tp->tv_sec = t.time;
+ tp->tv_usec = t.millitm * 1000;
+ }
+#else /* !HAVE_FTIME */
+ tp->tv_sec = time(NULL);
+ tp->tv_usec = 0;
+#endif /* !HAVE_FTIME */
+ return;
+}
+
+void
+_PyTime_Init()
+{
+ /* Do nothing. Needed to force linking. */
+}