openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix reference counting for Assembly"

This commit is contained in:
Hans Boehm 2016-08-17 23:56:08 +00:00 committed by Gerrit Code Review
parent 704d818ec1 e74dec4a39
commit 3b6530507b
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libpixelflinger/codeflinger/CodeCache.cpp
View File

@ -23,7 +23,6 @@
#include <sys/mman.h>
#include <cutils/ashmem.h>
#include <cutils/atomic.h>
#define LOG_TAG "CodeCache"
#include <cutils/log.h>
@ -101,7 +100,7 @@ static mspace getMspace()
}
Assembly::Assembly(size_t size)
: mCount(1), mSize(0)
: mCount(0), mSize(0)
{
mBase = (uint32_t*)mspace_malloc(getMspace(), size);
LOG_ALWAYS_FATAL_IF(mBase == NULL,
@ -117,12 +116,12 @@ Assembly::~Assembly()
void Assembly::incStrong(const void*) const
{
android_atomic_inc(&mCount);
mCount.fetch_add(1, std::memory_order_relaxed);
}
void Assembly::decStrong(const void*) const
{
if (android_atomic_dec(&mCount) == 1) {
if (mCount.fetch_sub(1, std::memory_order_acq_rel) == 1) {
delete this;
}
}

3
libpixelflinger/codeflinger/CodeCache.h
View File

@ -19,6 +19,7 @@
#ifndef ANDROID_CODECACHE_H
#define ANDROID_CODECACHE_H
#include <atomic>
#include <stdint.h>
#include <pthread.h>
#include <sys/types.h>
@ -69,7 +70,7 @@ public:
typedef void weakref_type;
private:
mutable int32_t mCount;
mutable std::atomic<int32_t> mCount;
uint32_t* mBase;
size_t mSize;
};

1
libpixelflinger/tests/arch-arm64/assembler/arm64_assembler_test.cpp
View File

@ -34,7 +34,6 @@
#include <sys/mman.h>
#include <cutils/ashmem.h>
#include <cutils/atomic.h>
#define __STDC_FORMAT_MACROS
#include <inttypes.h>

1
libpixelflinger/tests/arch-mips64/assembler/mips64_assembler_test.cpp
View File

@ -34,7 +34,6 @@
#include <sys/mman.h>
#include <cutils/ashmem.h>
#include <cutils/atomic.h>
#include <cutils/log.h>
#define __STDC_FORMAT_MACROS