Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ee8e62 authored by Kalesh Singh's avatar Kalesh Singh Committed by Gerrit Code Review
Browse files

Merge "libhwui: Move MAX_PAGE_SIZE into uirenderer namespace" into main

parents 99fa55cb c662b393

libs/hwui/utils/LinearAllocator.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -31,15 +31,11 @@ 
#include <utils/Log.h>

#include <utils/Log.h>

#include <utils/Macros.h>

#include <utils/Macros.h>





// The ideal size of a page allocation (these need to be multiples of 8)

#define INITIAL_PAGE_SIZE ((size_t)512)  // 512b

#define MAX_PAGE_SIZE ((size_t)131072)   // 128kb



// The maximum amount of wasted space we can have per page

// The maximum amount of wasted space we can have per page

// Allocations exceeding this will have their own dedicated page

// Allocations exceeding this will have their own dedicated page

// If this is too low, we will malloc too much

// If this is too low, we will malloc too much

// Too high, and we may waste too much space

// Too high, and we may waste too much space

// Must be smaller than INITIAL_PAGE_SIZE

// Must be smaller than kInitialPageSize

#define MAX_WASTE_RATIO (0.5f)

#define MAX_WASTE_RATIO (0.5f)





#if LOG_NDEBUG

#if LOG_NDEBUG
@@ -75,6 +71,10 @@ static void _addAllocation(int count) { 
namespace android {

namespace android {

namespace uirenderer {

namespace uirenderer {





// The ideal size of a page allocation (these need to be multiples of 8)

static constexpr size_t kInitialPageSize = 512;  // 512b

static constexpr size_t kMaxPageSize = 131072;   // 128kb



class LinearAllocator::Page {

class LinearAllocator::Page {

public:

public:

    Page* next() { return mNextPage; }

    Page* next() { return mNextPage; }
@@ -94,8 +94,8 @@ private: 
};

};





LinearAllocator::LinearAllocator()

LinearAllocator::LinearAllocator()

        : mPageSize(INITIAL_PAGE_SIZE)

        : mPageSize(kInitialPageSize)

        , mMaxAllocSize(INITIAL_PAGE_SIZE * MAX_WASTE_RATIO)

        , mMaxAllocSize(kInitialPageSize * MAX_WASTE_RATIO)

        , mNext(0)

        , mNext(0)

        , mCurrentPage(0)

        , mCurrentPage(0)

        , mPages(0)

        , mPages(0)
@@ -135,8 +135,8 @@ bool LinearAllocator::fitsInCurrentPage(size_t size) { 
void LinearAllocator::ensureNext(size_t size) {

void LinearAllocator::ensureNext(size_t size) {

    if (fitsInCurrentPage(size)) return;

    if (fitsInCurrentPage(size)) return;





    if (mCurrentPage && mPageSize < MAX_PAGE_SIZE) {

    if (mCurrentPage && mPageSize < kMaxPageSize) {

        mPageSize = min(MAX_PAGE_SIZE, mPageSize * 2);

        mPageSize = min(kMaxPageSize, mPageSize * 2);

        mMaxAllocSize = mPageSize * MAX_WASTE_RATIO;

        mMaxAllocSize = mPageSize * MAX_WASTE_RATIO;

        mPageSize = ALIGN(mPageSize);

        mPageSize = ALIGN(mPageSize);

    }

    }