3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuchsia: Avoid uname() in system snapshot

Browse Source 
uname() seems to hang, sometimes, perhaps when then network is in a bad
state. Additionally, this way allows getting a minimal amount of version
information via zx_system_get_version().

Bug: crashpad:196
Change-Id: I2c040ee38ae017a6e8e060de10039bae6d159058
Reviewed-on: https://chromium-review.googlesource.com/1007979
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Scott Graham 2018-04-11 13:41:11 -07:00 committed by Commit Bot
parent d9bf38f39c
commit 856339b2d2
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
snapshot/fuchsia/system_snapshot_fuchsia.cc
View File

@ -14,9 +14,9 @@
#include "snapshot/fuchsia/system_snapshot_fuchsia.h"
#include <sys/utsname.h>
#include <zircon/syscalls.h>
#include "base/fuchsia/fuchsia_logging.h"
#include "base/logging.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/stringprintf.h"
@ -34,17 +34,24 @@ void SystemSnapshotFuchsia::Initialize(const timeval* snapshot_time) {
snapshot_time_ = snapshot_time;
std::string uname_string;
utsname uts;
if (uname(&uts) != 0) {
PLOG(WARNING) << "uname";
} else {
uname_string = base::StringPrintf("%s %s", uts.sysname, uts.machine);
}
// This version string mirrors `uname -a` as written by
// garnet/bin/uname/uname.c, however, this information isn't provided by
// uname(). Additionally, uname() seems to hang if the network is in a bad
// state when attempting to retrieve the nodename, so avoid it for now.
char kernel_version[256] = {};
zx_status_t status =
zx_system_get_version(kernel_version, sizeof(kernel_version));
ZX_LOG_IF(ERROR, status != ZX_OK, status) << "zx_system_get_version";
// TODO(scottmg): There's no version available to be reported yet.
os_version_full_ = uname_string;
#if defined(ARCH_CPU_X86_64)
static constexpr const char kArch[] = "x86_64";
#elif defined(ARCH_CPU_ARM64)
static constexpr const char kArch[] = "aarch64";
#else
static constexpr const char kArch[] = "unknown";
#endif
os_version_full_ =
base::StringPrintf("Zircon prerelease %s %s", kernel_version, kArch);
INITIALIZATION_STATE_SET_VALID(initialized_);
}