Helpers to move around in encoded sorted set

[redis.git] / src / redis.c

diff --git a/src/redis.c b/src/redis.c
index 84e5560e055e7012d8eb4fefd99ef99a3e1bd709..866ac360a97872e78af1186beaa1051e007db679 100644 (file)
--- a/src/redis.c
+++ b/src/redis.c
@@ -859,7 +859,7 @@ void initServer() {
 
     signal(SIGHUP, SIG_IGN);
     signal(SIGPIPE, SIG_IGN);
 
     signal(SIGHUP, SIG_IGN);
     signal(SIGPIPE, SIG_IGN);

-    setupSigSegvAction();
+    setupSignalHandlers();

 
     if (server.syslog_enabled) {
         openlog(server.syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,
 
     if (server.syslog_enabled) {
         openlog(server.syslog_ident, LOG_PID | LOG_NDELAY | LOG_NOWAIT,


@@ -1347,8 +1347,18 @@ sds genRedisInfoString(char *section) {
             info = sdscatprintf(info,
                 "cache_max_memory:%llu\r\n"
                 "cache_blocked_clients:%lu\r\n"
             info = sdscatprintf(info,
                 "cache_max_memory:%llu\r\n"
                 "cache_blocked_clients:%lu\r\n"

+                "cache_io_queue_len:%lu\r\n"
+                "cache_io_jobs_new:%lu\r\n"
+                "cache_io_jobs_processing:%lu\r\n"
+                "cache_io_jobs_processed:%lu\r\n"
+                "cache_io_ready_clients:%lu\r\n"

                 ,(unsigned long long) server.cache_max_memory,
                 ,(unsigned long long) server.cache_max_memory,

-                (unsigned long) server.cache_blocked_clients
+                (unsigned long) server.cache_blocked_clients,
+                (unsigned long) listLength(server.cache_io_queue),
+                (unsigned long) listLength(server.io_newjobs),
+                (unsigned long) listLength(server.io_processing),
+                (unsigned long) listLength(server.io_processed),
+                (unsigned long) listLength(server.io_ready_clients)

             );
             unlockThreadedIO();
         }
             );
             unlockThreadedIO();
         }


@@ -1654,7 +1664,7 @@ void usage() {
 }
 
 int main(int argc, char **argv) {
 }
 
 int main(int argc, char **argv) {

-    time_t start;
+    long long start;

 
     initServerConfig();
     if (argc == 2) {
 
     initServerConfig();
     if (argc == 2) {


@@ -1675,15 +1685,15 @@ int main(int argc, char **argv) {
 #ifdef __linux__
     linuxOvercommitMemoryWarning();
 #endif
 #ifdef __linux__
     linuxOvercommitMemoryWarning();
 #endif

-    start = time(NULL);
+    start = ustime();

     if (server.ds_enabled) {
         redisLog(REDIS_NOTICE,"DB not loaded (running with disk back end)");
     } else if (server.appendonly) {
         if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)
     if (server.ds_enabled) {
         redisLog(REDIS_NOTICE,"DB not loaded (running with disk back end)");
     } else if (server.appendonly) {
         if (loadAppendOnlyFile(server.appendfilename) == REDIS_OK)

-            redisLog(REDIS_NOTICE,"DB loaded from append only file: %ld seconds",time(NULL)-start);
+            redisLog(REDIS_NOTICE,"DB loaded from append only file: %.3f seconds",(float)(ustime()-start)/1000000);

     } else {
         if (rdbLoad(server.dbfilename) == REDIS_OK)
     } else {
         if (rdbLoad(server.dbfilename) == REDIS_OK)

-            redisLog(REDIS_NOTICE,"DB loaded from disk: %ld seconds",time(NULL)-start);
+            redisLog(REDIS_NOTICE,"DB loaded from disk: %.3f seconds",(float)(ustime()-start)/1000000);

     }
     if (server.ipfd > 0)
         redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);
     }
     if (server.ipfd > 0)
         redisLog(REDIS_NOTICE,"The server is now ready to accept connections on port %d", server.port);


@@ -1695,10 +1705,8 @@ int main(int argc, char **argv) {
     return 0;
 }
 
     return 0;
 }
 

-/* ============================= Backtrace support ========================= */
-

 #ifdef HAVE_BACKTRACE
 #ifdef HAVE_BACKTRACE

-void *getMcontextEip(ucontext_t *uc) {
+static void *getMcontextEip(ucontext_t *uc) {

 #if defined(__FreeBSD__)
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)
 #if defined(__FreeBSD__)
     return (void*) uc->uc_mcontext.mc_eip;
 #elif defined(__dietlibc__)


@@ -1726,7 +1734,7 @@ void *getMcontextEip(ucontext_t *uc) {
 #endif
 }
 
 #endif
 }
 

-void segvHandler(int sig, siginfo_t *info, void *secret) {
+static void sigsegvHandler(int sig, siginfo_t *info, void *secret) {

     void *trace[100];
     char **messages = NULL;
     int i, trace_size = 0;
     void *trace[100];
     char **messages = NULL;
     int i, trace_size = 0;


@@ -1765,37 +1773,35 @@ void segvHandler(int sig, siginfo_t *info, void *secret) {
     sigaction (sig, &act, NULL);
     kill(getpid(),sig);
 }
     sigaction (sig, &act, NULL);
     kill(getpid(),sig);
 }

+#endif /* HAVE_BACKTRACE */

 
 

-void sigtermHandler(int sig) {
+static void sigtermHandler(int sig) {

     REDIS_NOTUSED(sig);
 
     REDIS_NOTUSED(sig);
 

-    redisLog(REDIS_WARNING,"SIGTERM received, scheduling shutting down...");
+    redisLog(REDIS_WARNING,"Received SIGTERM, scheduling shutdown...");

     server.shutdown_asap = 1;
 }
 
     server.shutdown_asap = 1;
 }
 

-void setupSigSegvAction(void) {
+void setupSignalHandlers(void) {

     struct sigaction act;
 
     struct sigaction act;
 

-    sigemptyset (&act.sa_mask);
-    /* When the SA_SIGINFO flag is set in sa_flags then sa_sigaction
-     * is used. Otherwise, sa_handler is used */
-    act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
-    act.sa_sigaction = segvHandler;
-    sigaction (SIGSEGV, &act, NULL);
-    sigaction (SIGBUS, &act, NULL);
-    sigaction (SIGFPE, &act, NULL);
-    sigaction (SIGILL, &act, NULL);
-    sigaction (SIGBUS, &act, NULL);
-
+    /* When the SA_SIGINFO flag is set in sa_flags then sa_sigaction is used.
+     * Otherwise, sa_handler is used. */
+    sigemptyset(&act.sa_mask);

     act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND;
     act.sa_handler = sigtermHandler;
     act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND;
     act.sa_handler = sigtermHandler;

-    sigaction (SIGTERM, &act, NULL);
-    return;
-}
+    sigaction(SIGTERM, &act, NULL);

 
 

-#else /* HAVE_BACKTRACE */
-void setupSigSegvAction(void) {
+#ifdef HAVE_BACKTRACE
+    sigemptyset(&act.sa_mask);
+    act.sa_flags = SA_NODEFER | SA_ONSTACK | SA_RESETHAND | SA_SIGINFO;
+    act.sa_sigaction = sigsegvHandler;
+    sigaction(SIGSEGV, &act, NULL);
+    sigaction(SIGBUS, &act, NULL);
+    sigaction(SIGFPE, &act, NULL);
+    sigaction(SIGILL, &act, NULL);
+#endif
+    return;

 }
 }

-#endif /* HAVE_BACKTRACE */

 
 /* The End */
 
 /* The End */