Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. | 3 * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| 11 * notice, this list of conditions and the following disclaimer in the | 11 * notice, this list of conditions and the following disclaimer in the |
| 12 * documentation and/or other materials provided with the distribution. | 12 * documentation and/or other materials provided with the distribution. |
| 13 * | 13 * |
| 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "platform/SharedBuffer.h" | 28 #include "platform/SharedBuffer.h" |
| 29 | 29 |
| 30 #include "public/platform/WebProcessMemoryDump.h" | |
| 30 #include "wtf/text/UTF8.h" | 31 #include "wtf/text/UTF8.h" |
| 31 #include "wtf/text/Unicode.h" | 32 #include "wtf/text/Unicode.h" |
| 32 | 33 |
| 33 #undef SHARED_BUFFER_STATS | 34 #undef SHARED_BUFFER_STATS |
| 34 | 35 |
| 35 #ifdef SHARED_BUFFER_STATS | 36 #ifdef SHARED_BUFFER_STATS |
| 36 #include "public/platform/Platform.h" | 37 #include "public/platform/Platform.h" |
| 37 #include "public/platform/WebTraceLocation.h" | 38 #include "public/platform/WebTraceLocation.h" |
| 38 #include "wtf/DataLog.h" | 39 #include "wtf/DataLog.h" |
| 39 #endif | 40 #endif |
| (...skipping 363 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 403 { | 404 { |
| 404 mergeSegmentsIntoBuffer(); | 405 mergeSegmentsIntoBuffer(); |
| 405 m_buffer.unlock(); | 406 m_buffer.unlock(); |
| 406 } | 407 } |
| 407 | 408 |
| 408 bool SharedBuffer::isLocked() const | 409 bool SharedBuffer::isLocked() const |
| 409 { | 410 { |
| 410 return m_buffer.isLocked(); | 411 return m_buffer.isLocked(); |
| 411 } | 412 } |
| 412 | 413 |
| 414 void SharedBuffer::onMemoryDump(const String& dumpPrefix, WebProcessMemoryDump* memoryDump) const | |
| 415 { | |
| 416 m_buffer.onMemoryDump(dumpPrefix + "/buffer", memoryDump); | |
|
haraken
2015/09/28 14:54:02
/buffer => /shared_buffer
ssid
2015/09/28 16:24:39
Done.
| |
| 417 | |
| 418 if (m_size - m_buffer.size() > 0) { | |
|
haraken
2015/09/28 14:54:02
Wouldn't it be enough to check:
if (!m_buffer.s
ssid
2015/09/28 16:24:39
I was wondering that both can be used at the same
haraken
2015/09/29 02:44:48
Shall we add an ASSERT about it?
| |
| 419 // If there is data in the segments, then it should have been allocated | |
| 420 // using fastMalloc. | |
| 421 const String dataDumpName = dumpPrefix + "/data"; | |
|
haraken
2015/09/28 14:54:02
/data => /segments
ssid
2015/09/28 16:24:38
Done.
| |
| 422 auto dump = memoryDump->createMemoryAllocatorDump(dataDumpName); | |
| 423 dump->AddScalar("size", "bytes", m_size - m_buffer.size()); | |
|
haraken
2015/09/28 14:54:02
At this point, I think m_buffer.size() is guarante
ssid
2015/09/28 16:24:39
Yeah I was just paranoid..
| |
| 424 memoryDump->AddSuballocation(dump->guid(), "malloc/allocated_objects"); | |
| 425 } | |
| 426 } | |
| 427 | |
| 413 } // namespace blink | 428 } // namespace blink |
| OLD | NEW |