summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:12:58 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 00:12:58 +0000
commit54fd1d3ac91d117719f157fad3ead41518865f52 (patch)
treebe3ec12e4da55384888a13707d8eee0f05e60a07 /chrome/browser/renderer_host
parent1f758608ae7c38a580d574ec7e5061eb0bfa7ee2 (diff)
downloadchromium_src-54fd1d3ac91d117719f157fad3ead41518865f52.zip
chromium_src-54fd1d3ac91d117719f157fad3ead41518865f52.tar.gz
chromium_src-54fd1d3ac91d117719f157fad3ead41518865f52.tar.bz2
Linux: about:memory
(based on http://code.google.com/p/chromium/issues/detail?id=16251) Add about:memory support to Linux. Rather than try and copy the Windows output, we use a couple of metrics which make more sense on Linux: USS and PSS. http://codereview.chromium.org/177024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/render_sandbox_host_linux.cc4
-rw-r--r--chrome/browser/renderer_host/render_sandbox_host_linux.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.cc b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
index eeb7a98..8ea30ab 100644
--- a/chrome/browser/renderer_host/render_sandbox_host_linux.cc
+++ b/chrome/browser/renderer_host/render_sandbox_host_linux.cc
@@ -295,8 +295,8 @@ RenderSandboxHostLinux::RenderSandboxHostLinux() {
const int child_lifeline_fd = pipefds[0];
childs_lifeline_fd_ = pipefds[1];
- const pid_t child = fork();
- if (child == 0) {
+ pid_ = fork();
+ if (pid_ == 0) {
SandboxIPCProcess handler(child_lifeline_fd, browser_socket);
handler.Run();
_exit(0);
diff --git a/chrome/browser/renderer_host/render_sandbox_host_linux.h b/chrome/browser/renderer_host/render_sandbox_host_linux.h
index 43fa447..5b38b4c 100644
--- a/chrome/browser/renderer_host/render_sandbox_host_linux.h
+++ b/chrome/browser/renderer_host/render_sandbox_host_linux.h
@@ -18,6 +18,7 @@ class RenderSandboxHostLinux {
// Get the file descriptor which renderers should be given in order to signal
// crashes to the browser.
int GetRendererSocket() const { return renderer_socket_; }
+ pid_t pid() const { return pid_; }
private:
friend struct DefaultSingletonTraits<RenderSandboxHostLinux>;
@@ -27,6 +28,7 @@ class RenderSandboxHostLinux {
int renderer_socket_;
int childs_lifeline_fd_;
+ pid_t pid_;
DISALLOW_EVIL_CONSTRUCTORS(RenderSandboxHostLinux);
};