mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ccb3f3937e into 4d9b4d6e51

This commit is contained in:
Angelos Gkaraleas 2025-05-10 23:02:00 +08:00 committed by GitHub
parent 4d9b4d6e51 ccb3f3937e
commit d8dd6ac660
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ae.c
View File

@ -323,7 +323,7 @@ static int processTimeEvents(aeEventLoop *eventLoop) {
}
if (te->when <= now) {
int retval;
long long retval;
id = te->id;
te->refcount++;

2
src/ae.h
View File

@ -44,7 +44,7 @@ struct aeEventLoop;
/* Types and data structures */
typedef void aeFileProc(struct aeEventLoop *eventLoop, int fd, void *clientData, int mask);
typedef int aeTimeProc(struct aeEventLoop *eventLoop, long long id, void *clientData);
typedef long long aeTimeProc(struct aeEventLoop *eventLoop, long long id, void *clientData);
typedef void aeEventFinalizerProc(struct aeEventLoop *eventLoop, void *clientData);
typedef void aeBeforeSleepProc(struct aeEventLoop *eventLoop);

2
src/evict.c
View File

@ -435,7 +435,7 @@ int overMaxmemoryAfterAlloc(size_t moremem) {
* eviction cycles until the "maxmemory" condition has resolved or there are no
* more evictable items. */
static int isEvictionProcRunning = 0;
static int evictionTimeProc(
static long long evictionTimeProc(
struct aeEventLoop *eventLoop, long long id, void *clientData) {
UNUSED(eventLoop);
UNUSED(id);

2
src/module.c
View File

@ -9271,7 +9271,7 @@ typedef struct RedisModuleTimer {
/* This is the timer handler that is called by the main event loop. We schedule
* this timer to be called when the nearest of our module timers will expire. */
int moduleTimerHandler(struct aeEventLoop *eventLoop, long long id, void *clientData) {
static long long moduleTimerHandler(struct aeEventLoop *eventLoop, long long id, void *clientData) {
UNUSED(eventLoop);
UNUSED(id);
UNUSED(clientData);

5
src/redis-benchmark.c
View File

@ -178,8 +178,7 @@ static redisContext *getRedisContext(const char *ip, int port,
static void freeRedisConfig(redisConfig *cfg);
static int fetchClusterSlotsConfiguration(client c);
static void updateClusterSlotsConfiguration(void);
int showThroughput(struct aeEventLoop *eventLoop, long long id,
void *clientData);
static long long showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData);
/* Dict callbacks */
static uint64_t dictSdsHash(const void *key);
@ -1635,7 +1634,7 @@ tls_usage,
exit(exit_status);
}
int showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData) {
static long long showThroughput(struct aeEventLoop *eventLoop, long long id, void *clientData) {
UNUSED(eventLoop);
UNUSED(id);
benchmarkThread *thread = (benchmarkThread *)clientData;

2
src/server.c
View File

@ -1365,7 +1365,7 @@ void cronUpdateMemoryStats(void) {
* a macro is used: run_with_period(milliseconds) { .... }
*/
int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
static long long serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
int j;
UNUSED(eventLoop);
UNUSED(id);