smith
22058efe41
Fixing various bugs all over the VM that make assumptions about RefData and TypedValue layout. Here are the assumptions fixed by this diff: offsetof(RefData, m_tv) == 0. Both JIT's assumed this in many subtle ways, by punning RefData* as TypedValue* without adding an offset. This assumption also causes RefData._count to overlap TypedValue.m_aux, which constraints TypedValue layout. offsetof(TypedValue, m_data) == 0. gen_ext_hhvm.php assumes you can cast TypedValue* to Value*; the JITs often weren't using offsetof(TypedValue, m_data) in their addressing calculations. HHIR assumed return-by-value TV's have m_data/m_type in rax/rdx, which can change when TV layout changes. offsetof(TypedValue, m_type) > 8 is an assumption baked into the pass-by-value register assignment logic in HHIR's codegen.cpp; if the type is in the low word, register assignment is swapped. sizeof(TypedValue::m_type) == 4. We used dword-sized operations in both JIT's when accessing m_type. Now, we use helper functions that are sensitive to sizeof(DataType) Configuration: DEBUG=: (opt) same layouts as trunk for RefData & TypedValue DEBUG=1: (dbg) new RefData layout (m_tv doesn't overlap RefData::_count) PACKED_TV=1, DEBUG=*: new RefData and TypedValue layout.
97 linhas
3.3 KiB
C++
97 linhas
3.3 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010- 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. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include <runtime/base/memory/smart_allocator.h>
|
|
#include <runtime/base/memory/memory_manager.h>
|
|
#include <runtime/base/resource_data.h>
|
|
#include <runtime/base/server/server_stats.h>
|
|
#include <runtime/base/runtime_option.h>
|
|
#include <util/logger.h>
|
|
#include <util/trace.h>
|
|
|
|
/*
|
|
* Enabling these will prevent us from allocating out of the free list
|
|
* and cause deallocated objects to be filled with garbage. This is
|
|
* intended for detecting data that is freed too eagerly.
|
|
*/
|
|
#if defined(SMART_ALLOCATOR_DEBUG_FREE) && !defined(DETECT_DOUBLE_FREE)
|
|
# define DETECT_DOUBLE_FREE
|
|
#endif
|
|
|
|
namespace HPHP {
|
|
|
|
TRACE_SET_MOD(smartalloc);
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// initializer
|
|
|
|
std::set<AllocatorThreadLocalInit>& GetAllocatorInitList() {
|
|
static std::set<AllocatorThreadLocalInit> allocatorInitList;
|
|
return allocatorInitList;
|
|
}
|
|
|
|
void InitAllocatorThreadLocal() {
|
|
for (std::set<AllocatorThreadLocalInit>::iterator it =
|
|
GetAllocatorInitList().begin();
|
|
it != GetAllocatorInitList().end(); it++) {
|
|
(*it)();
|
|
}
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// constructor and destructor
|
|
|
|
SmartAllocatorImpl::SmartAllocatorImpl(Name name, int itemSize)
|
|
: m_itemSize(itemSizeRoundup(itemSize)) , m_name(name) {
|
|
assert(itemSize > 0);
|
|
MemoryManager::TheMemoryManager()->add(this);
|
|
}
|
|
|
|
SmartAllocatorImpl::~SmartAllocatorImpl() {
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
static bool UNUSED is_iterable_type(SmartAllocatorImpl::Name type) {
|
|
return type == SmartAllocatorImpl::Variant ||
|
|
type == SmartAllocatorImpl::RefData ||
|
|
type == SmartAllocatorImpl::ObjectData ||
|
|
type == SmartAllocatorImpl::StringData ||
|
|
type == SmartAllocatorImpl::HphpArray;
|
|
}
|
|
|
|
SmartAllocatorImpl::Iterator::Iterator(const SmartAllocatorImpl* sa) {
|
|
assert(is_iterable_type(sa->getAllocatorType()));
|
|
next();
|
|
}
|
|
|
|
void* SmartAllocatorImpl::Iterator::current() const {
|
|
return 0;
|
|
}
|
|
|
|
void SmartAllocatorImpl::Iterator::next() {
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// ObjectAllocator classes
|
|
|
|
ObjectAllocatorBase::ObjectAllocatorBase(int itemSize)
|
|
: SmartAllocatorImpl(SmartAllocatorImpl::ObjectData, itemSize) {
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|