Skip to content

[media common]fix the buffer allocation/free mismatch #2007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XinfengZhang wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −7
Open

[media common]fix the buffer allocation/free mismatch #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions media_softlet/agnostic/common/shared/bufferMgr/media_allocator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,16 @@ MOS_STATUS Allocator::DestroyAllResources()

m_resourcePool.clear();

for (auto it : m_bufferPool)
{
MOS_BUFFER *buffer = const_cast<MOS_BUFFER *>(it.first);
m_osInterface->pfnFreeResource(m_osInterface, &buffer->OsResource);
MOS_Delete(buffer);
MOS_Delete(it.second);
}

m_bufferPool.clear();

for (auto it : m_surfacePool)
{
MOS_SURFACE *surface = const_cast<MOS_SURFACE *>(it.first);
Expand All @@ -72,6 +82,13 @@ MOS_STATUS Allocator::DestroyAllResources()
}
m_resourcePool.clear();

for (auto it : m_bufferPool)
{
m_osInterface->pfnFreeResource(m_osInterface, &it->OsResource);
MOS_Delete(it);
}
m_bufferPool.clear();

for (auto it : m_surfacePool)
{
m_osInterface->pfnFreeResource(m_osInterface, &it->OsResource);
Expand Down Expand Up @@ -165,9 +182,9 @@ PMOS_BUFFER Allocator::AllocateBuffer(MOS_ALLOC_GFXRES_PARAMS &param, bool zeroO
MOS_OS_ASSERT(param.pBufName != nullptr);
info->name = param.pBufName;

m_resourcePool.insert(std::make_pair(&buffer->OsResource, info));
m_bufferPool.insert(std::make_pair(buffer, info));
#else
m_resourcePool.push_back(&buffer->OsResource);
m_bufferPool.push_back(buffer);
#endif

if (zeroOnAllocate)
Expand Down Expand Up @@ -247,22 +264,22 @@ MOS_STATUS Allocator::DestroyBuffer(MOS_BUFFER *buffer)
return MOS_STATUS_NULL_POINTER;
}
#if (_DEBUG || _RELEASE_INTERNAL)
auto it = m_resourcePool.find(&buffer->OsResource);
if (it == m_resourcePool.end())
auto it = m_bufferPool.find(buffer);
if (it == m_bufferPool.end())
{
return MOS_STATUS_SUCCESS;
}

MOS_Delete(it->second);
#else
auto it = std::find(m_resourcePool.begin(), m_resourcePool.end(), &buffer->OsResource);
if (it == m_resourcePool.end())
auto it = std::find(m_bufferPool.begin(), m_bufferPool.end(), buffer);
if (it == m_bufferPool.end())
{
return MOS_STATUS_SUCCESS;
}
#endif

m_resourcePool.erase(it);
m_bufferPool.erase(it);
m_osInterface->pfnFreeResource(m_osInterface, &buffer->OsResource);
MOS_Delete(buffer);

Expand Down
2 changes: 2 additions & 0 deletions media_softlet/agnostic/common/shared/bufferMgr/media_allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,11 @@ class Allocator

std::map<MOS_RESOURCE *, TraceInfo *> m_resourcePool;
std::map<MOS_SURFACE *, TraceInfo *> m_surfacePool;
std::map<MOS_BUFFER *, TraceInfo *> m_bufferPool;
#else
std::vector<MOS_RESOURCE *> m_resourcePool;
std::vector<MOS_SURFACE *> m_surfacePool;
std::vector<MOS_BUFFER *> m_bufferPool;
#endif

PMOS_INTERFACE m_osInterface = nullptr; //!< PMOS_INTERFACE
Expand Down
Loading