diff options
| author | joenotcharles <joenotcharles@chromium.org> | 2016-01-13 08:10:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 16:11:06 +0000 |
| commit | a6c026ad4efef5c628defd970615611ab2e518a0 (patch) | |
| tree | df5a1d7c9d9e0f52db085af978047462f0f79998 | |
| parent | 826fee194d0e89e159c4d97b1d0b6f1cee5815ee (diff) | |
| download | chromium_src-a6c026ad4efef5c628defd970615611ab2e518a0.zip chromium_src-a6c026ad4efef5c628defd970615611ab2e518a0.tar.gz chromium_src-a6c026ad4efef5c628defd970615611ab2e518a0.tar.bz2 | |
Add trace events to help optimize SafeBrowsing methods
BUG=576750
Review URL: https://codereview.chromium.org/1584463002
Cr-Commit-Position: refs/heads/master@{#369186}
| -rw-r--r-- | chrome/browser/renderer_host/safe_browsing_resource_throttle.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 3 | ||||
| -rw-r--r-- | components/safe_browsing_db/util.cc | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc index a425545..2247d17 100644 --- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc +++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/metrics/histogram_macros.h" +#include "base/trace_event/trace_event.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prerender/prerender_contents.h" @@ -321,6 +322,8 @@ void SafeBrowsingResourceThrottle::OnBlockingPageComplete(bool proceed) { } bool SafeBrowsingResourceThrottle::CheckUrl(const GURL& url) { + TRACE_EVENT1("SafeBrowsing", "SafeBrowsingResourceThrottle::CheckUrl", "url", + url.spec()); CHECK_EQ(state_, STATE_NONE); // To reduce aggregate latency on mobile, check only the most dangerous // resource types. diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index ecaec7b..236e9fc 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -22,6 +22,7 @@ #include "base/strings/string_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "base/trace_event/trace_event.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" @@ -371,6 +372,8 @@ void SafeBrowsingService::AddDownloadManager( void SafeBrowsingService::OnResourceRequest(const net::URLRequest* request) { #if defined(FULL_SAFE_BROWSING) + TRACE_EVENT1("SafeBrowsing", "SafeBrowsingServer::OnResourceRequest", "url", + request->url().spec()); if (off_domain_inclusion_detector_) off_domain_inclusion_detector_->OnResourceRequest(request); if (resource_request_detector_) diff --git a/components/safe_browsing_db/util.cc b/components/safe_browsing_db/util.cc index 4fe1140..7bc2a7e 100644 --- a/components/safe_browsing_db/util.cc +++ b/components/safe_browsing_db/util.cc @@ -8,6 +8,7 @@ #include "base/macros.h" #include "base/strings/string_util.h" +#include "base/trace_event/trace_event.h" #include "crypto/sha2.h" #include "net/base/escape.h" #include "url/gurl.h" @@ -302,6 +303,10 @@ void CanonicalizeUrl(const GURL& url, void UrlToFullHashes(const GURL& url, bool include_whitelist_hashes, std::vector<SBFullHash>* full_hashes) { + // Include this function in traces because it's not cheap so it should be + // called sparingly. + TRACE_EVENT2("SafeBrowsing", "UrlToFullHashes", "url", url.spec(), + "include_whitelist_hashes", include_whitelist_hashes); std::vector<std::string> hosts; if (url.HostIsIPAddress()) { hosts.push_back(url.host()); |