diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 23:03:52 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 23:03:52 +0000 |
| commit | 14bf3a2fa08e74d89618d050bcb22871ac39be56 (patch) | |
| tree | 7c53d711ad752dd809c026ecac54b327937553d1 /ppapi | |
| parent | 6e4586069314890d4787330ab7a4d33590cba534 (diff) | |
| download | chromium_src-14bf3a2fa08e74d89618d050bcb22871ac39be56.zip chromium_src-14bf3a2fa08e74d89618d050bcb22871ac39be56.tar.gz chromium_src-14bf3a2fa08e74d89618d050bcb22871ac39be56.tar.bz2 | |
PPAPI/NaCl: Move architecture histogram to NexeLoadManager
BUG=239656
Review URL: https://codereview.chromium.org/224143003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/plugin.cc | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc index 459d9c6..b5aac6b 100644 --- a/ppapi/native_client/src/trusted/plugin/plugin.cc +++ b/ppapi/native_client/src/trusted/plugin/plugin.cc @@ -196,40 +196,6 @@ void Plugin::HistogramEnumerate(const std::string& name, uma_interface_.HistogramEnumeration(name, sample, maximum); } -void Plugin::HistogramEnumerateOsArch(const std::string& sandbox_isa) { - enum NaClOSArch { - kNaClLinux32 = 0, - kNaClLinux64, - kNaClLinuxArm, - kNaClMac32, - kNaClMac64, - kNaClMacArm, - kNaClWin32, - kNaClWin64, - kNaClWinArm, - kNaClLinuxMips, - kNaClOSArchMax - }; - - NaClOSArch os_arch = kNaClOSArchMax; -#if NACL_LINUX - os_arch = kNaClLinux32; -#elif NACL_OSX - os_arch = kNaClMac32; -#elif NACL_WINDOWS - os_arch = kNaClWin32; -#endif - - if (sandbox_isa == "x86-64") - os_arch = static_cast<NaClOSArch>(os_arch + 1); - if (sandbox_isa == "arm") - os_arch = static_cast<NaClOSArch>(os_arch + 2); - if (sandbox_isa == "mips32") - os_arch = kNaClLinuxMips; - - HistogramEnumerate("NaCl.Client.OSArch", os_arch, kNaClOSArchMax, -1); -} - void Plugin::HistogramEnumerateSelLdrLoadStatus(NaClErrorCode error_code) { HistogramEnumerate("NaCl.LoadStatus.SelLdr", error_code, NACL_ERROR_CODE_MAX, LOAD_STATUS_UNKNOWN); @@ -512,7 +478,6 @@ Plugin* Plugin::New(PP_Instance pp_instance) { // failure. Note that module loading functions will log their own errors. bool Plugin::Init(uint32_t argc, const char* argn[], const char* argv[]) { PLUGIN_PRINTF(("Plugin::Init (argc=%" NACL_PRIu32 ")\n", argc)); - HistogramEnumerateOsArch(nacl_interface_->GetSandboxArch()); init_time_ = NaClGetTimeOfDayMicroseconds(); url_util_ = pp::URLUtil_Dev::Get(); if (url_util_ == NULL) |