Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Unified Diff: runtime/vm/os_macos.cc

Issue 9969098: Set the TZ env to get the UTC-ms since epoch. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove spurious comment and unify win-code with other platforms. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/os_macos.cc
diff --git a/runtime/vm/os_macos.cc b/runtime/vm/os_macos.cc
index e6107650d00cec279b45ca5bdf231d49aa18e632..62c0b7bd751a3eb334faf650d65c518a9389aea5 100644
--- a/runtime/vm/os_macos.cc
+++ b/runtime/vm/os_macos.cc
@@ -15,6 +15,7 @@
#include "platform/utils.h"
#include "vm/isolate.h"
+#include "vm/thread.h"
Ivan Posva 2012/04/11 12:01:24 ditto
floitsch 2012/04/11 12:10:21 Done.
namespace dart {
@@ -26,9 +27,6 @@ bool OS::BreakDownSecondsSinceEpoch(time_t seconds_since_epoch,
if (in_utc) {
error_code = gmtime_r(&seconds_since_epoch, &tm_result);
} else {
- // TODO(floitsch): we should be able to call tzset only once during
- // initialization.
- tzset(); // Make sure the libc knows about the local zone.
error_code = localtime_r(&seconds_since_epoch, &tm_result);
}
result->year = tm_result.tm_year;
@@ -41,6 +39,14 @@ bool OS::BreakDownSecondsSinceEpoch(time_t seconds_since_epoch,
}
+// TODO(floitsch): cache utc offset.
+static int UtcOffsetInSeconds(time_t seconds_since_epoch) {
+ struct tm t;
+ struct tm* error_code = localtime_r(&seconds_since_epoch, &t);
+ ASSERT(error_code != NULL);
+ return t.tm_gmtoff;
+}
+
bool OS::BrokenDownToSecondsSinceEpoch(
const BrokenDownDate& broken_down, bool in_utc, time_t* result) {
struct tm tm_broken_down;
@@ -54,27 +60,18 @@ bool OS::BrokenDownToSecondsSinceEpoch(
// Set wday to an impossible day, so that we can catch bad input.
tm_broken_down.tm_wday = -1;
// Make sure the libc knows about the local zone.
- // In case of 'in_utc' this call is mainly for multi-threading issues. If
- // another thread uses a time-function it will set the timezone. The timezone
- // adjustement below would then not work anymore.
// TODO(floitsch): we should be able to call tzset only once during
// initialization.
tzset();
- if (in_utc) {
- // Disable daylight saving in utc mode.
- tm_broken_down.tm_isdst = 0;
- // mktime assumes that the given date is local time zone.
- *result = mktime(&tm_broken_down);
- // Remove the timezone.
- *result -= timezone;
- } else {
- // Let libc figure out if daylight saving is active.
- tm_broken_down.tm_isdst = -1;
- *result = mktime(&tm_broken_down);
- }
+ // Let libc figure out if daylight saving is active.
+ tm_broken_down.tm_isdst = -1;
+ *result = mktime(&tm_broken_down);
if ((*result == -1) && (tm_broken_down.tm_wday == -1)) {
return false;
}
+ if (in_utc) {
+ *result += UtcOffsetInSeconds(*result);
+ }
return true;
}

Powered by Google App Engine
This is Rietveld 408576698