janwas
a859562ea7
- properly differentiate between buffer/offset alignment and length alignment (relevant since block size has been increased to 256k) - use VfsPath for most game paths instead of CStr - clean up timer interface and implementation - self-tests no longer crash - file_cache.cpp: fix for the case where allocation fails (prevent deleter from seeing a null pointer) - allocators: move all shared_ptr-related stuff to its own component; add DummySharedPtr - codec: disable checksums (important for performance at work) - File: made into an interface class to avoid export problems. not entirely sure about this.. - vfs_path.h, path.h, os_path.h: proper fix for using fs::change_extension and similar utility functions with derivatives of basic_path - lib_api: automatically link against import lib if building lib/ as a DLL - path_util: remove unused functions (this component is deprecated) - compiler.h: add INLINE - Xeromyces.cpp: pass PIVFS so that GetXMBPath works in self-test (should do this mostly everywhere rather than have one singleton g_VFS) This was SVN commit r5537.
58 lines
915 B
C++
58 lines
915 B
C++
#include "precompiled.h"
|
|
#include "shared_ptr.h"
|
|
|
|
#include "allocators.h" // AllocatorChecker
|
|
|
|
|
|
PageAlignedDeleter::PageAlignedDeleter(size_t size)
|
|
: m_size(size)
|
|
{
|
|
debug_assert(m_size != 0);
|
|
}
|
|
|
|
void PageAlignedDeleter::operator()(u8* p)
|
|
{
|
|
debug_assert(m_size != 0);
|
|
page_aligned_free(p, m_size);
|
|
m_size = 0;
|
|
}
|
|
|
|
|
|
#ifndef NDEBUG
|
|
static AllocatorChecker s_allocatorChecker;
|
|
#endif
|
|
|
|
class CheckedDeleter
|
|
{
|
|
public:
|
|
CheckedDeleter(size_t size)
|
|
: m_size(size)
|
|
{
|
|
}
|
|
|
|
void operator()(u8* p)
|
|
{
|
|
debug_assert(m_size != 0);
|
|
#ifndef NDEBUG
|
|
s_allocatorChecker.OnDeallocate(p, m_size);
|
|
#endif
|
|
delete[] p;
|
|
m_size = 0;
|
|
}
|
|
|
|
private:
|
|
size_t m_size;
|
|
};
|
|
|
|
shared_ptr<u8> Allocate(size_t size)
|
|
{
|
|
debug_assert(size != 0);
|
|
|
|
u8* p = new u8[size];
|
|
#ifndef NDEBUG
|
|
s_allocatorChecker.OnAllocate(p, size);
|
|
#endif
|
|
|
|
return shared_ptr<u8>(p, CheckedDeleter(size));
|
|
}
|