Todd Nowacki
6d8999b7c1
Some simple changes for HPHP to help make it clang friendly ---hphp/compiler/package.cpp ---hphp/compiler/package.h ---hphp/runtime/ext/ext_curl.cpp ---hphp/runtime/ext/pdo_mysql.cpp ---hphp/tools/tc-print/offline-x86-code.h ---hphp/util/async_func.cpp ---hphp/util/async_func.h ---hphp/util/compression.cpp ---hphp/util/compression.h ---hphp/util/db_conn.cpp ---hphp/util/db_conn.h Deleted unused private fields ~~~hphp/compiler/analysis/symbol_table.h Static assert had to be outside the union +++hphp/runtime/TARGETS Added clang specific flag to supress unneded declaration warning ~~~hphp/runtime/base/datatype.h Use of logical '&&' with constant operand. Added !=0 to remove warning, ~~~hphp/runtime/base/string_data.h Static fields cannot be declared in an anonymous struct/union ~~~hphp/runtime/ext/bcmath/TARGETS Moved gcc specific flag from preprocessor_flags to compiler_specific_flags ~---hphp/runtime/ext/pdo_mysql.cpp Removed unnecessary self asignment for row_count ~~~hphp/runtime/vm/bytecode.h Added default return statement ~---hphp/runtime/vm/jit/codegen.cpp spillSlotsToSize was unused ~~~hphp/runtime/vm/jit/irtranslator.cpp ~~~hphp/runtime/vm/jit/linearscan.cpp The c++ standard states default arguments shall not be specified in the parameter-declaration-clause of a lambda-declarator. ~~~hphp/runtime/vm/jit/vectortranslator-internal.h Clang had some issues determining the correct cast when these macros were used A simple '!= 0' check was added to make things explicit for clang. ~~~hphp/tools/tc-print/perf-events.h Added parens to make clang happy +++hphp/util/asm-x64.h The constexpr needed to be initialized +++hphp/util/base.h Clang also supports tr1 libraries ~~~hphp/util/bits.h Again, clang had issues with implicit casting to bool. added != 0 check ~~~hphp/util/malloc_size_class.h Ambiguous operator precedence. Added parentheses. ~~~hphp/util/thread_local.h Misspelled function
118 linhas
3.3 KiB
C++
118 linhas
3.3 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
#ifndef incl_HPHP_UTIL_MALLOC_SIZE_CLASS_H_
|
|
#define incl_HPHP_UTIL_MALLOC_SIZE_CLASS_H_
|
|
|
|
#include <boost/mpl/bool.hpp>
|
|
#include <boost/mpl/int.hpp>
|
|
|
|
#include "hphp/util/assertions.h"
|
|
|
|
namespace HPHP {
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
/*
|
|
* Define two metafunctions:
|
|
*
|
|
* - is_malloc_size_class<Size>
|
|
*
|
|
* Returns true is Size is a malloc size class, or true if we
|
|
* don't know anything about the malloc implementation and can't
|
|
* tell.
|
|
*
|
|
* - next_malloc_size_class<Size>
|
|
*
|
|
* Returns the next size class larger than or equal to Size, or
|
|
* returns Size if we don't know anything about this malloc.
|
|
*/
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef USE_JEMALLOC
|
|
|
|
template<size_t Size>
|
|
struct is_malloc_size_class
|
|
: boost::mpl::true_
|
|
{};
|
|
|
|
template<size_t Size>
|
|
struct next_malloc_size_class
|
|
: boost::mpl::int_<Size>
|
|
{};
|
|
|
|
#else
|
|
|
|
/*
|
|
* jemalloc-specific implementation.
|
|
*/
|
|
|
|
template<size_t Size>
|
|
struct is_malloc_size_class
|
|
: boost::mpl::bool_<
|
|
// Small classes:
|
|
Size == 8
|
|
|| (Size <= 128 && !(Size % 16))
|
|
|| (Size <= 256 && !(Size % 32))
|
|
|| (Size <= 512 && !(Size % 64))
|
|
|| (Size <= 1024 && !(Size % 128))
|
|
|| (Size <= 2048 && !(Size % 256))
|
|
|| (Size <= 4096 && !(Size % 512))
|
|
// Large:
|
|
|| (Size <= 4096 * 1024 && !(Size % 4096))
|
|
// Huge:
|
|
|| !(Size % (4096 * 1024))
|
|
>
|
|
{};
|
|
|
|
template<size_t Size>
|
|
class next_malloc_size_class {
|
|
template<size_t Multiple>
|
|
struct round {
|
|
static const size_t value =
|
|
!(Size % Multiple) ? Size : Size + Multiple - Size % Multiple;
|
|
};
|
|
|
|
public:
|
|
typedef typename boost::mpl::int_<
|
|
// Small classes:
|
|
Size <= 8 ? 8 :
|
|
Size <= 16 ? 16 :
|
|
Size <= 128 ? round< 16>::value :
|
|
Size <= 256 ? round< 32>::value :
|
|
Size <= 512 ? round< 64>::value :
|
|
Size <= 1024 ? round<128>::value :
|
|
Size <= 2048 ? round<256>::value :
|
|
Size <= 4096 ? round<512>::value :
|
|
// Large:
|
|
Size <= 4096 * 1024 ? round<4096>::value :
|
|
// Huge:
|
|
round<4096 * 1024>::value
|
|
>::type type;
|
|
static const size_t value = type::value;
|
|
|
|
static_assert(is_malloc_size_class<value>::value,
|
|
"Bug in malloc_size_class.h");
|
|
};
|
|
|
|
#endif
|
|
|
|
//////////////////////////////////////////////////////////////////////
|
|
|
|
}
|
|
|
|
#endif
|