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

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: More comments! Created 8 years, 4 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
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.
26 #elif defined(OS_ANDROID) || defined(OS_NACL)
27 ptr = memalign(alignment, size);
28 #else
29 if (posix_memalign(&ptr, alignment, size))
30 ptr = NULL;
31 #endif
32 // Since aligned allocations may fail for non-memory related reasons, force a
33 // crash if we encounter a failed allocation; maintaining consistent behavior
34 // with a normal allocation failure in Chrome.
35 if (!ptr) {
36 // Instead of CHECK(ptr) << msg, avoid binary bloat by moving msg into DLOG.
willchan no longer on Chromium 2012/07/23 20:37:18 No need for this comment. It's just a general prin
DaleCurtis 2012/07/23 21:15:04 Done.
37 DLOG(ERROR) << "If you crashed here, your aligned allocation is incorrect: "
38 << "size=" << size << ", alignment=" << alignment;
willchan no longer on Chromium 2012/07/23 20:37:18 << should line up with previous line, as per Googl
DaleCurtis 2012/07/23 21:15:04 Done.
39 CHECK(false);
40 }
41 // Sanity check alignment just to be safe.
42 DCHECK_EQ(reinterpret_cast<uintptr_t>(ptr) & (alignment - 1), 0U);
43 return ptr;
44 }
45
46 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698