fix compile error

This commit is contained in:
Alex Cope 2023-07-07 11:37:09 -07:00
parent e35ce24985
commit c0c9230c73
2 changed files with 7 additions and 9 deletions

View File

@ -36,9 +36,6 @@
#include <mutex> #include <mutex>
#include <map> #include <map>
#include <math.h> #include <math.h>
#ifdef __linux__
#include <sys/sysinfo.h>
#endif
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* Data structures * Data structures
@ -66,11 +63,6 @@ struct evictionPoolEntry {
static struct evictionPoolEntry *EvictionPoolLRU; static struct evictionPoolEntry *EvictionPoolLRU;
enum class EvictReason {
User, /* User memory exceeded limit */
System /* System memory exceeded limit */
};
/* ---------------------------------------------------------------------------- /* ----------------------------------------------------------------------------
* Implementation of eviction, aging and LRU * Implementation of eviction, aging and LRU
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/

View File

@ -2874,6 +2874,12 @@ typedef struct {
#define OBJ_HASH_KEY 1 #define OBJ_HASH_KEY 1
#define OBJ_HASH_VALUE 2 #define OBJ_HASH_VALUE 2
/* Used in evict.cpp */
enum class EvictReason {
User, /* User memory exceeded limit */
System /* System memory exceeded limit */
};
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* Extern declarations * Extern declarations
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
@ -3378,7 +3384,7 @@ int zslLexValueGteMin(sds value, zlexrangespec *spec);
int zslLexValueLteMax(sds value, zlexrangespec *spec); int zslLexValueLteMax(sds value, zlexrangespec *spec);
/* Core functions */ /* Core functions */
int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, int *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false); int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level, EvictReason *reason=NULL, bool fQuickCycle=false, bool fPreSnapshot=false);
size_t freeMemoryGetNotCountedMemory(); size_t freeMemoryGetNotCountedMemory();
int overMaxmemoryAfterAlloc(size_t moremem); int overMaxmemoryAfterAlloc(size_t moremem);
int processCommand(client *c, int callFlags); int processCommand(client *c, int callFlags);