5d02a18d2f
This reverts commit 16f09f20b3.
Reason for revert: Trigger finger. Shouldn't have been merged.
Original change's description:
> [vm] Replaces fuchsia.deprecatedtimezone
>
> (prior attempt was rolled back as it caused downstream tests to time
> out. See prior attempt at: See:
> https://dart-review.googlesource.com/c/sdk/+/149206)
>
> The FIDL library fuchsia.deprecatedtimezone is going away. There are
> different and better ways to obtain the same functionality. This change
> removes the dependency on fuchsia.deprecatedtimezone from the Dart SDK.
>
> Adds inspect metrics that allow whitebox testing of the runners. Here's
> a sample `fx iquery` excerpt from a running device, showing both a dart
> and a flutter runner exposing the same OS diagnostic metrics.
>
> ```
> /hub/c/dart_jit_runner.cmx/70981/out/diagnostics:
> /hub/c/dart_jit_runner.cmx/70981/out/diagnostics#os:
> dst_status = 0
> get_profile_status = 0
> timezone_content_status = 0
> tz_data_close_status = 0
> tz_data_status = 0
> /hub/c/flutter_jit_runner.cmx/29567/out/diagnostics:
> /hub/c/flutter_jit_runner.cmx/29567/out/diagnostics#os:
> dst_status = 0
> get_profile_status = 0
> timezone_content_status = 0
> tz_data_close_status = 0
> tz_data_status = 0
> ```
>
> Under nominal operation, all of the above values should be equal to 0.
> Nonzero values indicate an error.
>
> This functionality is guarded by Fuchsia integration tests at
> //src/tests/intl.
>
> Tested:
> (compile locally for Fuchsia and deploy)
> fx test //src/tests/intl
>
> See:
> - https://github.com/dart-lang/sdk/issues/42245
> - https://github.com/dart-lang/sdk/issues/39650
>
> Fixes #39650
>
> Change-Id: I97f6e17e57000f6eec71246aee670bca65b7e1d1
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150662
> Commit-Queue: Filip Filmar <fmil@google.com>
> Reviewed-by: Martin Kustermann <kustermann@google.com>
TBR=kustermann@google.com,kaushikiska@google.com,fmil@google.com
Change-Id: I7e3f8b9724e30653ca5fccaf912e940edcbcf974
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/151861
Reviewed-by: Filip Filmar <fmil@google.com>
Commit-Queue: Filip Filmar <fmil@google.com>
372 lines
10 KiB
C++
372 lines
10 KiB
C++
// Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "vm/globals.h"
|
|
#if defined(HOST_OS_FUCHSIA)
|
|
|
|
#include "vm/os.h"
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdint.h>
|
|
|
|
#include <fuchsia/deprecatedtimezone/cpp/fidl.h>
|
|
#include <lib/inspect/cpp/inspect.h>
|
|
#include <lib/sys/cpp/component_context.h>
|
|
#include <lib/sys/cpp/service_directory.h>
|
|
#include <lib/sys/inspect/cpp/component.h>
|
|
#include <zircon/process.h>
|
|
#include <zircon/syscalls.h>
|
|
#include <zircon/syscalls/object.h>
|
|
#include <zircon/types.h>
|
|
|
|
#include "platform/assert.h"
|
|
#include "platform/utils.h"
|
|
#include "vm/zone.h"
|
|
|
|
namespace {
|
|
|
|
// The data directory containing ICU timezone data files.
|
|
static constexpr char kICUTZDataDir[] = "/config/data/tzdata/icu/44/le";
|
|
|
|
// The status codes for tzdata file open and read.
|
|
enum class TZDataStatus {
|
|
OK = 0,
|
|
// The open call for the tzdata file did not succeed.
|
|
COULD_NOT_OPEN = -1,
|
|
// The close call (after tzdata was loaded) did not succeed.
|
|
COULD_NOT_CLOSE = -2,
|
|
};
|
|
|
|
// Adds a facility for introspecting timezone data errors. Allows insight into
|
|
// the internal state of the VM even if error reporting facilities fail.
|
|
class InspectMetrics {
|
|
public:
|
|
// Does not take ownership of inspector.
|
|
explicit InspectMetrics(inspect::Inspector* inspector)
|
|
: inspector_(inspector),
|
|
root_(inspector_->GetRoot()),
|
|
metrics_(root_.CreateChild("os")),
|
|
dst_status_(metrics_.CreateInt("dst_status", 0)),
|
|
tz_data_status_(metrics_.CreateInt("tz_data_status", 0)),
|
|
tz_data_close_status_(metrics_.CreateInt("tz_data_close_status", 0)) {}
|
|
|
|
// Sets the last status code for DST offset calls.
|
|
void SetDSTOffsetStatus(zx_status_t status) {
|
|
dst_status_.Set(static_cast<int32_t>(status));
|
|
}
|
|
|
|
// Sets the return value of call to InitializeTZData, and the status of the
|
|
// reported by close() on tzdata files.
|
|
void SetInitTzData(TZDataStatus value, int32_t status) {
|
|
tz_data_status_.Set(static_cast<int32_t>(value));
|
|
tz_data_close_status_.Set(status);
|
|
}
|
|
|
|
private:
|
|
// The inspector that all metrics are being reported into.
|
|
inspect::Inspector* inspector_;
|
|
|
|
// References inspector_ state.
|
|
inspect::Node& root_;
|
|
|
|
// The OS metrics node.
|
|
inspect::Node metrics_;
|
|
|
|
// The status of the last GetTimeZoneOffset call.
|
|
inspect::IntProperty dst_status_;
|
|
|
|
// The status of the initialization.
|
|
inspect::IntProperty tz_data_status_;
|
|
|
|
// The return code for the close() call for tzdata files.
|
|
inspect::IntProperty tz_data_close_status_;
|
|
};
|
|
|
|
// Initialized on OS:Init(), deinitialized on OS::Cleanup.
|
|
std::unique_ptr<sys::ComponentInspector> component_inspector;
|
|
std::unique_ptr<InspectMetrics> metrics;
|
|
|
|
// Initializes the source of timezone data if available. Timezone data file in
|
|
// Fuchsia is at a fixed directory path. Returns true on success.
|
|
bool InitializeTZData() {
|
|
ASSERT(metrics != nullptr);
|
|
// Try opening the path to check if present. No need to verify that it is a
|
|
// directory since ICU loading will return an error if the TZ data path is
|
|
// wrong.
|
|
int fd = openat(AT_FDCWD, kICUTZDataDir, O_RDONLY);
|
|
if (fd < 0) {
|
|
metrics->SetInitTzData(TZDataStatus::COULD_NOT_OPEN, fd);
|
|
return false;
|
|
}
|
|
// 0 == Not overwriting the env var if already set.
|
|
setenv("ICU_TIMEZONE_FILES_DIR", kICUTZDataDir, 0);
|
|
int32_t close_status = close(fd);
|
|
if (close_status != 0) {
|
|
metrics->SetInitTzData(TZDataStatus::COULD_NOT_CLOSE, close_status);
|
|
return false;
|
|
}
|
|
metrics->SetInitTzData(TZDataStatus::OK, 0);
|
|
return true;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace dart {
|
|
|
|
#ifndef PRODUCT
|
|
|
|
DEFINE_FLAG(bool,
|
|
generate_perf_events_symbols,
|
|
false,
|
|
"Generate events symbols for profiling with perf");
|
|
|
|
#endif // !PRODUCT
|
|
|
|
const char* OS::Name() {
|
|
return "fuchsia";
|
|
}
|
|
|
|
intptr_t OS::ProcessId() {
|
|
return static_cast<intptr_t>(getpid());
|
|
}
|
|
|
|
// TODO(FL-98): Change this to talk to fuchsia.dart to get timezone service to
|
|
// directly get timezone.
|
|
//
|
|
// Putting this hack right now due to CP-120 as I need to remove
|
|
// component:ConnectToEnvironmentServices and this is the only thing that is
|
|
// blocking it and FL-98 will take time.
|
|
static fuchsia::deprecatedtimezone::TimezoneSyncPtr tz;
|
|
|
|
static zx_status_t GetLocalAndDstOffsetInSeconds(int64_t seconds_since_epoch,
|
|
int32_t* local_offset,
|
|
int32_t* dst_offset) {
|
|
zx_status_t status = tz->GetTimezoneOffsetMinutes(seconds_since_epoch * 1000,
|
|
local_offset, dst_offset);
|
|
metrics->SetDSTOffsetStatus(status);
|
|
if (status != ZX_OK) {
|
|
return status;
|
|
}
|
|
*local_offset *= 60;
|
|
*dst_offset *= 60;
|
|
return ZX_OK;
|
|
}
|
|
|
|
const char* OS::GetTimeZoneName(int64_t seconds_since_epoch) {
|
|
// TODO(abarth): Handle time zone changes.
|
|
static const auto* tz_name = new std::string([] {
|
|
std::string result;
|
|
tz->GetTimezoneId(&result);
|
|
return result;
|
|
}());
|
|
return tz_name->c_str();
|
|
}
|
|
|
|
int OS::GetTimeZoneOffsetInSeconds(int64_t seconds_since_epoch) {
|
|
int32_t local_offset, dst_offset;
|
|
zx_status_t status = GetLocalAndDstOffsetInSeconds(
|
|
seconds_since_epoch, &local_offset, &dst_offset);
|
|
return status == ZX_OK ? local_offset + dst_offset : 0;
|
|
}
|
|
|
|
int OS::GetLocalTimeZoneAdjustmentInSeconds() {
|
|
int32_t local_offset, dst_offset;
|
|
zx_time_t now = 0;
|
|
zx_clock_get(ZX_CLOCK_UTC, &now);
|
|
zx_status_t status = GetLocalAndDstOffsetInSeconds(
|
|
now / ZX_SEC(1), &local_offset, &dst_offset);
|
|
return status == ZX_OK ? local_offset : 0;
|
|
}
|
|
|
|
int64_t OS::GetCurrentTimeMillis() {
|
|
return GetCurrentTimeMicros() / 1000;
|
|
}
|
|
|
|
int64_t OS::GetCurrentTimeMicros() {
|
|
zx_time_t now = 0;
|
|
zx_clock_get(ZX_CLOCK_UTC, &now);
|
|
return now / kNanosecondsPerMicrosecond;
|
|
}
|
|
|
|
int64_t OS::GetCurrentMonotonicTicks() {
|
|
return zx_clock_get_monotonic();
|
|
}
|
|
|
|
int64_t OS::GetCurrentMonotonicFrequency() {
|
|
return kNanosecondsPerSecond;
|
|
}
|
|
|
|
int64_t OS::GetCurrentMonotonicMicros() {
|
|
int64_t ticks = GetCurrentMonotonicTicks();
|
|
ASSERT(GetCurrentMonotonicFrequency() == kNanosecondsPerSecond);
|
|
return ticks / kNanosecondsPerMicrosecond;
|
|
}
|
|
|
|
int64_t OS::GetCurrentThreadCPUMicros() {
|
|
zx_time_t now = 0;
|
|
zx_clock_get(ZX_CLOCK_THREAD, &now);
|
|
return now / kNanosecondsPerMicrosecond;
|
|
}
|
|
|
|
// On Fuchsia, thread timestamp values are not used in the tracing/timeline
|
|
// integration. Because of this, we try to avoid querying them, since doing so
|
|
// has both a runtime and trace buffer storage cost.
|
|
int64_t OS::GetCurrentThreadCPUMicrosForTimeline() {
|
|
return -1;
|
|
}
|
|
|
|
// TODO(5411554): May need to hoist these architecture dependent code
|
|
// into a architecture specific file e.g: os_ia32_fuchsia.cc
|
|
intptr_t OS::ActivationFrameAlignment() {
|
|
#if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64) || \
|
|
defined(TARGET_ARCH_ARM64)
|
|
const int kMinimumAlignment = 16;
|
|
#elif defined(TARGET_ARCH_ARM)
|
|
const int kMinimumAlignment = 8;
|
|
#else
|
|
#error Unsupported architecture.
|
|
#endif
|
|
intptr_t alignment = kMinimumAlignment;
|
|
// TODO(5411554): Allow overriding default stack alignment for
|
|
// testing purposes.
|
|
// Flags::DebugIsInt("stackalign", &alignment);
|
|
ASSERT(Utils::IsPowerOfTwo(alignment));
|
|
ASSERT(alignment >= kMinimumAlignment);
|
|
return alignment;
|
|
}
|
|
|
|
int OS::NumberOfAvailableProcessors() {
|
|
return sysconf(_SC_NPROCESSORS_CONF);
|
|
}
|
|
|
|
void OS::Sleep(int64_t millis) {
|
|
SleepMicros(millis * kMicrosecondsPerMillisecond);
|
|
}
|
|
|
|
void OS::SleepMicros(int64_t micros) {
|
|
zx_nanosleep(zx_deadline_after(micros * kNanosecondsPerMicrosecond));
|
|
}
|
|
|
|
void OS::DebugBreak() {
|
|
UNIMPLEMENTED();
|
|
}
|
|
|
|
DART_NOINLINE uintptr_t OS::GetProgramCounter() {
|
|
return reinterpret_cast<uintptr_t>(
|
|
__builtin_extract_return_addr(__builtin_return_address(0)));
|
|
}
|
|
|
|
void OS::Print(const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
VFPrint(stdout, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void OS::VFPrint(FILE* stream, const char* format, va_list args) {
|
|
vfprintf(stream, format, args);
|
|
fflush(stream);
|
|
}
|
|
|
|
char* OS::SCreate(Zone* zone, const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
char* buffer = VSCreate(zone, format, args);
|
|
va_end(args);
|
|
return buffer;
|
|
}
|
|
|
|
char* OS::VSCreate(Zone* zone, const char* format, va_list args) {
|
|
// Measure.
|
|
va_list measure_args;
|
|
va_copy(measure_args, args);
|
|
intptr_t len = Utils::VSNPrint(NULL, 0, format, measure_args);
|
|
va_end(measure_args);
|
|
|
|
char* buffer;
|
|
if (zone) {
|
|
buffer = zone->Alloc<char>(len + 1);
|
|
} else {
|
|
buffer = reinterpret_cast<char*>(malloc(len + 1));
|
|
}
|
|
ASSERT(buffer != NULL);
|
|
|
|
// Print.
|
|
va_list print_args;
|
|
va_copy(print_args, args);
|
|
Utils::VSNPrint(buffer, len + 1, format, print_args);
|
|
va_end(print_args);
|
|
return buffer;
|
|
}
|
|
|
|
bool OS::StringToInt64(const char* str, int64_t* value) {
|
|
ASSERT(str != NULL && strlen(str) > 0 && value != NULL);
|
|
int32_t base = 10;
|
|
char* endptr;
|
|
int i = 0;
|
|
if (str[0] == '-') {
|
|
i = 1;
|
|
} else if (str[0] == '+') {
|
|
i = 1;
|
|
}
|
|
if ((str[i] == '0') && (str[i + 1] == 'x' || str[i + 1] == 'X') &&
|
|
(str[i + 2] != '\0')) {
|
|
base = 16;
|
|
}
|
|
errno = 0;
|
|
if (base == 16) {
|
|
// Unsigned 64-bit hexadecimal integer literals are allowed but
|
|
// immediately interpreted as signed 64-bit integers.
|
|
*value = static_cast<int64_t>(strtoull(str, &endptr, base));
|
|
} else {
|
|
*value = strtoll(str, &endptr, base);
|
|
}
|
|
return ((errno == 0) && (endptr != str) && (*endptr == 0));
|
|
}
|
|
|
|
void OS::RegisterCodeObservers() {
|
|
#ifndef PRODUCT
|
|
if (FLAG_generate_perf_events_symbols) {
|
|
UNIMPLEMENTED();
|
|
}
|
|
#endif // !PRODUCT
|
|
}
|
|
|
|
void OS::PrintErr(const char* format, ...) {
|
|
va_list args;
|
|
va_start(args, format);
|
|
VFPrint(stderr, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void OS::Init() {
|
|
sys::ComponentContext* context = dart::ComponentContext();
|
|
component_inspector = std::make_unique<sys::ComponentInspector>(context);
|
|
metrics = std::make_unique<InspectMetrics>(component_inspector->inspector());
|
|
|
|
InitializeTZData();
|
|
context->svc()->Connect(tz.NewRequest());
|
|
}
|
|
|
|
void OS::Cleanup() {
|
|
metrics = nullptr;
|
|
component_inspector = nullptr;
|
|
}
|
|
|
|
void OS::PrepareToAbort() {}
|
|
|
|
void OS::Abort() {
|
|
PrepareToAbort();
|
|
abort();
|
|
}
|
|
|
|
void OS::Exit(int code) {
|
|
exit(code);
|
|
}
|
|
|
|
} // namespace dart
|
|
|
|
#endif // defined(HOST_OS_FUCHSIA)
|