Add was_cached flag.

veluca93 · veluca93 · commit 9206379281f1 · 2018-08-28T20:45:20.000+02:00
diff --git a/capnp/evaluation.capnp b/capnp/evaluation.capnp
@@ -62,12 +62,13 @@ struct ProcessResult {
     memoryLimit @5 :Void;
     missingFiles @6 :Void;
     internalError @7 :Text;
-    missingExecutable @12 :Text;
+    missingExecutable @8 :Text;
   }
-  resourceUsage @8 :Resources;
-  stdout @9 :SHA256; # Hash of standard output
-  stderr @10 :SHA256; # Hash of standard error
-  outputFiles @11 :List(FileInfo); # Name and hash of other outputs
+  resourceUsage @9 :Resources;
+  stdout @10 :SHA256; # Hash of standard output
+  stderr @11 :SHA256; # Hash of standard error
+  outputFiles @12 :List(FileInfo); # Name and hash of other outputs
+  wasCached @13 :Bool; # True if the answer comes from the cache.
 }
 
 struct Result {
diff --git a/cpp/frontend/frontend.cpp b/cpp/frontend/frontend.cpp
@@ -313,6 +313,7 @@ void Execution::getResult(std::function<void(Result)> callback,
                               r.getResourceUsage().getMemlock();
                           result.resources.stack =
                               r.getResourceUsage().getStack();
+                          result.was_cached = r.getWasCached();
                           callback(result);
                         },
                         [errored](auto exc) {
diff --git a/cpp/frontend/frontend.hpp b/cpp/frontend/frontend.hpp
@@ -32,6 +32,7 @@ struct Result {
   uint32_t return_code;
   std::string error;
   Resources resources;
+  bool was_cached;
 };
 
 class Frontend;
diff --git a/cpp/frontend/python/frontend.cpp b/cpp/frontend/python/frontend.cpp
@@ -64,6 +64,7 @@ PYBIND11_MODULE(task_maker_frontend, m) {
       .def_readonly("return_code", &frontend::Result::return_code)
       .def_readonly("error", &frontend::Result::error)
       .def_readonly("resources", &frontend::Result::resources)
+      .def_readonly("was_cached", &frontend::Result::was_cached)
       .def("__repr__", [](const frontend::Result& res) {
         std::string message = "<Result ";
         if (res.status == capnproto::ProcessResult::Status::Which::SUCCESS)
diff --git a/cpp/server/server.cpp b/cpp/server/server.cpp
@@ -93,7 +93,7 @@ kj::Promise<void> ExecutionGroup::Finalize(Execution* ex) {
                 util::UnionPromiseBuilder dependencies_propagated_;
                 for (size_t i = 0; i < executions_.size(); i++) {
                   executions_[i]->processResult(res.getProcesses()[i],
-                                                dependencies_propagated_);
+                                                dependencies_propagated_, true);
                 }
                 return std::move(dependencies_propagated_)
                     .Finalize()
@@ -335,8 +335,11 @@ void Execution::prepareRequest() {
 
 void Execution::processResult(
     capnproto::ProcessResult::Reader result,
-    util::UnionPromiseBuilder& dependencies_propagated_) {
-  KJ_IF_MAYBE(ctx, context_) { ctx->getResults().setResult(result); }
+    util::UnionPromiseBuilder& dependencies_propagated_, bool from_cache_) {
+  KJ_IF_MAYBE(ctx, context_) {
+    ctx->getResults().setResult(result);
+    ctx->getResults().getResult().setWasCached(from_cache_);
+  }
   KJ_LOG(INFO, "Execution " + description_, result);
   if (result.getStatus().isInternalError()) {
     frontend_context_.evaluation_early_stop_.fulfiller->reject(
@@ -403,10 +406,8 @@ void Execution::onDependenciesFailure(kj::Exception exc) {
     if (ff)
       ff->reject(KJ_EXCEPTION(FAILED, "Dependency failed: " + description_));
   };
-  if (stdout_)
-    mark_as_failed("stdout", stdout_);
-  if (stderr_)
-    mark_as_failed("stdout", stderr_);
+  if (stdout_) mark_as_failed("stdout", stdout_);
+  if (stderr_) mark_as_failed("stdout", stderr_);
   for (auto f : outputs_) {
     mark_as_failed(f.first, f.second);
   }
diff --git a/cpp/server/server.hpp b/cpp/server/server.hpp
@@ -55,7 +55,8 @@ class Execution : public capnproto::Execution::Server {
   void addDependencies(util::UnionPromiseBuilder& dependencies);
   void prepareRequest();
   void processResult(capnproto::ProcessResult::Reader result,
-                     util::UnionPromiseBuilder& dependencies_propagated_);
+                     util::UnionPromiseBuilder& dependencies_propagated_,
+                     bool from_cache_ = false);
   void onDependenciesFailure(kj::Exception exc);
   void onDependenciesPropagated();
 
