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

Bug 1303275 - Fix ShmemPool code to resolve 'not declared' compiler error. r=gcp

Browse Source 
--HG--
extra : amend_source : 7fde47fe1c2f25069f85904df7b06774129acc4b
This commit is contained in:
Julian Hector 2016-09-16 06:44:00 -04:00
parent 5bb5c52b40
commit 4946f018b4
2 changed files with 73 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
dom/media/systemservices/ShmemPool.cpp
View File

@ -9,12 +9,6 @@
#include "mozilla/ShmemPool.h"
#include "mozilla/Move.h"
#undef LOG
#undef LOG_ENABLED
extern mozilla::LazyLogModule gCamerasParentLog;
#define LOG(args) MOZ_LOG(gCamerasParentLog, mozilla::LogLevel::Debug, args)
#define LOG_ENABLED() MOZ_LOG_TEST(gCamerasParentLog, mozilla::LogLevel::Debug)
namespace mozilla {
ShmemPool::ShmemPool(size_t aPoolSize)
@ -62,58 +56,6 @@ mozilla::ShmemBuffer ShmemPool::GetIfAvailable(size_t aSize)
return Move(res);
}
template <class T>
mozilla::ShmemBuffer ShmemPool::Get(T* aInstance, size_t aSize)
{
MutexAutoLock lock(mMutex);
// Pool is empty, don't block caller.
if (mPoolFree == 0) {
// This isn't initialized, so will be understood as an error.
return ShmemBuffer();
}
ShmemBuffer& res = mShmemPool[mPoolFree - 1];
if (!res.mInitialized) {
LOG(("Initializing new Shmem in pool"));
if (!aInstance->AllocShmem(aSize, SharedMemory::TYPE_BASIC, &res.mShmem)) {
LOG(("Failure allocating new Shmem buffer"));
return ShmemBuffer();
}
res.mInitialized = true;
}
MOZ_ASSERT(res.mShmem.IsWritable(), "Shmem in Pool is not writable?");
// Prepare buffer, increase size if needed (we never shrink as we don't
// maintain seperate sized pools and we don't want to keep reallocating)
if (res.mShmem.Size<char>() < aSize) {
LOG(("Size change/increase in Shmem Pool"));
aInstance->DeallocShmem(res.mShmem);
res.mInitialized = false;
// this may fail; always check return value
if (!aInstance->AllocShmem(aSize, SharedMemory::TYPE_BASIC, &res.mShmem)) {
LOG(("Failure allocating resized Shmem buffer"));
return ShmemBuffer();
} else {
res.mInitialized = true;
}
}
MOZ_ASSERT(res.mShmem.IsWritable(), "Shmem in Pool is not writable post resize?");
mPoolFree--;
#ifdef DEBUG
size_t poolUse = mShmemPool.Length() - mPoolFree;
if (poolUse > mMaxPoolUse) {
mMaxPoolUse = poolUse;
LOG(("Maximum ShmemPool use increased: %d buffers", mMaxPoolUse));
}
#endif
return Move(res);
}
void ShmemPool::Put(ShmemBuffer&& aShmem)
{
MutexAutoLock lock(mMutex);
@ -128,18 +70,6 @@ void ShmemPool::Put(ShmemBuffer&& aShmem)
#endif
}
template <class T>
void ShmemPool::Cleanup(T* aInstance)
{
MutexAutoLock lock(mMutex);
for (size_t i = 0; i < mShmemPool.Length(); i++) {
if (mShmemPool[i].mInitialized) {
aInstance->DeallocShmem(mShmemPool[i].Get());
mShmemPool[i].mInitialized = false;
}
}
}
ShmemPool::~ShmemPool()
{
#ifdef DEBUG

78
dom/media/systemservices/ShmemPool.h
View File

@ -10,6 +10,12 @@
#include "mozilla/ipc/Shmem.h"
#include "mozilla/Mutex.h"
#undef LOG
#undef LOG_ENABLED
extern mozilla::LazyLogModule gCamerasParentLog;
#define LOG(args) MOZ_LOG(gCamerasParentLog, mozilla::LogLevel::Debug, args)
#define LOG_ENABLED() MOZ_LOG_TEST(gCamerasParentLog, mozilla::LogLevel::Debug)
namespace mozilla {
class ShmemPool;
@ -61,15 +67,77 @@ class ShmemPool {
public:
explicit ShmemPool(size_t aPoolSize);
~ShmemPool();
// We need to use the allocation/deallocation functions
// of a specific IPC child/parent instance.
template <class T> void Cleanup(T* aInstance);
// These 2 differ in what thread they can run on. GetIfAvailable
// Get/GetIfAvailable differ in what thread they can run on. GetIfAvailable
// can run anywhere but won't allocate if the right size isn't available.
ShmemBuffer GetIfAvailable(size_t aSize);
template <class T> ShmemBuffer Get(T* aInstance, size_t aSize);
void Put(ShmemBuffer&& aShmem);
// We need to use the allocation/deallocation functions
// of a specific IPC child/parent instance.
template <class T>
void Cleanup(T* aInstance)
{
MutexAutoLock lock(mMutex);
for (size_t i = 0; i < mShmemPool.Length(); i++) {
if (mShmemPool[i].mInitialized) {
aInstance->DeallocShmem(mShmemPool[i].Get());
mShmemPool[i].mInitialized = false;
}
}
}
template <class T>
ShmemBuffer Get(T* aInstance, size_t aSize)
{
MutexAutoLock lock(mMutex);
// Pool is empty, don't block caller.
if (mPoolFree == 0) {
// This isn't initialized, so will be understood as an error.
return ShmemBuffer();
}
ShmemBuffer& res = mShmemPool[mPoolFree - 1];
if (!res.mInitialized) {
LOG(("Initializing new Shmem in pool"));
if (!aInstance->AllocShmem(aSize, ipc::SharedMemory::TYPE_BASIC, &res.mShmem)) {
LOG(("Failure allocating new Shmem buffer"));
return ShmemBuffer();
}
res.mInitialized = true;
}
MOZ_ASSERT(res.mShmem.IsWritable(), "Shmem in Pool is not writable?");
// Prepare buffer, increase size if needed (we never shrink as we don't
// maintain seperate sized pools and we don't want to keep reallocating)
if (res.mShmem.Size<char>() < aSize) {
LOG(("Size change/increase in Shmem Pool"));
aInstance->DeallocShmem(res.mShmem);
res.mInitialized = false;
// this may fail; always check return value
if (!aInstance->AllocShmem(aSize, ipc::SharedMemory::TYPE_BASIC, &res.mShmem)) {
LOG(("Failure allocating resized Shmem buffer"));
return ShmemBuffer();
} else {
res.mInitialized = true;
}
}
MOZ_ASSERT(res.mShmem.IsWritable(), "Shmem in Pool is not writable post resize?");
mPoolFree--;
#ifdef DEBUG
size_t poolUse = mShmemPool.Length() - mPoolFree;
if (poolUse > mMaxPoolUse) {
mMaxPoolUse = poolUse;
LOG(("Maximum ShmemPool use increased: %d buffers", mMaxPoolUse));
}
#endif
return Move(res);
}
private:
Mutex mMutex;
size_t mPoolFree;