Fix Andersbakken#867

Add a --poll-timer switch to keep the database "warm".
dzhu · Dec 14, 2016 · d3a10d2 · d3a10d2
1 parent 883d739
commit d3a10d2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 4 deletions.
diff --git a/src/Project.cpp b/src/Project.cpp
@@ -2678,3 +2678,11 @@ void Project::removeSource(uint32_t fileId)
     removeDependencies(fileId);
     Path::rmdir(sourceFilePath(fileId));
 }
+
+void Project::poll()
+{
+    const Server::Options &options = Server::instance()->options();
+    for (auto it : mDependencies) {
+        validate(it.first,  options.options & Server::ValidateFileMaps ? Validate : StatOnly);
+    }
+}
diff --git a/src/Project.h b/src/Project.h
@@ -237,6 +237,7 @@ class Project : public std::enable_shared_from_this<Project>
     void includeCompletions(Flags<QueryMessage::Flag> flags, const std::shared_ptr<Connection> &conn, Source &&source) const;
     size_t bytesWritten() const { return mBytesWritten; }
     void destroy() { mSaveDirty = false; }
+    void poll();
     enum VisitResult {
         Stop,
         Continue,

diff --git a/src/Server.cpp b/src/Server.cpp
@@ -86,14 +86,17 @@ static const List<Path> sSystemIncludePaths = {
 
 Server *Server::sInstance = 0;
 Server::Server()
-    : mSuspended(false), mEnvironment(Rct::environment()), mExitCode(0), mLastFileId(0), mCompletionThread(0)
+    : mSuspended(false), mEnvironment(Rct::environment()), mPollTimer(-1), mExitCode(0), mLastFileId(0), mCompletionThread(0)
 {
     assert(!sInstance);
     sInstance = this;
 }
 
 Server::~Server()
 {
+    if (mPollTimer >= 0)
+        EventLoop::eventLoop()->unregisterTimer(mPollTimer);
+
     if (mCompletionThread) {
         mCompletionThread->stop();
         mCompletionThread->join();
@@ -203,6 +206,15 @@ bool Server::init(const Options &options)
             }
         }
     }
+
+    assert(mOptions.pollTimer >= 0);
+    if (mOptions.pollTimer) {
+        mPollTimer = EventLoop::eventLoop()->registerTimer([this](int) {
+                if (std::shared_ptr<Project> proj = mCurrentProject.lock()) {
+                    proj->poll();
+                }
+            }, mOptions.pollTimer * 1000);
+    }
     return true;
 }
 

diff --git a/src/Server.h b/src/Server.h
@@ -93,7 +93,7 @@ class Server
               rpVisitFileTimeout(0), rpIndexDataMessageTimeout(0), rpConnectTimeout(0),
               rpConnectAttempts(0), rpNiceValue(0), maxCrashCount(0),
               completionCacheSize(0), testTimeout(60 * 1000 * 5),
-              maxFileMapScopeCacheSize(512), tcpPort(0)
+              maxFileMapScopeCacheSize(512), pollTimer(0), tcpPort(0)
         {
         }
 
@@ -102,7 +102,8 @@ class Server
         size_t jobCount, headerErrorJobCount, maxIncludeCompletionDepth;
         int rpVisitFileTimeout, rpIndexDataMessageTimeout,
             rpConnectTimeout, rpConnectAttempts, rpNiceValue, maxCrashCount,
-            completionCacheSize, testTimeout, maxFileMapScopeCacheSize, errorLimit;
+            completionCacheSize, testTimeout, maxFileMapScopeCacheSize, errorLimit,
+            pollTimer;
         uint16_t tcpPort;
         List<String> defaultArguments, excludeFilters;
         Set<String> blockedArguments;
@@ -210,7 +211,7 @@ class Server
     SocketServer::SharedPtr mUnixServer, mTcpServer;
     List<String> mEnvironment;
 
-    int mExitCode;
+    int mPollTimer, mExitCode;
     uint32_t mLastFileId;
     std::shared_ptr<JobScheduler> mJobScheduler;
     CompletionThread *mCompletionThread;

diff --git a/src/rdm.cpp b/src/rdm.cpp
@@ -203,6 +203,7 @@ enum OptionType {
     LogTimestamp,
     LogFlushOption,
     SandboxRoot,
+    PollTimer,
     NoRealPath,
     Noop
 };
@@ -338,6 +339,7 @@ int main(int argc, char** argv)
         { LogTimestamp, "log-timestamp", 0, CommandLineParser::NoValue, "Add timestamp to logs." },
         { LogFlushOption, "log-flush", 0, CommandLineParser::NoValue, "Flush stderr/stdout after each log." },
         { SandboxRoot, "sandbox-root",  0, CommandLineParser::Required, "Create index using relative paths by stripping dir (enables copying of tag index db files without need to reindex)." },
+        { PollTimer, "poll-timer", 0, CommandLineParser::Required, "Poll the database of the current project every <arg> seconds. " },
         { NoRealPath, "no-realpath", 0, CommandLineParser::NoValue, "Don't use realpath(3) for files" },
         { Noop, "config", 'c', CommandLineParser::Required, "Use this file (instead of ~/.rdmrc)." },
         { Noop, "no-rc", 'N', CommandLineParser::NoValue, "Don't load any rc files." }
@@ -420,6 +422,12 @@ int main(int argc, char** argv)
                 return { String::format<1024>("Invalid argument to -z %s", value.constData()), CommandLineParser::Parse_Error };
             }
             break; }
+        case PollTimer: {
+            serverOpts.pollTimer = atoi(value.constData());
+            if (serverOpts.pollTimer < 0) {
+                return { String::format<1024>("Invalid argument to --poll-timer %s", value.constData()), CommandLineParser::Parse_Error };
+            }
+            break; }
         case CleanSlate: {
             serverOpts.options |= Server::ClearProjects;
             break; }