mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
085494b95d
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:
# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type
function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
! -wholename "*security/nss*" \
! -wholename "*/.hg*" \
! -wholename "obj-ff-dbg*" \
! -name nsXPCOMCID.h \
! -name prtypes.h \
-type f \
\( -iname "*.cpp" \
-o -iname "*.h" \
-o -iname "*.cc" \
-o -iname "*.mm" \) | \
xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}
convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
modules/libmar/src/mar_private.h \
modules/libmar/src/mar.h
# assert_replacer.py
#!/usr/bin/python
import sys
import re
pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")
def replaceInPlace(fname):
print fname
f = open(fname, "rw+")
lines = f.readlines()
for i in range(0, len(lines)):
while True:
index = re.search(pattern, lines[i])
if index != None:
index = index.start()
lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
for j in range(i + 1, len(lines)):
if lines[j].find(" ", index) == index:
lines[j] = lines[j][0:index] + lines[j][index+4:]
else:
break
else:
break
f.seek(0, 0)
f.truncate()
f.write("".join(lines))
f.close()
argc = len(sys.argv)
for i in range(1, argc):
replaceInPlace(sys.argv[i])
--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
58 lines
1.7 KiB
C++
58 lines
1.7 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/. */
|
|
|
|
#if defined(XP_WIN) || defined(XP_OS2)
|
|
# define MOZALLOC_EXPORT __declspec(dllexport)
|
|
#endif
|
|
|
|
#include "mozilla/mozalloc_abort.h"
|
|
#include "mozilla/mozalloc_oom.h"
|
|
#include "mozilla/Assertions.h"
|
|
|
|
static mozalloc_oom_abort_handler gAbortHandler;
|
|
|
|
#define OOM_MSG_LEADER "out of memory: 0x"
|
|
#define OOM_MSG_DIGITS "0000000000000000" // large enough for 2^64
|
|
#define OOM_MSG_TRAILER " bytes requested"
|
|
#define OOM_MSG_FIRST_DIGIT_OFFSET sizeof(OOM_MSG_LEADER) - 1
|
|
#define OOM_MSG_LAST_DIGIT_OFFSET sizeof(OOM_MSG_LEADER) + \
|
|
sizeof(OOM_MSG_DIGITS) - 3
|
|
|
|
static const char *hex = "0123456789ABCDEF";
|
|
|
|
void
|
|
mozalloc_handle_oom(size_t size)
|
|
{
|
|
char oomMsg[] = OOM_MSG_LEADER OOM_MSG_DIGITS OOM_MSG_TRAILER;
|
|
size_t i;
|
|
|
|
// NB: this is handle_oom() stage 1, which simply aborts on OOM.
|
|
// we might proceed to a stage 2 in which an attempt is made to
|
|
// reclaim memory
|
|
|
|
if (gAbortHandler)
|
|
gAbortHandler(size);
|
|
|
|
static_assert(OOM_MSG_FIRST_DIGIT_OFFSET > 0,
|
|
"Loop below will never terminate (i can't go below 0)");
|
|
|
|
// Insert size into the diagnostic message using only primitive operations
|
|
for (i = OOM_MSG_LAST_DIGIT_OFFSET;
|
|
size && i >= OOM_MSG_FIRST_DIGIT_OFFSET; i--) {
|
|
oomMsg[i] = hex[size % 16];
|
|
size /= 16;
|
|
}
|
|
|
|
mozalloc_abort(oomMsg);
|
|
}
|
|
|
|
void
|
|
mozalloc_set_oom_abort_handler(mozalloc_oom_abort_handler handler)
|
|
{
|
|
gAbortHandler = handler;
|
|
}
|