nixd/Server: sync config with the eval worker

nix-community · Jul 27, 2023 · fd4314b · fd4314b
1 parent 7945259
commit fd4314b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 13 deletions.
diff --git a/nixd/include/nixd/Server/EvalWorker.h b/nixd/include/nixd/Server/EvalWorker.h
@@ -16,8 +16,6 @@ class EvalWorker : public lspserver::LSPServer {
 
   std::unique_ptr<IValueEvalResult> IER;
 
-  configuration::TopLevel Config;
-
   EvalDraftStore DraftMgr;
 
   template <class ReplyTy>
@@ -31,7 +29,7 @@ class EvalWorker : public lspserver::LSPServer {
 
   void onDocumentDidOpen(const lspserver::DidOpenTextDocumentParams &Params);
 
-  void onEval(const ipc::WorkerMessage &Params);
+  void onEval(const ipc::EvalParams &Params);
 
   void onDefinition(const lspserver::TextDocumentPositionParams &,
                     lspserver::Callback<lspserver::Location>);

diff --git a/nixd/include/nixd/Server/IPC.h b/nixd/include/nixd/Server/IPC.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "lspserver/Protocol.h"
+#include "nixd/Server/Config.h"
 
 namespace nixd::ipc {
 
@@ -21,8 +22,9 @@ struct AttrPathParams {
   std::string Path;
 };
 
-bool fromJSON(const llvm::json::Value &, AttrPathParams &, llvm::json::Path);
-
-llvm::json::Value toJSON(const AttrPathParams &);
+struct EvalParams {
+  WorkspaceVersionTy WorkspaceVersion;
+  configuration::TopLevel::Eval Eval;
+};
 
 } // namespace nixd::ipc
diff --git a/nixd/include/nixd/Server/IPCSerialization.h b/nixd/include/nixd/Server/IPCSerialization.h
@@ -8,10 +8,18 @@
 
 namespace nixd::ipc {
 
+llvm::json::Value toJSON(const AttrPathParams &);
+
+llvm::json::Value toJSON(const EvalParams &);
+
 bool fromJSON(const llvm::json::Value &, WorkerMessage &, llvm::json::Path);
 llvm::json::Value toJSON(const WorkerMessage &);
 
 bool fromJSON(const llvm::json::Value &, Diagnostics &, llvm::json::Path);
 llvm::json::Value toJSON(const Diagnostics &);
 
+bool fromJSON(const llvm::json::Value &, AttrPathParams &, llvm::json::Path);
+
+bool fromJSON(const llvm::json::Value &, EvalParams &, llvm::json::Path);
+
 } // namespace nixd::ipc
diff --git a/nixd/lib/Server/Controller.cpp b/nixd/lib/Server/Controller.cpp
@@ -9,7 +9,7 @@
 #include "nixd/Server/ConfigSerialization.h"
 #include "nixd/Server/Controller.h"
 #include "nixd/Server/EvalDraftStore.h"
-#include "nixd/Server/IPC.h"
+#include "nixd/Server/IPCSerialization.h"
 #include "nixd/Support/Diagnostic.h"
 #include "nixd/Support/Support.h"
 
@@ -123,9 +123,12 @@ std::unique_ptr<Controller::Proc> Controller::createEvalWorker() {
   auto Args = nix::Strings{"nixd", "-role=evaluator"};
   auto EvalWorker = selfExec(nix::stringsToCharPtrs(Args).data());
   syncDrafts(*EvalWorker);
-  auto AskEval = mkOutNotifiction<ipc::WorkerMessage>(
-      "nixd/ipc/eval", EvalWorker->OutPort.get());
-  AskEval(ipc::WorkerMessage{WorkspaceVersion});
+  auto AskEval = mkOutNotifiction<ipc::EvalParams>("nixd/ipc/eval",
+                                                   EvalWorker->OutPort.get());
+  {
+    std::lock_guard _(ConfigLock);
+    AskEval(ipc::EvalParams{WorkspaceVersion, Config.eval});
+  }
   return EvalWorker;
 }
 

diff --git a/nixd/lib/Server/EvalWorker.cpp b/nixd/lib/Server/EvalWorker.cpp
@@ -38,11 +38,11 @@ void EvalWorker::onDocumentDidOpen(
   DraftMgr.addDraft(File, Version, Contents);
 }
 
-void EvalWorker::onEval(const ipc::WorkerMessage &Params) {
+void EvalWorker::onEval(const ipc::EvalParams &Params) {
   auto Session = std::make_unique<IValueEvalSession>();
 
-  auto I = Config.eval.target;
-  auto Depth = Config.eval.depth;
+  auto I = Params.Eval.target;
+  auto Depth = Params.Eval.depth;
 
   if (!I.empty())
     Session->parseArgs(I.nArgs());

diff --git a/nixd/lib/Server/IPCSerialization.cpp b/nixd/lib/Server/IPCSerialization.cpp
@@ -1,4 +1,6 @@
 #include "nixd/Server/IPCSerialization.h"
+#include "nixd/Server/ConfigSerialization.h"
+#include "nixd/Server/IPC.h"
 #include "nixd/Support/JSONSerialization.h"
 
 namespace nixd::ipc {
@@ -33,4 +35,14 @@ bool fromJSON(const Value &Params, AttrPathParams &R, Path P) {
 
 Value toJSON(const AttrPathParams &R) { return Object{{"Path", R.Path}}; }
 
+Value toJSON(const EvalParams &R) {
+  return Object{{"Eval", R.Eval}, {"WorkspaceVersion", R.WorkspaceVersion}};
+}
+
+bool fromJSON(const Value &Params, EvalParams &R, Path P) {
+  ObjectMapper O(Params, P);
+  return O && O.map("Eval", R.Eval) &&
+         O.map("WorkspaceVersion", R.WorkspaceVersion);
+}
+
 } // namespace nixd::ipc
diff --git a/nixd/lib/Server/OptionWorker.cpp b/nixd/lib/Server/OptionWorker.cpp
@@ -3,6 +3,7 @@
 #include "nixd/Nix/Option.h"
 #include "nixd/Nix/Value.h"
 #include "nixd/Server/ConfigSerialization.h"
+#include "nixd/Server/IPCSerialization.h"
 #include "nixd/Support/Diagnostic.h"
 #include "nixd/Support/ReplyRAII.h"