Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1379878 - Use C++ templates to make _malloc_message calls cleaner. r=njn

Browse Source 
--HG--
extra : rebase_source : 695fd9ce6b1f216a8bda29b849e1372601a43fe4
This commit is contained in:
Mike Hommey 2017-07-11 14:15:04 +09:00
parent 26fb8eb7b0
commit 1ecc9df3fc
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
memory/mozjemalloc/mozjemalloc.cpp
View File

@ -1082,21 +1082,23 @@ load_acquire_z(size_t *p)
}
static void
_malloc_message(const char *p1, const char *p2, const char *p3, const char *p4)
_malloc_message(const char *p)
{
#if !defined(MOZ_MEMORY_WINDOWS)
#define _write write
#endif
// Pretend to check _write() errors to suppress gcc warnings about
// warn_unused_result annotations in some versions of glibc headers.
if (_write(STDERR_FILENO, p1, (unsigned int) strlen(p1)) < 0)
return;
if (_write(STDERR_FILENO, p2, (unsigned int) strlen(p2)) < 0)
return;
if (_write(STDERR_FILENO, p3, (unsigned int) strlen(p3)) < 0)
return;
if (_write(STDERR_FILENO, p4, (unsigned int) strlen(p4)) < 0)
return;
// Pretend to check _write() errors to suppress gcc warnings about
// warn_unused_result annotations in some versions of glibc headers.
if (_write(STDERR_FILENO, p, (unsigned int) strlen(p)) < 0)
return;
}
template <typename... Args>
static void
_malloc_message(const char *p, Args... args)
{
_malloc_message(p);
_malloc_message(args...);
}
#include "mozilla/Assertions.h"
@ -1526,7 +1528,7 @@ pages_unmap(void *addr, size_t size)
{
if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
_malloc_message(_getprogname(),
": (malloc) Error in VirtualFree()\n", "", "");
": (malloc) Error in VirtualFree()\n");
if (opt_abort)
moz_abort();
}
@ -3996,7 +3998,7 @@ arenas_fallback()
* In practice, this is an extremely unlikely failure.
*/
_malloc_message(_getprogname(),
": (malloc) Error initializing arena\n", "", "");
": (malloc) Error initializing arena\n");
if (opt_abort)
moz_abort();
@ -4338,8 +4340,7 @@ malloc_init_hard(void)
#ifdef MALLOC_STATIC_SIZES
if (pagesize % (size_t) result) {
_malloc_message(_getprogname(),
"Compile-time page size does not divide the runtime one.\n",
"", "");
"Compile-time page size does not divide the runtime one.\n");
moz_abort();
}
#else