diff options
| -rw-r--r-- | ChangeLog.MELT | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/chrono.cc | 79 |
2 files changed, 86 insertions, 0 deletions
diff --git a/ChangeLog.MELT b/ChangeLog.MELT index 4f7374fd97e..d2449b3ea64 100644 --- a/ChangeLog.MELT +++ b/ChangeLog.MELT @@ -1,4 +1,7 @@ +2009-08-02 Basile Starynkevitch <basile@starynkevitch.net> + added manually libstdc++-v3/src/chrono.cc from trunk. + 2009-07-31 Basile Starynkevitch <basile@starynkevitch.net> MELT branch merged with trunk rev 150307 added manually libstdc++-v3/include/std/chrono from trunk. @@ -380,3 +383,7 @@ 2008-02-19 Basile Starynkevitch <basile@starynkevitch.net> Created MELT branch. See also gcc/ChangeLog.melt + +/// Local Variables: +/// mode: change-log +/// End: diff --git a/libstdc++-v3/src/chrono.cc b/libstdc++-v3/src/chrono.cc new file mode 100644 index 00000000000..422b97399ac --- /dev/null +++ b/libstdc++-v3/src/chrono.cc @@ -0,0 +1,79 @@ +// chrono -*- C++ -*- + +// Copyright (C) 2008, 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library 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 3, or (at your option) +// any later version. + +// This library 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// <http://www.gnu.org/licenses/>. + +#include <chrono> + +#ifdef _GLIBCXX_USE_C99_STDINT_TR1 + +// conditional inclusion of sys/time.h for gettimeofday +#if !defined(_GLIBCXX_USE_CLOCK_MONOTONIC) && \ + !defined(_GLIBCXX_USE_CLOCK_REALTIME) && \ + defined(_GLIBCXX_USE_GETTIMEOFDAY) +#include <sys/time.h> +#endif + +namespace std +{ + namespace chrono + { + const bool system_clock::is_monotonic; + + system_clock::time_point + system_clock::now() throw () + { +#ifdef _GLIBCXX_USE_CLOCK_REALTIME + timespec tp; + // -EINVAL, -EFAULT + clock_gettime(CLOCK_REALTIME, &tp); + return time_point(duration(chrono::seconds(tp.tv_sec) + + chrono::nanoseconds(tp.tv_nsec))); +#elif defined(_GLIBCXX_USE_GETTIMEOFDAY) + timeval tv; + // EINVAL, EFAULT + gettimeofday(&tv, NULL); + return time_point(duration(chrono::seconds(tv.tv_sec) + + chrono::microseconds(tv.tv_usec))); +#else + std::time_t __sec = std::time(0); + return system_clock::from_time_t(__sec); +#endif + } + +#ifdef _GLIBCXX_USE_CLOCK_MONOTONIC + const bool monotonic_clock::is_monotonic; + + monotonic_clock::time_point + monotonic_clock::now() + { + timespec tp; + // -EINVAL, -EFAULT + clock_gettime(CLOCK_MONOTONIC, &tp); + return time_point(duration(chrono::seconds(tp.tv_sec) + + chrono::nanoseconds(tp.tv_nsec))); + } +#endif + } +} + +#endif // _GLIBCXX_USE_C99_STDINT_TR1 |