mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
850741b596
- Bug 1189709 - Reduce scope of MessageChannel window neutering. r=jimm (a73623101e) - Bug 1202051 - Use a PersistentRooted to automate tracing of unwrappedException_; r=sfink (32964b4bcb) - missing part of Bug 1135236 - Remove unused print callbacks in profiler backend. (a6427e4a23) - Bug 1164785 - Append line number to systrace scopedTrace object name. r=BenWa (be4fb076b0) - missing parts of Bug 779291: Implement SPS stackwalk (fefa7c961c) - Bug 1186709 - Remove MOZ_IMPLICIT from security/sandbox/chromium. r=bobowen (7c1419cd3a) - Bug 1274253. Properly test the cpuid bits. (039f594ab3) - Bug 1168291 - Install mozcrt.lib instead of mozglue.lib in the SDK. r=mshal (00d4309281) - Bug 1198334 (follow-up) - Fix SM(e) bustage (which doesn't show up on try pushes, grr). r=bustage. (4431457ede) - Bug 1194560 - Add tools/power/rapl, a RAPL-reading program for power rofiling. r=erahm,glandium. (47b61fd39c) - Bug 1147243 - Build memory/jemalloc in unified mode; r=glandium (81173f8bc2) - Bug 1201738 - Update jemalloc4 to 594c759 + two pending patches. r=njn (66f4f3fe49) - Bug 1135583: Prevent the inclusion of Char16.h in VS2015's fallible.obj. r=glandium (3e5ac84efb) - bug 1171122 - Swap some XP_MACOSX for XP_DARWIN in mozalloc. r=glandium (6d03543291) - Bug 1170177 - Disable our own abort() method with MOZ_ASAN. r=froydnj (cdc43fcb8c) - Bug 1120793 - Remove obsolete _Throw wrapping. r=froydnj (a5c53780ec) - Bug 1189967 - Avoid conflicting declarations for our raise wrappers on Windows. r=nfroyd (e0a606ef14) - Bug 1203476 - Fix an Android-only warning in mozalloc_abort.cpp. r=glandium. (806b791d54) - pointer style (97a2b4ffea) - Bug 1147353 - Odin: simplify the masked index bounds check test. r=sfink, r=luke (fa6007c8dd)
204 lines
4.5 KiB
C++
204 lines
4.5 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
* vim: sw=4 ts=4 et :
|
|
*/
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include <errno.h>
|
|
#include <new> // for std::bad_alloc
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#if defined(MALLOC_H)
|
|
# include MALLOC_H // for memalign, valloc, malloc_size, malloc_usable_size
|
|
#endif // if defined(MALLOC_H)
|
|
#include <stddef.h> // for size_t
|
|
#include <stdlib.h> // for malloc, free
|
|
#if defined(XP_UNIX)
|
|
# include <unistd.h> // for valloc on *BSD
|
|
#endif //if defined(XP_UNIX)
|
|
|
|
#if defined(XP_WIN)
|
|
# define MOZALLOC_EXPORT __declspec(dllexport)
|
|
#endif
|
|
|
|
#include "mozilla/mozalloc.h"
|
|
#include "mozilla/mozalloc_oom.h" // for mozalloc_handle_oom
|
|
|
|
/* Windows doesn't have malloc_usable_size, but jemalloc has */
|
|
#if defined(MOZ_MEMORY_WINDOWS)
|
|
extern "C" size_t malloc_usable_size(const void *ptr);
|
|
#endif
|
|
|
|
#ifdef __GNUC__
|
|
#define LIKELY(x) (__builtin_expect(!!(x), 1))
|
|
#define UNLIKELY(x) (__builtin_expect(!!(x), 0))
|
|
#else
|
|
#define LIKELY(x) (x)
|
|
#define UNLIKELY(x) (x)
|
|
#endif
|
|
|
|
void
|
|
moz_free(void* ptr)
|
|
{
|
|
free(ptr);
|
|
}
|
|
|
|
void*
|
|
moz_xmalloc(size_t size)
|
|
{
|
|
void* ptr = malloc(size);
|
|
if (UNLIKELY(!ptr && size)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xmalloc(size);
|
|
}
|
|
return ptr;
|
|
}
|
|
void*
|
|
moz_malloc(size_t size)
|
|
{
|
|
return malloc(size);
|
|
}
|
|
|
|
void*
|
|
moz_xcalloc(size_t nmemb, size_t size)
|
|
{
|
|
void* ptr = calloc(nmemb, size);
|
|
if (UNLIKELY(!ptr && nmemb && size)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xcalloc(nmemb, size);
|
|
}
|
|
return ptr;
|
|
}
|
|
void*
|
|
moz_calloc(size_t nmemb, size_t size)
|
|
{
|
|
return calloc(nmemb, size);
|
|
}
|
|
|
|
void*
|
|
moz_xrealloc(void* ptr, size_t size)
|
|
{
|
|
void* newptr = realloc(ptr, size);
|
|
if (UNLIKELY(!newptr && size)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xrealloc(ptr, size);
|
|
}
|
|
return newptr;
|
|
}
|
|
void*
|
|
moz_realloc(void* ptr, size_t size)
|
|
{
|
|
return realloc(ptr, size);
|
|
}
|
|
|
|
char*
|
|
moz_xstrdup(const char* str)
|
|
{
|
|
char* dup = strdup(str);
|
|
if (UNLIKELY(!dup)) {
|
|
mozalloc_handle_oom(0);
|
|
return moz_xstrdup(str);
|
|
}
|
|
return dup;
|
|
}
|
|
|
|
#if defined(HAVE_STRNDUP)
|
|
char*
|
|
moz_xstrndup(const char* str, size_t strsize)
|
|
{
|
|
char* dup = strndup(str, strsize);
|
|
if (UNLIKELY(!dup)) {
|
|
mozalloc_handle_oom(strsize);
|
|
return moz_xstrndup(str, strsize);
|
|
}
|
|
return dup;
|
|
}
|
|
#endif // if defined(HAVE_STRNDUP)
|
|
|
|
#if defined(HAVE_POSIX_MEMALIGN)
|
|
int
|
|
moz_xposix_memalign(void **ptr, size_t alignment, size_t size)
|
|
{
|
|
int err = posix_memalign(ptr, alignment, size);
|
|
if (UNLIKELY(err && ENOMEM == err)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xposix_memalign(ptr, alignment, size);
|
|
}
|
|
// else: (0 == err) or (EINVAL == err)
|
|
return err;
|
|
}
|
|
int
|
|
moz_posix_memalign(void **ptr, size_t alignment, size_t size)
|
|
{
|
|
int code = posix_memalign(ptr, alignment, size);
|
|
if (code)
|
|
return code;
|
|
|
|
#if defined(XP_DARWIN)
|
|
// Workaround faulty OSX posix_memalign, which provides memory with the
|
|
// incorrect alignment sometimes, but returns 0 as if nothing was wrong.
|
|
size_t mask = alignment - 1;
|
|
if (((size_t)(*ptr) & mask) != 0) {
|
|
void* old = *ptr;
|
|
code = moz_posix_memalign(ptr, alignment, size);
|
|
free(old);
|
|
}
|
|
#endif
|
|
|
|
return code;
|
|
|
|
}
|
|
#endif // if defined(HAVE_POSIX_MEMALIGN)
|
|
|
|
#if defined(HAVE_MEMALIGN)
|
|
void*
|
|
moz_xmemalign(size_t boundary, size_t size)
|
|
{
|
|
void* ptr = memalign(boundary, size);
|
|
if (UNLIKELY(!ptr && EINVAL != errno)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xmemalign(boundary, size);
|
|
}
|
|
// non-NULL ptr or errno == EINVAL
|
|
return ptr;
|
|
}
|
|
#endif // if defined(HAVE_MEMALIGN)
|
|
|
|
#if defined(HAVE_VALLOC)
|
|
void*
|
|
moz_xvalloc(size_t size)
|
|
{
|
|
void* ptr = valloc(size);
|
|
if (UNLIKELY(!ptr)) {
|
|
mozalloc_handle_oom(size);
|
|
return moz_xvalloc(size);
|
|
}
|
|
return ptr;
|
|
}
|
|
#endif // if defined(HAVE_VALLOC)
|
|
|
|
size_t
|
|
moz_malloc_usable_size(void *ptr)
|
|
{
|
|
if (!ptr)
|
|
return 0;
|
|
|
|
#if defined(XP_DARWIN)
|
|
return malloc_size(ptr);
|
|
#elif defined(HAVE_MALLOC_USABLE_SIZE) || defined(MOZ_MEMORY)
|
|
return malloc_usable_size(ptr);
|
|
#elif defined(XP_WIN)
|
|
return _msize(ptr);
|
|
#else
|
|
return 0;
|
|
#endif
|
|
}
|
|
|
|
size_t moz_malloc_size_of(const void *ptr)
|
|
{
|
|
return moz_malloc_usable_size((void *)ptr);
|
|
}
|