octave: liboctave/system/oct-time.cc annotate

annotate liboctave/system/oct-time.cc @ 32090:7d663f770c5a

load-path: Avoid using file_stat on Windows (bug #59711). * liboctave/system/oct-time.h, oct-time.cc (octave::sys::file_time): New class to handle an efficient native file time type per platform. * libinterp/corefcn/load-path.h (load_path::dir_info::dir_mtime, load_path::dir_info::dir_time_last_checked): Change type to new class. * libinterp/corefcn/load-path.cc (subdirs_modified, load_path::dir_info::update, load_path::dir_info::initialize): Avoid using file_stat on Windows.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Sat, 13 May 2023 13:33:57 +0200
parents	21f9b34eb893
children	53e15e754725

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31607 diff changeset	3 // Copyright (C) 1999-2023 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21562 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21218 diff changeset	27 # include "config.h"
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	28 #endif
07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	29
23662 bd77ab816e43 eliminate obsolete file lo-math.h John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	30 #include <cmath>
bd77ab816e43 eliminate obsolete file lo-math.h John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	31 #include <ctime>
bd77ab816e43 eliminate obsolete file lo-math.h John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	32
23676 e719f04a5707 new output stream operator for octave::sys::time objects John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	33 #include <iomanip>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	34 #include <limits>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	35 #include <ostream>
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15020 diff changeset	36
29138 eacd1a3417c3 time: Get time zone offset on Windows (bug #53908). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	37 #if defined (OCTAVE_USE_WINDOWS_API)
eacd1a3417c3 time: Get time zone offset on Windows (bug #53908). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	38 # include <windows.h>
32090 7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	39 #else
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	40 # include "file-stat.h"
29138 eacd1a3417c3 time: Get time zone offset on Windows (bug #53908). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	41 #endif
eacd1a3417c3 time: Get time zone offset on Windows (bug #53908). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	42
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	43 #include "lo-error.h"
07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	44 #include "lo-utils.h"
29138 eacd1a3417c3 time: Get time zone offset on Windows (bug #53908). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	45 #include "lo-sysdep.h"
13975 16158606112d avoid memory error in strptime John W. Eaton <jwe@octave.org> parents: 13974 diff changeset	46 #include "oct-locbuf.h"
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	47 #include "oct-time.h"
23676 e719f04a5707 new output stream operator for octave::sys::time objects John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	48 #include "octave-preserve-stream-state.h"
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	49 #include "strftime-wrapper.h"
00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	50 #include "strptime-wrapper.h"
21930 f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	51 #include "time-wrappers.h"
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	52
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	53 OCTAVE_BEGIN_NAMESPACE(octave)
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	54
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	55 OCTAVE_BEGIN_NAMESPACE(sys)
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	56
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	57 time::time (double d)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	58 : m_ot_unix_time (static_cast<OCTAVE_TIME_T> (d)), m_ot_usec (0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	59 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	60 double ip;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	61 m_ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	62 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	63
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	64 time::time (const base_tm& tm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	65 : m_ot_unix_time (), m_ot_usec ()
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	66 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	67 struct ::tm t;
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	68
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	69 t.tm_sec = tm.sec ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	70 t.tm_min = tm.min ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	71 t.tm_hour = tm.hour ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	72 t.tm_mday = tm.mday ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	73 t.tm_mon = tm.mon ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	74 t.tm_year = tm.year ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	75 t.tm_wday = tm.wday ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	76 t.tm_yday = tm.yday ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	77 t.tm_isdst = tm.isdst ();
13984 1126c2907878 avoid accessing tm_gmtoff from struct tm unless it is present John W. Eaton <jwe@octave.org> parents: 13982 diff changeset	78
20375 31f89b12aaf7 strftime: Add support for "%z" conversion specifier (bug #45592) Mike Miller <mtmiller@octave.org> parents: 19697 diff changeset	79 #if defined (HAVE_TM_GMTOFF)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	80 t.tm_gmtoff = tm.gmtoff ();
13984 1126c2907878 avoid accessing tm_gmtoff from struct tm unless it is present John W. Eaton <jwe@octave.org> parents: 13982 diff changeset	81 #endif
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	82
3887 7da18459c08b [project @ 2002-04-04 00:44:21 by jwe] jwe parents: 3736 diff changeset	83 #if defined (HAVE_STRUCT_TM_TM_ZONE)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	84 std::string s = tm.zone ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	85 char *ps = strsave (s.c_str ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	86 t.tm_zone = ps;
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	87 #endif
07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	88
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	89 m_ot_unix_time = octave_mktime_wrapper (&t);
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	90
3887 7da18459c08b [project @ 2002-04-04 00:44:21 by jwe] jwe parents: 3736 diff changeset	91 #if defined (HAVE_STRUCT_TM_TM_ZONE)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	92 delete [] ps;
3344 ff13d5dec62d [project @ 1999-11-08 04:18:48 by jwe] jwe parents: 3322 diff changeset	93 #endif
ff13d5dec62d [project @ 1999-11-08 04:18:48 by jwe] jwe parents: 3322 diff changeset	94
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	95 m_ot_usec = tm.usec ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	96 }
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	97
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	98 std::string
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	99 time::ctime () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	100 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	101 return localtime (*this).asctime ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	102 }
3255 4d33b1e56bff [project @ 1999-07-15 20:54:14 by jwe] jwe parents: 3253 diff changeset	103
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	104 std::ostream&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	105 operator << (std::ostream& os, const time& ot)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	106 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	107 preserve_stream_state stream_state (os);
23676 e719f04a5707 new output stream operator for octave::sys::time objects John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	108
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	109 os << ot.m_ot_unix_time << '.'
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	110 << std::setw (6) << std::setfill ('0') << ot.m_ot_usec;
23676 e719f04a5707 new output stream operator for octave::sys::time objects John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	111
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	112 return os;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	113 }
23676 e719f04a5707 new output stream operator for octave::sys::time objects John W. Eaton <jwe@octave.org> parents: 23662 diff changeset	114
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	115 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	116 time::stamp ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	117 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	118 time_t ot_unix_time;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	119 octave_gettimeofday_wrapper (&ot_unix_time, &m_ot_usec);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	120 m_ot_unix_time = ot_unix_time;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	121 }
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	122
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	123 // From the mktime() manual page:
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	124 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	125 // The mktime() function converts a broken-down time structure,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	126 // expressed as local time, to calendar time representation.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	127 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	128 // <snip>
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	129 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	130 // If structure members are outside their legal interval, they
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	131 // will be normalized (so that, e.g., 40 October is changed into
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	132 // 9 November).
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	133 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	134 // So, we no longer check limits here.
3736 ac4609ffc702 [project @ 2000-11-16 17:25:34 by jwe] jwe parents: 3709 diff changeset	135
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	136 #define DEFINE_SET_FIELD_FCN(type, f, lo, hi) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22062 diff changeset	137 base_tm& \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22062 diff changeset	138 base_tm::f (type v) \
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	139 { \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22062 diff changeset	140 m_ ## f = v; \
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	141 \
30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	142 return *this; \
30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	143 }
13974 f5bd61eb032f handle tm_gmtoff field in struct tm John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	144
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	145 #define DEFINE_SET_INT_FIELD_FCN(f, lo, hi) \
30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	146 DEFINE_SET_FIELD_FCN (int, f, lo, hi)
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	147
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	148 DEFINE_SET_INT_FIELD_FCN (usec, 0, 1000000)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	149 DEFINE_SET_INT_FIELD_FCN (sec, 0, 61)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	150 DEFINE_SET_INT_FIELD_FCN (min, 0, 59)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	151 DEFINE_SET_INT_FIELD_FCN (hour, 0, 23)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	152 DEFINE_SET_INT_FIELD_FCN (mday, 1, 31)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	153 DEFINE_SET_INT_FIELD_FCN (mon, 0, 11)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	154 DEFINE_SET_INT_FIELD_FCN (year, std::numeric_limits<int>::min (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	155 std::numeric_limitd<int>::max ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	156 DEFINE_SET_INT_FIELD_FCN (wday, 0, 6)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	157 DEFINE_SET_INT_FIELD_FCN (yday, 0, 365)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	158 DEFINE_SET_INT_FIELD_FCN (isdst, 0, 1)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	159 DEFINE_SET_FIELD_FCN (long, gmtoff, -86400, 0)
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	160
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	161 base_tm&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	162 base_tm::zone (const std::string& s)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	163 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	164 m_zone = s;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	165 return *this;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	166 }
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	167
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 20375 diff changeset	168 #if ! defined STRFTIME_BUF_INITIAL_SIZE
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20791 diff changeset	169 # define STRFTIME_BUF_INITIAL_SIZE 128
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	170 #endif
07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	171
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	172 std::string
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	173 base_tm::strftime (const std::string& fmt) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	174 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	175 std::string retval;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	176
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	177 if (! fmt.empty ())
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	178 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	179 struct ::tm t;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	180
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	181 t.tm_sec = m_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	182 t.tm_min = m_min;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	183 t.tm_hour = m_hour;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	184 t.tm_mday = m_mday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	185 t.tm_mon = m_mon;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	186 t.tm_year = m_year;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	187 t.tm_wday = m_wday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	188 t.tm_yday = m_yday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	189 t.tm_isdst = m_isdst;
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	190
20375 31f89b12aaf7 strftime: Add support for "%z" conversion specifier (bug #45592) Mike Miller <mtmiller@octave.org> parents: 19697 diff changeset	191 #if defined (HAVE_TM_GMTOFF)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	192 t.tm_gmtoff = m_gmtoff;
13974 f5bd61eb032f handle tm_gmtoff field in struct tm John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	193 #endif
f5bd61eb032f handle tm_gmtoff field in struct tm John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	194
3887 7da18459c08b [project @ 2002-04-04 00:44:21 by jwe] jwe parents: 3736 diff changeset	195 #if defined (HAVE_STRUCT_TM_TM_ZONE)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	196 char *ps = strsave (m_zone.c_str ());
3709 c73bea82af94 [project @ 2000-08-02 02:23:26 by jwe] jwe parents: 3706 diff changeset	197 t.tm_zone = ps;
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	198 #endif
07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	199
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	200 const char *fmt_str = fmt.c_str ();
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	201
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	202 char *buf = nullptr;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	203 std::size_t bufsize = STRFTIME_BUF_INITIAL_SIZE;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	204 std::size_t chars_written = 0;
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	205
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	206 while (chars_written == 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	207 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	208 delete [] buf;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	209 buf = new char [bufsize];
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	210 buf[0] = '\0';
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	211
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	212 chars_written
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	213 = octave_strftime_wrapper (buf, bufsize, fmt_str, &t);
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	214
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	215 bufsize *= 2;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	216 }
3253 07d2d307c43e [project @ 1999-07-15 15:58:50 by jwe] jwe parents: diff changeset	217
3887 7da18459c08b [project @ 2002-04-04 00:44:21 by jwe] jwe parents: 3736 diff changeset	218 #if defined (HAVE_STRUCT_TM_TM_ZONE)
3709 c73bea82af94 [project @ 2000-08-02 02:23:26 by jwe] jwe parents: 3706 diff changeset	219 delete [] ps;
3344 ff13d5dec62d [project @ 1999-11-08 04:18:48 by jwe] jwe parents: 3322 diff changeset	220 #endif
21930 f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	221
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	222 retval = buf;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	223
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	224 delete [] buf;
21930 f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	225 }
f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	226
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	227 return retval;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	228 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	229
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	230 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	231 base_tm::init (void *p)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	232 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	233 if (! p)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	234 return;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	235
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	236 struct ::tm t = static_cast<struct ::tm > (p);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	237
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	238 m_sec = t->tm_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	239 m_min = t->tm_min;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	240 m_hour = t->tm_hour;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	241 m_mday = t->tm_mday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	242 m_mon = t->tm_mon;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	243 m_year = t->tm_year;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	244 m_wday = t->tm_wday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	245 m_yday = t->tm_yday;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	246 m_isdst = t->tm_isdst;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	247
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	248 #if defined (HAVE_TM_GMTOFF)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	249 m_gmtoff = t->tm_gmtoff;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	250 #elif defined (OCTAVE_USE_WINDOWS_API)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	251 TIME_ZONE_INFORMATION tzi;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	252
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	253 GetTimeZoneInformationForYear (m_year, nullptr, &tzi);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	254
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	255 if (m_isdst)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	256 m_gmtoff = -60 * (tzi.Bias + tzi.DaylightBias);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	257 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	258 m_gmtoff = -60 * (tzi.Bias + tzi.StandardBias);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	259 #endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	260
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	261 #if defined (HAVE_STRUCT_TM_TM_ZONE)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	262 if (t->tm_zone)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	263 m_zone = t->tm_zone;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	264 #elif defined (OCTAVE_USE_WINDOWS_API)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	265 if (m_isdst)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	266 m_zone = sys::u8_from_wstring (tzi.DaylightName);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	267 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	268 m_zone = sys::u8_from_wstring (tzi.StandardName);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	269 #elif defined (HAVE_TZNAME)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	270 if (t->tm_isdst == 0 \|\| t->tm_isdst == 1)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	271 m_zone = tzname[t->tm_isdst];
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	272 #endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	273 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	274
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	275 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	276 localtime::init (const time& ot)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	277 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	278 m_usec = ot.usec ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	279
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	280 time_t t = ot.unix_time ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	281
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	282 base_tm::init (std::localtime (&t));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	283 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	284
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	285 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	286 gmtime::init (const time& ot)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	287 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	288 m_usec = ot.usec ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	289
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	290 time_t t = ot.unix_time ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	291
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	292 base_tm::init (std::gmtime (&t));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	293 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	294
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	295 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	296 strptime::init (const std::string& str, const std::string& fmt)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	297 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	298 struct ::tm t;
21930 f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	299
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	300 t.tm_sec = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	301 t.tm_min = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	302 t.tm_hour = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	303 t.tm_mday = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	304 t.tm_mon = -1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	305 t.tm_year = std::numeric_limits<int>::min ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	306 t.tm_wday = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	307 t.tm_yday = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	308 t.tm_isdst = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	309
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	310 #if defined (HAVE_TM_GMTOFF)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	311 t.tm_gmtoff = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	312 #endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	313
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	314 #if defined (HAVE_STRUCT_TM_TM_ZONE)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	315 char *ps = strsave ("");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	316 t.tm_zone = ps;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	317 #endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	318
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	319 const char *p = str.c_str ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	320
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	321 char *q = octave_strptime_wrapper (p, fmt.c_str (), &t);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	322
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	323 // Fill in wday and yday, but only if mday is valid and the mon and year
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	324 // are filled in, avoiding issues with mktime and invalid dates.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	325 if (t.tm_mday != 0 && t.tm_mon >= 0
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	326 && t.tm_year != std::numeric_limits<int>::min ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	327 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	328 t.tm_isdst = -1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	329 octave_mktime_wrapper (&t);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	330 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	331
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	332 if (t.tm_mon < 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	333 t.tm_mon = 0;
21930 f0c5dd1ea2b9 hide sys/time.h, sys/times.h, and sys/resource.h headers John W. Eaton <jwe@octave.org> parents: 21888 diff changeset	334
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	335 if (t.tm_year == std::numeric_limits<int>::min ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	336 t.tm_year = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	337
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	338 if (q)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	339 m_nchars = q - p + 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	340 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	341 m_nchars = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	342
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	343 base_tm::init (&t);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	344
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	345 #if defined (HAVE_STRUCT_TM_TM_ZONE)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	346 delete [] ps;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	347 #endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	348 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	349
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	350 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	351 cpu_time::stamp ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	352 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	353 time_t usr_sec, sys_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	354 octave_cpu_time (&usr_sec, &sys_sec, &m_usr_usec, &m_sys_usec);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	355 m_usr_sec = usr_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	356 m_sys_sec = sys_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	357 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	358
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	359 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31706 diff changeset	360 resource_usage::stamp ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	361 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	362 time_t usr_sec, sys_sec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	363 long usr_usec, sys_usec;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	364
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	365 octave_getrusage_wrapper (&usr_sec, &sys_sec, &usr_usec,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	366 &sys_usec, &m_maxrss, &m_ixrss,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	367 &m_idrss, &m_isrss, &m_minflt,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	368 &m_majflt, &m_nswap, &m_inblock,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	369 &m_oublock, &m_msgsnd, &m_msgrcv,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	370 &m_nsignals, &m_nvcsw, &m_nivcsw);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	371
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	372 m_cpu = cpu_time (usr_sec, sys_sec, usr_usec, sys_usec);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	373 }
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	374
32090 7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	375 file_time::file_time ()
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	376 {
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	377 #if defined (OCTAVE_USE_WINDOWS_API)
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	378 FILETIME curr_file_time;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	379 GetSystemTimeAsFileTime (&curr_file_time);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	380 m_time
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	381 = (static_cast<OCTAVE_TIME_T> (curr_file_time.dwHighDateTime)) >> 32
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	382 \| curr_file_time.dwLowDateTime;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	383 #else
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	384 time_t ot_unix_time;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	385 time_t ot_usec;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	386 octave_gettimeofday_wrapper (&ot_unix_time, &ot_usec);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	387 // Discard usec. We are assuming a 1 second resolution anyway.
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	388 m_time = ot_unix_time;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	389 #endif
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	390 }
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	391
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	392 file_time::file_time (const std::string& filename)
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	393 {
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	394 #if defined (OCTAVE_USE_WINDOWS_API)
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	395 std::wstring wfull_name = sys::u8_to_wstring (filename);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	396 HANDLE h_file
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	397 = CreateFile (wfull_name.c_str (), GENERIC_READ,
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	398 FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0,
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	399 nullptr);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	400 FILETIME last_access_time;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	401 GetFileTime (h_file, nullptr, &last_access_time, nullptr);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	402
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	403 m_time
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	404 = (static_cast<OCTAVE_TIME_T> (last_access_time.dwHighDateTime)) >> 32
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	405 \| last_access_time.dwLowDateTime;
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	406 #else
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	407 file_stat fs = file_stat (filename);
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	408 m_time = fs.mtime ().unix_time ();
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	409 #endif
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	410 }
7d663f770c5a load-path: Avoid using file_stat on Windows (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31771 diff changeset	411
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	412 OCTAVE_END_NAMESPACE(sys)
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30826 diff changeset	413 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate liboctave/system/oct-time.cc @ 32090:7d663f770c5a