{"action":"created","comment":{"url":"https://api.github.com/repos/apple/swift/pulls/comments/185159712","pull_request_review_id":116493061,"id":185159712,"diff_hunk":"@@ -320,164 +321,320 @@ void TaskQueue::addTask(const char *ExecPath, ArrayRef<const char *> Args,\n   QueuedTasks.push(std::move(T));\n }\n \n-bool TaskQueue::execute(TaskBeganCallback Began, TaskFinishedCallback Finished,\n-                        TaskSignalledCallback Signalled) {\n+// Owns Tasks, handles correspondence with FDs and pids.\n+// FIXME: only handles stdout fds.\n+class TaskMap {\n+  using PidToTaskMap = llvm::DenseMap<pid_t, std::unique_ptr<Task>>;\n+  PidToTaskMap TasksByPid;\n+\n+public:\n+  TaskMap() = default;\n+\n+  bool empty() const { return TasksByPid.empty(); }\n+  unsigned size() const { return TasksByPid.size(); }\n+\n+  void add(std::unique_ptr<Task> T) { TasksByPid[T->getPid()] = std::move(T); }\n+\n+  Task &findTaskForFd(const int fd) {\n+    auto predicate = [&fd](PidToTaskMap::value_type &value) -> bool {\n+      return value.second->getPipe() == fd;\n+    };\n+    auto iter = std::find_if(TasksByPid.begin(), TasksByPid.end(), predicate);\n+    assert(iter != TasksByPid.end() &&\n+           \"All outstanding fds must be associated with a  Task\");\n+    return *iter->second;\n+  }\n+\n+  void eraseTask(Task &T) { TasksByPid.erase(T.getPid()); }\n+};\n+\n+/// Concurrently execute the tasks in the TaskQueue, collecting the outputs from\n+/// each task. The typical task is a Swift frontend job.\n+/// Maintain invarients connecting tasks to execute, tasks currently executing,\n+/// and fds being polled. Handle output from and death of tasks.\n+class TaskShepherd {","path":"lib/Basic/Unix/TaskQueue.inc","position":224,"original_position":224,"commit_id":"3adf427dbd58e6e476ed534b10608d80ce2845c8","original_commit_id":"3adf427dbd58e6e476ed534b10608d80ce2845c8","user":{"login":"jrose-apple","id":15097531,"avatar_url":"https://avatars2.githubusercontent.com/u/15097531?v=4","gravatar_id":"","url":"https://api.github.com/users/jrose-apple","html_url":"https://github.com/jrose-apple","followers_url":"https://api.github.com/users/jrose-apple/followers","following_url":"https://api.github.com/users/jrose-apple/following{/other_user}","gists_url":"https://api.github.com/users/jrose-apple/gists{/gist_id}","starred_url":"https://api.github.com/users/jrose-apple/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jrose-apple/subscriptions","organizations_url":"https://api.github.com/users/jrose-apple/orgs","repos_url":"https://api.github.com/users/jrose-apple/repos","events_url":"https://api.github.com/users/jrose-apple/events{/privacy}","received_events_url":"https://api.github.com/users/jrose-apple/received_events","type":"User","site_admin":false},"body":"Can you make it clearer why the TaskShepherd is separate from the TaskQueue at all?","created_at":"2018-05-01T03:04:28Z","updated_at":"2018-05-01T03:05:00Z","html_url":"https://github.com/apple/swift/pull/15994#discussion_r185159712","pull_request_url":"https://api.github.com/repos/apple/swift/pulls/15994","author_association":"OWNER","_links":{"self":{"href":"https://api.github.com/repos/apple/swift/pulls/comments/185159712"},"html":{"href":"https://github.com/apple/swift/pull/15994#discussion_r185159712"},"pull_request":{"href":"https://api.github.com/repos/apple/swift/pulls/15994"}}},"pull_request":{"url":"https://api.github.com/repos/apple/swift/pulls/15994","id":182319976,"html_url":"https://github.com/apple/swift/pull/15994","diff_url":"https://github.com/apple/swift/pull/15994.diff","patch_url":"https://github.com/apple/swift/pull/15994.patch","issue_url":"https://api.github.com/repos/apple/swift/issues/15994","number":15994,"state":"open","locked":false,"title":"[Batch mode] WIP, NFC: Refactor TaskQueue code in preparation for better output absorption.","user":{"login":"davidungar","id":461264,"avatar_url":"https://avatars1.githubusercontent.com/u/461264?v=4","gravatar_id":"","url":"https://api.github.com/users/davidungar","html_url":"https://github.com/davidungar","followers_url":"https://api.github.com/users/davidungar/followers","following_url":"https://api.github.com/users/davidungar/following{/other_user}","gists_url":"https://api.github.com/users/davidungar/gists{/gist_id}","starred_url":"https://api.github.com/users/davidungar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/davidungar/subscriptions","organizations_url":"https://api.github.com/users/davidungar/orgs","repos_url":"https://api.github.com/users/davidungar/repos","events_url":"https://api.github.com/users/davidungar/events{/privacy}","received_events_url":"https://api.github.com/users/davidungar/received_events","type":"User","site_admin":false},"body":"<!-- What's in this pull request? -->\r\n\r\n\r\n<!-- If this pull request resolves any bugs in the Swift bug tracker, provide a link: -->\r\n\r\n\r\n<!--\r\nBefore merging this pull request, you must run the Swift continuous integration tests.\r\nFor information about triggering CI builds via @swift-ci, see:\r\nhttps://github.com/apple/swift/blob/master/docs/ContinuousIntegration.md#swift-ci\r\n\r\nThank you for your contribution to Swift!\r\n-->\r\n","created_at":"2018-04-17T22:17:47Z","updated_at":"2018-05-01T03:05:00Z","closed_at":null,"merged_at":null,"merge_commit_sha":"b68dd8ef3d9bc96720bb16b0be96b115ca351016","assignee":null,"assignees":[],"requested_reviewers":[{"login":"graydon","id":14097,"avatar_url":"https://avatars3.githubusercontent.com/u/14097?v=4","gravatar_id":"","url":"https://api.github.com/users/graydon","html_url":"https://github.com/graydon","followers_url":"https://api.github.com/users/graydon/followers","following_url":"https://api.github.com/users/graydon/following{/other_user}","gists_url":"https://api.github.com/users/graydon/gists{/gist_id}","starred_url":"https://api.github.com/users/graydon/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/graydon/subscriptions","organizations_url":"https://api.github.com/users/graydon/orgs","repos_url":"https://api.github.com/users/graydon/repos","events_url":"https://api.github.com/users/graydon/events{/privacy}","received_events_url":"https://api.github.com/users/graydon/received_events","type":"User","site_admin":false}],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/apple/swift/pulls/15994/commits","review_comments_url":"https://api.github.com/repos/apple/swift/pulls/15994/comments","review_comment_url":"https://api.github.com/repos/apple/swift/pulls/comments{/number}","comments_url":"https://api.github.com/repos/apple/swift/issues/15994/comments","statuses_url":"https://api.github.com/repos/apple/swift/statuses/3adf427dbd58e6e476ed534b10608d80ce2845c8","head":{"label":"davidungar:PR-18-TaskQueue-refactor","ref":"PR-18-TaskQueue-refactor","sha":"3adf427dbd58e6e476ed534b10608d80ce2845c8","user":{"login":"davidungar","id":461264,"avatar_url":"https://avatars1.githubusercontent.com/u/461264?v=4","gravatar_id":"","url":"https://api.github.com/users/davidungar","html_url":"https://github.com/davidungar","followers_url":"https://api.github.com/users/davidungar/followers","following_url":"https://api.github.com/users/davidungar/following{/other_user}","gists_url":"https://api.github.com/users/davidungar/gists{/gist_id}","starred_url":"https://api.github.com/users/davidungar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/davidungar/subscriptions","organizations_url":"https://api.github.com/users/davidungar/orgs","repos_url":"https://api.github.com/users/davidungar/repos","events_url":"https://api.github.com/users/davidungar/events{/privacy}","received_events_url":"https://api.github.com/users/davidungar/received_events","type":"User","site_admin":false},"repo":{"id":100639829,"name":"swift","full_name":"davidungar/swift","owner":{"login":"davidungar","id":461264,"avatar_url":"https://avatars1.githubusercontent.com/u/461264?v=4","gravatar_id":"","url":"https://api.github.com/users/davidungar","html_url":"https://github.com/davidungar","followers_url":"https://api.github.com/users/davidungar/followers","following_url":"https://api.github.com/users/davidungar/following{/other_user}","gists_url":"https://api.github.com/users/davidungar/gists{/gist_id}","starred_url":"https://api.github.com/users/davidungar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/davidungar/subscriptions","organizations_url":"https://api.github.com/users/davidungar/orgs","repos_url":"https://api.github.com/users/davidungar/repos","events_url":"https://api.github.com/users/davidungar/events{/privacy}","received_events_url":"https://api.github.com/users/davidungar/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/davidungar/swift","description":"The Swift Programming Language","fork":true,"url":"https://api.github.com/repos/davidungar/swift","forks_url":"https://api.github.com/repos/davidungar/swift/forks","keys_url":"https://api.github.com/repos/davidungar/swift/keys{/key_id}","collaborators_url":"https://api.github.com/repos/davidungar/swift/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/davidungar/swift/teams","hooks_url":"https://api.github.com/repos/davidungar/swift/hooks","issue_events_url":"https://api.github.com/repos/davidungar/swift/issues/events{/number}","events_url":"https://api.github.com/repos/davidungar/swift/events","assignees_url":"https://api.github.com/repos/davidungar/swift/assignees{/user}","branches_url":"https://api.github.com/repos/davidungar/swift/branches{/branch}","tags_url":"https://api.github.com/repos/davidungar/swift/tags","blobs_url":"https://api.github.com/repos/davidungar/swift/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/davidungar/swift/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/davidungar/swift/git/refs{/sha}","trees_url":"https://api.github.com/repos/davidungar/swift/git/trees{/sha}","statuses_url":"https://api.github.com/repos/davidungar/swift/statuses/{sha}","languages_url":"https://api.github.com/repos/davidungar/swift/languages","stargazers_url":"https://api.github.com/repos/davidungar/swift/stargazers","contributors_url":"https://api.github.com/repos/davidungar/swift/contributors","subscribers_url":"https://api.github.com/repos/davidungar/swift/subscribers","subscription_url":"https://api.github.com/repos/davidungar/swift/subscription","commits_url":"https://api.github.com/repos/davidungar/swift/commits{/sha}","git_commits_url":"https://api.github.com/repos/davidungar/swift/git/commits{/sha}","comments_url":"https://api.github.com/repos/davidungar/swift/comments{/number}","issue_comment_url":"https://api.github.com/repos/davidungar/swift/issues/comments{/number}","contents_url":"https://api.github.com/repos/davidungar/swift/contents/{+path}","compare_url":"https://api.github.com/repos/davidungar/swift/compare/{base}...{head}","merges_url":"https://api.github.com/repos/davidungar/swift/merges","archive_url":"https://api.github.com/repos/davidungar/swift/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/davidungar/swift/downloads","issues_url":"https://api.github.com/repos/davidungar/swift/issues{/number}","pulls_url":"https://api.github.com/repos/davidungar/swift/pulls{/number}","milestones_url":"https://api.github.com/repos/davidungar/swift/milestones{/number}","notifications_url":"https://api.github.com/repos/davidungar/swift/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/davidungar/swift/labels{/name}","releases_url":"https://api.github.com/repos/davidungar/swift/releases{/id}","deployments_url":"https://api.github.com/repos/davidungar/swift/deployments","created_at":"2017-08-17T19:50:47Z","updated_at":"2017-08-17T19:51:19Z","pushed_at":"2018-05-01T01:02:45Z","git_url":"git://github.com/davidungar/swift.git","ssh_url":"git@github.com:davidungar/swift.git","clone_url":"https://github.com/davidungar/swift.git","svn_url":"https://github.com/davidungar/swift","homepage":"https://swift.org/","size":278350,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"apple:master","ref":"master","sha":"cfaf5997232f9ecf92beb54d53935c9d039b9554","user":{"login":"apple","id":10639145,"avatar_url":"https://avatars0.githubusercontent.com/u/10639145?v=4","gravatar_id":"","url":"https://api.github.com/users/apple","html_url":"https://github.com/apple","followers_url":"https://api.github.com/users/apple/followers","following_url":"https://api.github.com/users/apple/following{/other_user}","gists_url":"https://api.github.com/users/apple/gists{/gist_id}","starred_url":"https://api.github.com/users/apple/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apple/subscriptions","organizations_url":"https://api.github.com/users/apple/orgs","repos_url":"https://api.github.com/users/apple/repos","events_url":"https://api.github.com/users/apple/events{/privacy}","received_events_url":"https://api.github.com/users/apple/received_events","type":"Organization","site_admin":false},"repo":{"id":44838949,"name":"swift","full_name":"apple/swift","owner":{"login":"apple","id":10639145,"avatar_url":"https://avatars0.githubusercontent.com/u/10639145?v=4","gravatar_id":"","url":"https://api.github.com/users/apple","html_url":"https://github.com/apple","followers_url":"https://api.github.com/users/apple/followers","following_url":"https://api.github.com/users/apple/following{/other_user}","gists_url":"https://api.github.com/users/apple/gists{/gist_id}","starred_url":"https://api.github.com/users/apple/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apple/subscriptions","organizations_url":"https://api.github.com/users/apple/orgs","repos_url":"https://api.github.com/users/apple/repos","events_url":"https://api.github.com/users/apple/events{/privacy}","received_events_url":"https://api.github.com/users/apple/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/apple/swift","description":"The Swift Programming Language","fork":false,"url":"https://api.github.com/repos/apple/swift","forks_url":"https://api.github.com/repos/apple/swift/forks","keys_url":"https://api.github.com/repos/apple/swift/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apple/swift/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apple/swift/teams","hooks_url":"https://api.github.com/repos/apple/swift/hooks","issue_events_url":"https://api.github.com/repos/apple/swift/issues/events{/number}","events_url":"https://api.github.com/repos/apple/swift/events","assignees_url":"https://api.github.com/repos/apple/swift/assignees{/user}","branches_url":"https://api.github.com/repos/apple/swift/branches{/branch}","tags_url":"https://api.github.com/repos/apple/swift/tags","blobs_url":"https://api.github.com/repos/apple/swift/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apple/swift/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apple/swift/git/refs{/sha}","trees_url":"https://api.github.com/repos/apple/swift/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apple/swift/statuses/{sha}","languages_url":"https://api.github.com/repos/apple/swift/languages","stargazers_url":"https://api.github.com/repos/apple/swift/stargazers","contributors_url":"https://api.github.com/repos/apple/swift/contributors","subscribers_url":"https://api.github.com/repos/apple/swift/subscribers","subscription_url":"https://api.github.com/repos/apple/swift/subscription","commits_url":"https://api.github.com/repos/apple/swift/commits{/sha}","git_commits_url":"https://api.github.com/repos/apple/swift/git/commits{/sha}","comments_url":"https://api.github.com/repos/apple/swift/comments{/number}","issue_comment_url":"https://api.github.com/repos/apple/swift/issues/comments{/number}","contents_url":"https://api.github.com/repos/apple/swift/contents/{+path}","compare_url":"https://api.github.com/repos/apple/swift/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apple/swift/merges","archive_url":"https://api.github.com/repos/apple/swift/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apple/swift/downloads","issues_url":"https://api.github.com/repos/apple/swift/issues{/number}","pulls_url":"https://api.github.com/repos/apple/swift/pulls{/number}","milestones_url":"https://api.github.com/repos/apple/swift/milestones{/number}","notifications_url":"https://api.github.com/repos/apple/swift/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apple/swift/labels{/name}","releases_url":"https://api.github.com/repos/apple/swift/releases{/id}","deployments_url":"https://api.github.com/repos/apple/swift/deployments","created_at":"2015-10-23T21:15:07Z","updated_at":"2018-05-01T02:58:42Z","pushed_at":"2018-05-01T02:57:43Z","git_url":"git://github.com/apple/swift.git","ssh_url":"git@github.com:apple/swift.git","clone_url":"https://github.com/apple/swift.git","svn_url":"https://github.com/apple/swift","homepage":"https://swift.org/","size":283370,"stargazers_count":43664,"watchers_count":43664,"language":"C++","has_issues":false,"has_projects":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":6841,"mirror_url":null,"archived":false,"open_issues_count":325,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0"},"forks":6841,"open_issues":325,"watchers":43664,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/apple/swift/pulls/15994"},"html":{"href":"https://github.com/apple/swift/pull/15994"},"issue":{"href":"https://api.github.com/repos/apple/swift/issues/15994"},"comments":{"href":"https://api.github.com/repos/apple/swift/issues/15994/comments"},"review_comments":{"href":"https://api.github.com/repos/apple/swift/pulls/15994/comments"},"review_comment":{"href":"https://api.github.com/repos/apple/swift/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/apple/swift/pulls/15994/commits"},"statuses":{"href":"https://api.github.com/repos/apple/swift/statuses/3adf427dbd58e6e476ed534b10608d80ce2845c8"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"jrose-apple"}}