diff options
author | dannark <dannark@google.com> | 2018-04-04 14:02:13 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-04-04 14:03:33 -0700 |
commit | 2a5512fa3041df96b140e96a30112d5137be8b63 (patch) | |
tree | 3e73629ba36153f846b6ab125308c1779c013d94 /src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java | |
parent | 7520dcce42217c8076b06ed88c0e4e04ed99a0f4 (diff) |
Internal change
PiperOrigin-RevId: 191642942
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java index a615cf76cd..1be61e1f77 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java @@ -151,12 +151,14 @@ final class WorkerSpawnRunner implements SpawnRunner { spawn.getMnemonic(), workerFilesCombinedHash, workerFiles, + inputFiles, + outputFiles, policy.speculating()); WorkRequest workRequest = createWorkRequest(spawn, policy, flagFiles, inputFileCache); long startTime = System.currentTimeMillis(); - WorkResponse response = execInWorker(key, workRequest, policy, inputFiles, outputFiles); + WorkResponse response = execInWorker(key, workRequest, policy); Duration wallTime = Duration.ofMillis(System.currentTimeMillis() - startTime); FileOutErr outErr = policy.getFileOutErr(); @@ -255,12 +257,7 @@ final class WorkerSpawnRunner implements SpawnRunner { } } - private WorkResponse execInWorker( - WorkerKey key, - WorkRequest request, - SpawnExecutionPolicy policy, - Map<PathFragment, Path> inputFiles, - Set<PathFragment> outputFiles) + private WorkResponse execInWorker(WorkerKey key, WorkRequest request, SpawnExecutionPolicy policy) throws InterruptedException, ExecException { Worker worker = null; WorkResponse response; @@ -278,7 +275,7 @@ final class WorkerSpawnRunner implements SpawnRunner { } try { - worker.prepareExecution(inputFiles, outputFiles, key.getWorkerFilesWithHashes().keySet()); + worker.prepareExecution(key); } catch (IOException e) { throw new UserExecException( ErrorMessage.builder() @@ -340,7 +337,7 @@ final class WorkerSpawnRunner implements SpawnRunner { } try { - worker.finishExecution(execRoot); + worker.finishExecution(key); } catch (IOException e) { throw new UserExecException( ErrorMessage.builder() |