Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: base/memory/aligned_memory.cc

Issue 10796020: Upgrade AlignedMemory to support dynamic allocations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change AlignedMemory back to POD. Retry now that NaCl fixed. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/memory/aligned_memory.h ('k') | base/memory/aligned_memory_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "base/memory/aligned_memory.h"
6
7 #include "base/logging.h"
8
9 #if defined(OS_ANDROID) || defined(OS_NACL)
10 #include <malloc.h>
11 #endif
12
13 namespace base {
14
15 void* AlignedAlloc(size_t size, size_t alignment) {
16 DCHECK_GT(size, 0U);
17 DCHECK_EQ(alignment & (alignment - 1), 0U);
18 DCHECK_EQ(alignment % sizeof(void*), 0U);
19 void* ptr = NULL;
20 #if defined(COMPILER_MSVC)
21 ptr = _aligned_malloc(size, alignment);
22 // Both Android and NaCl technically support posix_memalign(), but do not expose
23 // it in the current version of the library headers used by Chrome. Luckily,
24 // memalign() on both platforms returns pointers which can safely be used with
25 // free(), so we can use it instead. Issues filed with each project for docs:
26 // http://code.google.com/p/android/issues/detail?id=35391
27 // http://code.google.com/p/chromium/issues/detail?id=138579
28 #elif defined(OS_ANDROID) || defined(OS_NACL)
29 ptr = memalign(alignment, size);
30 #else
31 if (posix_memalign(&ptr, alignment, size))
32 ptr = NULL;
33 #endif
34 // Since aligned allocations may fail for non-memory related reasons, force a
35 // crash if we encounter a failed allocation; maintaining consistent behavior
36 // with a normal allocation failure in Chrome.
37 if (!ptr) {
38 DLOG(ERROR) << "If you crashed here, your aligned allocation is incorrect: "
39 << "size=" << size << ", alignment=" << alignment;
40 CHECK(false);
41 }
42 // Sanity check alignment just to be safe.
43 DCHECK_EQ(reinterpret_cast<uintptr_t>(ptr) & (alignment - 1), 0U);
44 return ptr;
45 }
46
47 } // namespace base
OLDNEW
« no previous file with comments | « base/memory/aligned_memory.h ('k') | base/memory/aligned_memory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698