nixd: worker ready notification

nix-community · Mar 29, 2024 · 0aa504f · 0aa504f
1 parent 139d129
commit 0aa504f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/nixd/nix-node-eval/src/EvalProvider.cpp b/nixd/nix-node-eval/src/EvalProvider.cpp
@@ -35,6 +35,10 @@ EvalProvider::EvalProvider(std::unique_ptr<lspserver::InboundPort> In,
           new nix::EvalState{{}, nix::openStore("dummy://")})) {
   Registry.addMethod("exprValue", this, &EvalProvider::onExprValue);
   Registry.addNotification("registerBC", this, &EvalProvider::onRegisterBC);
+
+  Ready = mkOutNotifiction<int>("ready");
+
+  Ready(getpid());
 }
 
 void EvalProvider::onRegisterBC(const rpc::RegisterBCParams &Params) {

diff --git a/nixd/nix-node-eval/src/EvalProvider.h b/nixd/nix-node-eval/src/EvalProvider.h
@@ -19,7 +19,7 @@ class EvalProvider : public lspserver::LSPServer {
   nixt::EnvMap EMap;
   std::unique_ptr<nix::EvalState> State;
 
-  llvm::unique_function<void(int)> Exit;
+  llvm::unique_function<void(int)> Ready;
 
 public:
   EvalProvider(std::unique_ptr<lspserver::InboundPort> In,

diff --git a/nixd/tools/nixd/src/Controller.h b/nixd/tools/nixd/src/Controller.h
@@ -63,6 +63,8 @@ class Controller : public lspserver::LSPServer {
   ~Controller() { Pool.join(); }
 
   void setLitTest(bool LitTest) { this->LitTest = LitTest; }
+
+  bool isReadyToEval() { return Eval && Eval->ready(); }
 };
 
 } // namespace nixd
diff --git a/nixd/tools/nixd/src/EvalClient.cpp b/nixd/tools/nixd/src/EvalClient.cpp
@@ -45,4 +45,13 @@ std::unique_ptr<OwnedEvalClient> OwnedEvalClient::create(int &Fail) {
                                            std::move(ProcFdStream));
 }
 
+EvalClient::EvalClient(std::unique_ptr<lspserver::InboundPort> In,
+                       std::unique_ptr<lspserver::OutboundPort> Out)
+    : lspserver::LSPServer(std::move(In), std::move(Out)), Ready(false) {
+  RegisterBC = mkOutNotifiction<rpc::RegisterBCParams>("registerBC");
+  ExprValue =
+      mkOutMethod<rpc::ExprValueParams, rpc::ExprValueResponse>("exprValue");
+  Registry.addNotification("ready", this, &EvalClient::onReady);
+}
+
 } // namespace nixd
diff --git a/nixd/tools/nixd/src/EvalClient.h b/nixd/tools/nixd/src/EvalClient.h
@@ -12,21 +12,27 @@
 namespace nixd {
 
 class EvalClient : public lspserver::LSPServer {
+  std::atomic<bool> Ready;
+
 public:
   llvm::unique_function<void(const rpc::RegisterBCParams &)> RegisterBC;
   llvm::unique_function<void(const rpc::ExprValueParams &,
                              lspserver::Callback<rpc::ExprValueResponse>)>
       ExprValue;
 
   EvalClient(std::unique_ptr<lspserver::InboundPort> In,
-             std::unique_ptr<lspserver::OutboundPort> Out)
-      : lspserver::LSPServer(std::move(In), std::move(Out)) {
-    RegisterBC = mkOutNotifiction<rpc::RegisterBCParams>("registerBC");
-    ExprValue =
-        mkOutMethod<rpc::ExprValueParams, rpc::ExprValueResponse>("exprValue");
-  }
+             std::unique_ptr<lspserver::OutboundPort> Out);
 
   virtual ~EvalClient() = default;
+
+  void onReady(const int &Flags) {
+    lspserver::log(
+        "nix-node-eval({0}) reported it's ready for processing requests",
+        Flags);
+    Ready = true;
+  }
+
+  bool ready() { return Ready; }
 };
 
 class OwnedEvalClient : public EvalClient {