diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 01:31:03 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 01:31:03 +0000 |
| commit | 0d525036512529fc73287726ac65649040672f86 (patch) | |
| tree | c7228937ed591491d541b76aee909ee3090fb1db /chrome/common | |
| parent | 27f2b6626e1c0e71d8b8e5d20e017beee762d7d6 (diff) | |
| download | chromium_src-0d525036512529fc73287726ac65649040672f86.zip chromium_src-0d525036512529fc73287726ac65649040672f86.tar.gz chromium_src-0d525036512529fc73287726ac65649040672f86.tar.bz2 | |
Revert 34994, maybe it regressed startup perf - Fix cpu/memory measurements on OS X.
Right now, this only works for the current process; support for child processes will be added in a later CL.
BUG=13156,25454
TEST=Hook up task manager (connect menu item to commandDispatch:, give it the right tag). Stats for the browser process should now be right, and %cpu should be 0 (for now) for all other processes.
Review URL: http://codereview.chromium.org/500118
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/504068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/mach_ipc_mac.h | 5 | ||||
| -rw-r--r-- | chrome/common/mach_ipc_mac.mm | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/chrome/common/mach_ipc_mac.h b/chrome/common/mach_ipc_mac.h index 42b9c65..8c345dd 100644 --- a/chrome/common/mach_ipc_mac.h +++ b/chrome/common/mach_ipc_mac.h @@ -167,9 +167,8 @@ class MachMessage { bool AddDescriptor(const MachMsgPortDescriptor &desc); int GetDescriptorCount() const { - return storage_->body.msgh_descriptor_count; - } - + return storage_->body.msgh_descriptor_count; + } MachMsgPortDescriptor *GetDescriptor(int n); // Convenience method which gets the mach port described by the descriptor diff --git a/chrome/common/mach_ipc_mac.mm b/chrome/common/mach_ipc_mac.mm index 7693d9a..3c95ef6 100644 --- a/chrome/common/mach_ipc_mac.mm +++ b/chrome/common/mach_ipc_mac.mm @@ -213,10 +213,10 @@ ReceivePort::ReceivePort() { if (init_result_ != KERN_SUCCESS) return; - init_result_ = mach_port_insert_right(current_task, - port_, - port_, - MACH_MSG_TYPE_MAKE_SEND); + init_result_ = mach_port_insert_right(current_task, + port_, + port_, + MACH_MSG_TYPE_MAKE_SEND); } //============================================================================== |