From 9e7b21ca432af5dd05c44907667b0cdab54b9886 Mon Sep 17 00:00:00 2001 From: Alexis Campailla Date: Fri, 29 May 2015 18:03:51 +0200 Subject: [PATCH] Eliminate #ifdefs related to off_t --- src/redis-check-aof.c | 15 +++------------ src/redis.c | 5 ----- src/redis.h | 22 ++-------------------- src/replication.c | 5 ----- 4 files changed, 5 insertions(+), 42 deletions(-) diff --git a/src/redis-check-aof.c b/src/redis-check-aof.c index a4750544..58430610 100644 --- a/src/redis-check-aof.c +++ b/src/redis-check-aof.c @@ -55,11 +55,7 @@ } static char error[1024]; -#ifdef _WIN32 -long long epos; -#else static off_t epos; -#endif int consumeNewline(char *buf) { if (strncmp(buf,"\r\n",2) != 0) { @@ -167,19 +163,14 @@ int main(int argc, char **argv) { int fix = 0; FILE *fp; struct redis_stat sb; + off_t size; + off_t pos; + off_t diff; #ifdef _WIN32 - long long size; - long long pos; - long long diff; - _fmode = _O_BINARY; setmode(_fileno(stdin), _O_BINARY); setmode(_fileno(stdout), _O_BINARY); setmode(_fileno(stderr), _O_BINARY); -#else - off_t size; - off_t pos; - off_t diff; #endif if (argc < 2) { diff --git a/src/redis.c b/src/redis.c index bcf94e48..d97845b4 100644 --- a/src/redis.c +++ b/src/redis.c @@ -2820,13 +2820,8 @@ sds genRedisInfoString(char *section) { if (server.loading) { double perc; time_t eta, elapsed; -#ifdef _WIN32 - long long remaining_bytes = server.loading_total_bytes- - server.loading_loaded_bytes; -#else off_t remaining_bytes = server.loading_total_bytes- server.loading_loaded_bytes; -#endif perc = ((double)server.loading_loaded_bytes / (server.loading_total_bytes+1)) * 100; diff --git a/src/redis.h b/src/redis.h index 5351ef53..7df6e93d 100644 --- a/src/redis.h +++ b/src/redis.h @@ -521,11 +521,10 @@ typedef struct redisClient { #ifdef _WIN32 char replFileCopy[_MAX_PATH]; long long repldboff; /* replication DB file offset */ - long long repldbsize; /* replication DB file size */ #else - long repldboff; /* replication DB file offset */ - off_t repldbsize; /* replication DB file size */ + long repldboff; /* replication DB file offset */ INDUCE_MERGE_CONFLICT #endif + off_t repldbsize; /* replication DB file size */ sds replpreamble; /* replication DB preamble. */ long long reploff; /* replication offset if this is our master */ long long repl_ack_off; /* replication ack offset, if this is a slave */ @@ -663,13 +662,8 @@ struct redisServer { uint64_t next_client_id; /* Next client unique ID. Incremental. */ /* RDB / AOF loading information */ int loading; /* We are loading data from disk if true */ -#ifdef _WIN32 - long long loading_total_bytes; - long long loading_loaded_bytes; -#else off_t loading_total_bytes; off_t loading_loaded_bytes; -#endif time_t loading_start_time; off_t loading_process_events_interval_bytes; /* Fast pointers to often looked up command */ @@ -720,15 +714,9 @@ struct redisServer { char *aof_filename; /* Name of the AOF file */ int aof_no_fsync_on_rewrite; /* Don't fsync if a rewrite is in prog. */ int aof_rewrite_perc; /* Rewrite AOF if % growth is > M and... */ -#ifdef _WIN32 - long long aof_rewrite_min_size; /* the AOF file is at least N bytes. */ - long long aof_rewrite_base_size; /* AOF size on latest startup or rewrite. */ - long long aof_current_size; /* AOF current size. */ -#else off_t aof_rewrite_min_size; /* the AOF file is at least N bytes. */ off_t aof_rewrite_base_size; /* AOF size on latest startup or rewrite. */ off_t aof_current_size; /* AOF current size. */ -#endif int aof_rewrite_scheduled; /* Rewrite once BGSAVE terminates. */ pid_t aof_child_pid; /* PID if rewriting process */ list *aof_rewrite_buf_blocks; /* Hold changes during an AOF rewrite. */ @@ -798,15 +786,9 @@ struct redisServer { redisClient *cached_master; /* Cached master to be reused for PSYNC. */ int repl_syncio_timeout; /* Timeout for synchronous I/O calls */ int repl_state; /* Replication status if the instance is a slave */ -#ifdef _WIN64 - int64_t repl_transfer_size; /* Size of RDB to read from master during sync. */ - int64_t repl_transfer_read; /* Amount of RDB read from master during sync. */ - int64_t repl_transfer_last_fsync_off; /* Offset when we fsync-ed last time. */ -#else off_t repl_transfer_size; /* Size of RDB to read from master during sync. */ off_t repl_transfer_read; /* Amount of RDB read from master during sync. */ off_t repl_transfer_last_fsync_off; /* Offset when we fsync-ed last time. */ -#endif int repl_transfer_s; /* Slave -> Master SYNC socket */ int repl_transfer_fd; /* Slave -> Master SYNC temp file descriptor */ char *repl_transfer_tmpfile; /* Slave-> master SYNC temp file name */ diff --git a/src/replication.c b/src/replication.c index 4152cbe2..b7ac98fe 100644 --- a/src/replication.c +++ b/src/replication.c @@ -1125,13 +1125,8 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { if (server.repl_transfer_read >= server.repl_transfer_last_fsync_off + REPL_MAX_WRITTEN_BEFORE_FSYNC) { -#ifdef _WIN64 - int64_t sync_size = server.repl_transfer_read - - server.repl_transfer_last_fsync_off; -#else off_t sync_size = server.repl_transfer_read - server.repl_transfer_last_fsync_off; -#endif rdb_fsync_range(server.repl_transfer_fd, server.repl_transfer_last_fsync_off, sync_size); server.repl_transfer_last_fsync_off += sync_size;