Revert "EGL: Refactor multifile blobcache"
Revert submission 21108066-blobcache_multifile_20230125
Reason for revert: b/267777424
Reverted changes: /q/submissionid:21108066-blobcache_multifile_20230125
Change-Id: Ieb94d531a12b29b61958d3d5c601be544e429d79
diff --git a/opengl/libs/EGL/egl_cache.h b/opengl/libs/EGL/egl_cache.h
index 1399368..2dcd803 100644
--- a/opengl/libs/EGL/egl_cache.h
+++ b/opengl/libs/EGL/egl_cache.h
@@ -25,7 +25,6 @@
#include <string>
#include "FileBlobCache.h"
-#include "MultifileBlobCache.h"
namespace android {
@@ -33,11 +32,6 @@
class EGLAPI egl_cache_t {
public:
- enum class EGLCacheMode {
- Monolithic,
- Multifile,
- };
-
// get returns a pointer to the singleton egl_cache_t object. This
// singleton object will never be destroyed.
static egl_cache_t* get();
@@ -70,9 +64,6 @@
// cache contents from one program invocation to another.
void setCacheFilename(const char* filename);
- // Allow setting monolithic or multifile modes
- void setCacheMode(EGLCacheMode cacheMode);
-
// Allow the fixed cache limit to be overridden
void setCacheLimit(int64_t cacheByteLimit);
@@ -94,9 +85,6 @@
// possible.
BlobCache* getBlobCacheLocked();
- // Get or create the multifile blobcache
- MultifileBlobCache* getMultifileBlobCacheLocked();
-
// mInitialized indicates whether the egl_cache_t is in the initialized
// state. It is initialized to false at construction time, and gets set to
// true when initialize is called. It is set back to false when terminate
@@ -110,9 +98,6 @@
// first time it's needed.
std::unique_ptr<FileBlobCache> mBlobCache;
- // The multifile version of blobcache allowing larger contents to be stored
- std::unique_ptr<MultifileBlobCache> mMultifileBlobCache;
-
// mFilename is the name of the file for storing cache contents in between
// program invocations. It is initialized to an empty string at
// construction time, and can be set with the setCacheFilename method. An
@@ -138,7 +123,11 @@
bool mMultifileMode;
// Cache limit
- size_t mCacheByteLimit;
+ int64_t mCacheByteLimit;
+
+ // Whether we've kicked off a side thread that will check the multifile
+ // cache size and remove entries if needed.
+ bool mMultifileCleanupPending;
};
}; // namespace android