Mercurial > octave

comparison liboctave/system/oct-time.cc @ 31607:aac27ad79be6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 18:02:15 -0800
parents e88a07dec498
children 597f3ee61a48
comparison
equal deleted inserted replaced
31605:e88a07dec498 31607:aac27ad79be6
50 50
51 OCTAVE_BEGIN_NAMESPACE(octave) 51 OCTAVE_BEGIN_NAMESPACE(octave)
52 52
53 OCTAVE_BEGIN_NAMESPACE(sys) 53 OCTAVE_BEGIN_NAMESPACE(sys)
54 54
55 time::time (double d) 55 time::time (double d)
56 : m_ot_unix_time (static_cast<OCTAVE_TIME_T> (d)), m_ot_usec (0) 56 : m_ot_unix_time (static_cast<OCTAVE_TIME_T> (d)), m_ot_usec (0)
57 { 57 {
58 double ip; 58 double ip;
59 m_ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6); 59 m_ot_usec = static_cast<int> (std::modf (d, &ip) * 1e6);
60 } 60 }
61 61
62 time::time (const base_tm& tm) 62 time::time (const base_tm& tm)
63 : m_ot_unix_time (), m_ot_usec () 63 : m_ot_unix_time (), m_ot_usec ()
64 { 64 {
65 struct ::tm t; 65 struct ::tm t;
66 66
67 t.tm_sec = tm.sec (); 67 t.tm_sec = tm.sec ();
68 t.tm_min = tm.min (); 68 t.tm_min = tm.min ();
69 t.tm_hour = tm.hour (); 69 t.tm_hour = tm.hour ();
70 t.tm_mday = tm.mday (); 70 t.tm_mday = tm.mday ();
71 t.tm_mon = tm.mon (); 71 t.tm_mon = tm.mon ();
72 t.tm_year = tm.year (); 72 t.tm_year = tm.year ();
73 t.tm_wday = tm.wday (); 73 t.tm_wday = tm.wday ();
74 t.tm_yday = tm.yday (); 74 t.tm_yday = tm.yday ();
75 t.tm_isdst = tm.isdst (); 75 t.tm_isdst = tm.isdst ();
76 76
77 #if defined (HAVE_TM_GMTOFF) 77 #if defined (HAVE_TM_GMTOFF)
78 t.tm_gmtoff = tm.gmtoff (); 78 t.tm_gmtoff = tm.gmtoff ();
79 #endif 79 #endif
80 80
81 #if defined (HAVE_STRUCT_TM_TM_ZONE) 81 #if defined (HAVE_STRUCT_TM_TM_ZONE)
82 std::string s = tm.zone (); 82 std::string s = tm.zone ();
83 char *ps = strsave (s.c_str ()); 83 char *ps = strsave (s.c_str ());
84 t.tm_zone = ps; 84 t.tm_zone = ps;
85 #endif 85 #endif
86 86
87 m_ot_unix_time = octave_mktime_wrapper (&t); 87 m_ot_unix_time = octave_mktime_wrapper (&t);
88 88
89 #if defined (HAVE_STRUCT_TM_TM_ZONE) 89 #if defined (HAVE_STRUCT_TM_TM_ZONE)
90 delete [] ps; 90 delete [] ps;
91 #endif 91 #endif
92 92
93 m_ot_usec = tm.usec (); 93 m_ot_usec = tm.usec ();
94 } 94 }
95 95
96 std::string 96 std::string
97 time::ctime (void) const 97 time::ctime (void) const
98 { 98 {
99 return localtime (*this).asctime (); 99 return localtime (*this).asctime ();
100 } 100 }
101 101
102 std::ostream& 102 std::ostream&
103 operator << (std::ostream& os, const time& ot) 103 operator << (std::ostream& os, const time& ot)
104 { 104 {
105 preserve_stream_state stream_state (os); 105 preserve_stream_state stream_state (os);
106 106
107 os << ot.m_ot_unix_time << '.' 107 os << ot.m_ot_unix_time << '.'
108 << std::setw (6) << std::setfill ('0') << ot.m_ot_usec; 108 << std::setw (6) << std::setfill ('0') << ot.m_ot_usec;
109 109
110 return os; 110 return os;
111 } 111 }
112 112
113 void 113 void
114 time::stamp (void) 114 time::stamp (void)
115 { 115 {
116 time_t ot_unix_time; 116 time_t ot_unix_time;
117 octave_gettimeofday_wrapper (&ot_unix_time, &m_ot_usec); 117 octave_gettimeofday_wrapper (&ot_unix_time, &m_ot_usec);
118 m_ot_unix_time = ot_unix_time; 118 m_ot_unix_time = ot_unix_time;
119 } 119 }
120 120
121 // From the mktime() manual page: 121 // From the mktime() manual page:
122 // 122 //
123 // The mktime() function converts a broken-down time structure, 123 // The mktime() function converts a broken-down time structure,
124 // expressed as local time, to calendar time representation. 124 // expressed as local time, to calendar time representation.
125 // 125 //
126 // <snip> 126 // <snip>
127 // 127 //
128 // If structure members are outside their legal interval, they 128 // If structure members are outside their legal interval, they
129 // will be normalized (so that, e.g., 40 October is changed into 129 // will be normalized (so that, e.g., 40 October is changed into
130 // 9 November). 130 // 9 November).
131 // 131 //
132 // So, we no longer check limits here. 132 // So, we no longer check limits here.
133 133
134 #define DEFINE_SET_FIELD_FCN(type, f, lo, hi) \ 134 #define DEFINE_SET_FIELD_FCN(type, f, lo, hi) \
135 base_tm& \ 135 base_tm& \
136 base_tm::f (type v) \ 136 base_tm::f (type v) \
137 { \ 137 { \
141 } 141 }
142 142
143 #define DEFINE_SET_INT_FIELD_FCN(f, lo, hi) \ 143 #define DEFINE_SET_INT_FIELD_FCN(f, lo, hi) \
144 DEFINE_SET_FIELD_FCN (int, f, lo, hi) 144 DEFINE_SET_FIELD_FCN (int, f, lo, hi)
145 145
146 DEFINE_SET_INT_FIELD_FCN (usec, 0, 1000000) 146 DEFINE_SET_INT_FIELD_FCN (usec, 0, 1000000)
147 DEFINE_SET_INT_FIELD_FCN (sec, 0, 61) 147 DEFINE_SET_INT_FIELD_FCN (sec, 0, 61)
148 DEFINE_SET_INT_FIELD_FCN (min, 0, 59) 148 DEFINE_SET_INT_FIELD_FCN (min, 0, 59)
149 DEFINE_SET_INT_FIELD_FCN (hour, 0, 23) 149 DEFINE_SET_INT_FIELD_FCN (hour, 0, 23)
150 DEFINE_SET_INT_FIELD_FCN (mday, 1, 31) 150 DEFINE_SET_INT_FIELD_FCN (mday, 1, 31)
151 DEFINE_SET_INT_FIELD_FCN (mon, 0, 11) 151 DEFINE_SET_INT_FIELD_FCN (mon, 0, 11)
152 DEFINE_SET_INT_FIELD_FCN (year, std::numeric_limits<int>::min (), 152 DEFINE_SET_INT_FIELD_FCN (year, std::numeric_limits<int>::min (),
153 std::numeric_limitd<int>::max ()) 153 std::numeric_limitd<int>::max ())
154 DEFINE_SET_INT_FIELD_FCN (wday, 0, 6) 154 DEFINE_SET_INT_FIELD_FCN (wday, 0, 6)
155 DEFINE_SET_INT_FIELD_FCN (yday, 0, 365) 155 DEFINE_SET_INT_FIELD_FCN (yday, 0, 365)
156 DEFINE_SET_INT_FIELD_FCN (isdst, 0, 1) 156 DEFINE_SET_INT_FIELD_FCN (isdst, 0, 1)
157 DEFINE_SET_FIELD_FCN (long, gmtoff, -86400, 0) 157 DEFINE_SET_FIELD_FCN (long, gmtoff, -86400, 0)
158 158
159 base_tm& 159 base_tm&
160 base_tm::zone (const std::string& s) 160 base_tm::zone (const std::string& s)
161 { 161 {
162 m_zone = s; 162 m_zone = s;
163 return *this; 163 return *this;
164 } 164 }
165 165
166 #if ! defined STRFTIME_BUF_INITIAL_SIZE 166 #if ! defined STRFTIME_BUF_INITIAL_SIZE
167 # define STRFTIME_BUF_INITIAL_SIZE 128 167 # define STRFTIME_BUF_INITIAL_SIZE 128
168 #endif 168 #endif
169 169
170 std::string 170 std::string
171 base_tm::strftime (const std::string& fmt) const 171 base_tm::strftime (const std::string& fmt) const
172 { 172 {
173 std::string retval; 173 std::string retval;
174 174
175 if (! fmt.empty ()) 175 if (! fmt.empty ())
176 {
177 struct ::tm t;
178
179 t.tm_sec = m_sec;
180 t.tm_min = m_min;
181 t.tm_hour = m_hour;
182 t.tm_mday = m_mday;
183 t.tm_mon = m_mon;
184 t.tm_year = m_year;
185 t.tm_wday = m_wday;
186 t.tm_yday = m_yday;
187 t.tm_isdst = m_isdst;
188
189 #if defined (HAVE_TM_GMTOFF)
190 t.tm_gmtoff = m_gmtoff;
191 #endif
192
193 #if defined (HAVE_STRUCT_TM_TM_ZONE)
194 char *ps = strsave (m_zone.c_str ());
195 t.tm_zone = ps;
196 #endif
197
198 const char *fmt_str = fmt.c_str ();
199
200 char *buf = nullptr;
201 std::size_t bufsize = STRFTIME_BUF_INITIAL_SIZE;
202 std::size_t chars_written = 0;
203
204 while (chars_written == 0)
205 {
206 delete [] buf;
207 buf = new char [bufsize];
208 buf[0] = '\0';
209
210 chars_written
211 = octave_strftime_wrapper (buf, bufsize, fmt_str, &t);
212
213 bufsize *= 2;
214 }
215
216 #if defined (HAVE_STRUCT_TM_TM_ZONE)
217 delete [] ps;
218 #endif
219
220 retval = buf;
221
222 delete [] buf;
223 }
224
225 return retval;
226 }
227
228 void
229 base_tm::init (void *p)
230 {
231 if (! p)
232 return;
233
234 struct ::tm *t = static_cast<struct ::tm *> (p);
235
236 m_sec = t->tm_sec;
237 m_min = t->tm_min;
238 m_hour = t->tm_hour;
239 m_mday = t->tm_mday;
240 m_mon = t->tm_mon;
241 m_year = t->tm_year;
242 m_wday = t->tm_wday;
243 m_yday = t->tm_yday;
244 m_isdst = t->tm_isdst;
245
246 #if defined (HAVE_TM_GMTOFF)
247 m_gmtoff = t->tm_gmtoff;
248 #elif defined (OCTAVE_USE_WINDOWS_API)
249 TIME_ZONE_INFORMATION tzi;
250
251 GetTimeZoneInformationForYear (m_year, nullptr, &tzi);
252
253 if (m_isdst)
254 m_gmtoff = -60 * (tzi.Bias + tzi.DaylightBias);
255 else
256 m_gmtoff = -60 * (tzi.Bias + tzi.StandardBias);
257 #endif
258
259 #if defined (HAVE_STRUCT_TM_TM_ZONE)
260 if (t->tm_zone)
261 m_zone = t->tm_zone;
262 #elif defined (OCTAVE_USE_WINDOWS_API)
263 if (m_isdst)
264 m_zone = sys::u8_from_wstring (tzi.DaylightName);
265 else
266 m_zone = sys::u8_from_wstring (tzi.StandardName);
267 #elif defined (HAVE_TZNAME)
268 if (t->tm_isdst == 0 || t->tm_isdst == 1)
269 m_zone = tzname[t->tm_isdst];
270 #endif
271 }
272
273 void
274 localtime::init (const time& ot)
275 {
276 m_usec = ot.usec ();
277
278 time_t t = ot.unix_time ();
279
280 base_tm::init (std::localtime (&t));
281 }
282
283 void
284 gmtime::init (const time& ot)
285 {
286 m_usec = ot.usec ();
287
288 time_t t = ot.unix_time ();
289
290 base_tm::init (std::gmtime (&t));
291 }
292
293 void
294 strptime::init (const std::string& str, const std::string& fmt)
295 { 176 {
296 struct ::tm t; 177 struct ::tm t;
297 178
298 t.tm_sec = 0; 179 t.tm_sec = m_sec;
299 t.tm_min = 0; 180 t.tm_min = m_min;
300 t.tm_hour = 0; 181 t.tm_hour = m_hour;
301 t.tm_mday = 0; 182 t.tm_mday = m_mday;
302 t.tm_mon = -1; 183 t.tm_mon = m_mon;
303 t.tm_year = std::numeric_limits<int>::min (); 184 t.tm_year = m_year;
304 t.tm_wday = 0; 185 t.tm_wday = m_wday;
305 t.tm_yday = 0; 186 t.tm_yday = m_yday;
306 t.tm_isdst = 0; 187 t.tm_isdst = m_isdst;
307 188
308 #if defined (HAVE_TM_GMTOFF) 189 #if defined (HAVE_TM_GMTOFF)
309 t.tm_gmtoff = 0; 190 t.tm_gmtoff = m_gmtoff;
310 #endif 191 #endif
311 192
312 #if defined (HAVE_STRUCT_TM_TM_ZONE) 193 #if defined (HAVE_STRUCT_TM_TM_ZONE)
313 char *ps = strsave (""); 194 char *ps = strsave (m_zone.c_str ());
314 t.tm_zone = ps; 195 t.tm_zone = ps;
315 #endif 196 #endif
316 197
317 const char *p = str.c_str (); 198 const char *fmt_str = fmt.c_str ();
318 199
319 char *q = octave_strptime_wrapper (p, fmt.c_str (), &t); 200 char *buf = nullptr;
320 201 std::size_t bufsize = STRFTIME_BUF_INITIAL_SIZE;
321 // Fill in wday and yday, but only if mday is valid and the mon and year 202 std::size_t chars_written = 0;
322 // are filled in, avoiding issues with mktime and invalid dates. 203
323 if (t.tm_mday != 0 && t.tm_mon >= 0 204 while (chars_written == 0)
324 && t.tm_year != std::numeric_limits<int>::min ())
325 { 205 {
326 t.tm_isdst = -1; 206 delete [] buf;
327 octave_mktime_wrapper (&t); 207 buf = new char [bufsize];
208 buf[0] = '\0';
209
210 chars_written
211 = octave_strftime_wrapper (buf, bufsize, fmt_str, &t);
212
213 bufsize *= 2;
328 } 214 }
329 215
330 if (t.tm_mon < 0)
331 t.tm_mon = 0;
332
333 if (t.tm_year == std::numeric_limits<int>::min ())
334 t.tm_year = 0;
335
336 if (q)
337 m_nchars = q - p + 1;
338 else
339 m_nchars = 0;
340
341 base_tm::init (&t);
342
343 #if defined (HAVE_STRUCT_TM_TM_ZONE) 216 #if defined (HAVE_STRUCT_TM_TM_ZONE)
344 delete [] ps; 217 delete [] ps;
345 #endif 218 #endif
219
220 retval = buf;
221
222 delete [] buf;
346 } 223 }
347 224
348 void 225 return retval;
349 cpu_time::stamp (void) 226 }
227
228 void
229 base_tm::init (void *p)
230 {
231 if (! p)
232 return;
233
234 struct ::tm *t = static_cast<struct ::tm *> (p);
235
236 m_sec = t->tm_sec;
237 m_min = t->tm_min;
238 m_hour = t->tm_hour;
239 m_mday = t->tm_mday;
240 m_mon = t->tm_mon;
241 m_year = t->tm_year;
242 m_wday = t->tm_wday;
243 m_yday = t->tm_yday;
244 m_isdst = t->tm_isdst;
245
246 #if defined (HAVE_TM_GMTOFF)
247 m_gmtoff = t->tm_gmtoff;
248 #elif defined (OCTAVE_USE_WINDOWS_API)
249 TIME_ZONE_INFORMATION tzi;
250
251 GetTimeZoneInformationForYear (m_year, nullptr, &tzi);
252
253 if (m_isdst)
254 m_gmtoff = -60 * (tzi.Bias + tzi.DaylightBias);
255 else
256 m_gmtoff = -60 * (tzi.Bias + tzi.StandardBias);
257 #endif
258
259 #if defined (HAVE_STRUCT_TM_TM_ZONE)
260 if (t->tm_zone)
261 m_zone = t->tm_zone;
262 #elif defined (OCTAVE_USE_WINDOWS_API)
263 if (m_isdst)
264 m_zone = sys::u8_from_wstring (tzi.DaylightName);
265 else
266 m_zone = sys::u8_from_wstring (tzi.StandardName);
267 #elif defined (HAVE_TZNAME)
268 if (t->tm_isdst == 0 || t->tm_isdst == 1)
269 m_zone = tzname[t->tm_isdst];
270 #endif
271 }
272
273 void
274 localtime::init (const time& ot)
275 {
276 m_usec = ot.usec ();
277
278 time_t t = ot.unix_time ();
279
280 base_tm::init (std::localtime (&t));
281 }
282
283 void
284 gmtime::init (const time& ot)
285 {
286 m_usec = ot.usec ();
287
288 time_t t = ot.unix_time ();
289
290 base_tm::init (std::gmtime (&t));
291 }
292
293 void
294 strptime::init (const std::string& str, const std::string& fmt)
295 {
296 struct ::tm t;
297
298 t.tm_sec = 0;
299 t.tm_min = 0;
300 t.tm_hour = 0;
301 t.tm_mday = 0;
302 t.tm_mon = -1;
303 t.tm_year = std::numeric_limits<int>::min ();
304 t.tm_wday = 0;
305 t.tm_yday = 0;
306 t.tm_isdst = 0;
307
308 #if defined (HAVE_TM_GMTOFF)
309 t.tm_gmtoff = 0;
310 #endif
311
312 #if defined (HAVE_STRUCT_TM_TM_ZONE)
313 char *ps = strsave ("");
314 t.tm_zone = ps;
315 #endif
316
317 const char *p = str.c_str ();
318
319 char *q = octave_strptime_wrapper (p, fmt.c_str (), &t);
320
321 // Fill in wday and yday, but only if mday is valid and the mon and year
322 // are filled in, avoiding issues with mktime and invalid dates.
323 if (t.tm_mday != 0 && t.tm_mon >= 0
324 && t.tm_year != std::numeric_limits<int>::min ())
350 { 325 {
351 time_t usr_sec, sys_sec; 326 t.tm_isdst = -1;
352 octave_cpu_time (&usr_sec, &sys_sec, &m_usr_usec, &m_sys_usec); 327 octave_mktime_wrapper (&t);
353 m_usr_sec = usr_sec;
354 m_sys_sec = sys_sec;
355 } 328 }
356 329
357 void 330 if (t.tm_mon < 0)
358 resource_usage::stamp (void) 331 t.tm_mon = 0;
359 { 332
360 time_t usr_sec, sys_sec; 333 if (t.tm_year == std::numeric_limits<int>::min ())
361 long usr_usec, sys_usec; 334 t.tm_year = 0;
362 335
363 octave_getrusage_wrapper (&usr_sec, &sys_sec, &usr_usec, 336 if (q)
364 &sys_usec, &m_maxrss, &m_ixrss, 337 m_nchars = q - p + 1;
365 &m_idrss, &m_isrss, &m_minflt, 338 else
366 &m_majflt, &m_nswap, &m_inblock, 339 m_nchars = 0;
367 &m_oublock, &m_msgsnd, &m_msgrcv, 340
368 &m_nsignals, &m_nvcsw, &m_nivcsw); 341 base_tm::init (&t);
369 342
370 m_cpu = cpu_time (usr_sec, sys_sec, usr_usec, sys_usec); 343 #if defined (HAVE_STRUCT_TM_TM_ZONE)
371 } 344 delete [] ps;
345 #endif
346 }
347
348 void
349 cpu_time::stamp (void)
350 {
351 time_t usr_sec, sys_sec;
352 octave_cpu_time (&usr_sec, &sys_sec, &m_usr_usec, &m_sys_usec);
353 m_usr_sec = usr_sec;
354 m_sys_sec = sys_sec;
355 }
356
357 void
358 resource_usage::stamp (void)
359 {
360 time_t usr_sec, sys_sec;
361 long usr_usec, sys_usec;
362
363 octave_getrusage_wrapper (&usr_sec, &sys_sec, &usr_usec,
364 &sys_usec, &m_maxrss, &m_ixrss,
365 &m_idrss, &m_isrss, &m_minflt,
366 &m_majflt, &m_nswap, &m_inblock,
367 &m_oublock, &m_msgsnd, &m_msgrcv,
368 &m_nsignals, &m_nvcsw, &m_nivcsw);
369
370 m_cpu = cpu_time (usr_sec, sys_sec, usr_usec, sys_usec);
371 }
372 372
373 OCTAVE_END_NAMESPACE(sys) 373 OCTAVE_END_NAMESPACE(sys)
374 OCTAVE_END_NAMESPACE(octave) 374 OCTAVE_END_NAMESPACE(octave)