171001 2017-04-19 11:30:00 -0700 Another deadlock in CoreAudioCaptureSource 2017-04-20 15:29:46 -0700 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue jer.noble jonlee webkit-bug-importer youennf oldest_to_newest 1298753 0 eric.carlson 2017-04-19 11:30:00 -0700 Fix deadlock in CoreAudioCaptureSource and address comments missed in the review of bug 170771. 1298755 1 webkit-bug-importer 2017-04-19 11:31:39 -0700 <rdar://problem/31712568> 1298757 2 307494 eric.carlson 2017-04-19 11:38:18 -0700 Created attachment 307494 Proposed patch. 1298771 3 307494 youennf 2017-04-19 12:21:00 -0700 Comment on attachment 307494 Proposed patch. r=me with small change discussed directly 1298783 4 307499 eric.carlson 2017-04-19 12:49:12 -0700 Created attachment 307499 Patch for landing. 1298804 5 commit-queue 2017-04-19 13:43:04 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: http/tests/misc/acid3.html bug 165734 (authors: abecsi@webkit.org, arv@chromium.org, mitz@webkit.org, rniwa@webkit.org, and tonyg@chromium.org) The commit-queue is continuing to process your patch. 1298805 6 commit-queue 2017-04-19 13:43:05 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: The commit-queue is continuing to process your patch. 1298816 7 commit-queue 2017-04-19 14:24:23 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-buttons-styles.html bug 168317 (author: graouts@apple.com) The commit-queue is continuing to process your patch. 1298817 8 commit-queue 2017-04-19 14:24:24 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: The commit-queue is continuing to process your patch. 1298843 9 commit-queue 2017-04-19 15:05:53 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1298844 10 commit-queue 2017-04-19 15:05:54 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: The commit-queue is continuing to process your patch. 1298902 11 commit-queue 2017-04-19 16:36:39 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: The commit-queue is continuing to process your patch. 1298905 12 commit-queue 2017-04-19 16:36:58 -0700 The commit-queue encountered the following flaky tests while processing attachment 307499: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1298932 13 307499 commit-queue 2017-04-19 17:53:40 -0700 Comment on attachment 307499 Patch for landing. Clearing flags on attachment: 307499 Committed r215546: <http://trac.webkit.org/changeset/215546> 307494 2017-04-19 11:38:18 -0700 2017-04-20 15:29:46 -0700 Proposed patch. core_audio_deadlock_patch_2.txt text/plain 6380 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTUyMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA0LTE5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFub3RoZXIgZGVhZGxv Y2sgaW4gQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMDAxCisKKyAgICAgICAgRml4IGFub3RoZXIgcmVncmVz c2lvbiBpbnRyb2R1Y2VkIGJ5IHIyMTUyMDEsIHBsdXMgbWFrZSBjaGFuZ2VzIHN1Z2dlc3RlZAor ICAgICAgICBpbiB0aGUgcmV2aWV3IG9mIDE3MDc3MS4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3Jl QXVkaW9DYXB0dXJlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb0NhcHR1 cmVTb3VyY2U6OmNvbmZpZ3VyZVNwZWFrZXJQcm9jKTogQXNzZXJ0IGlmIHRoZSBsb2NrIGlzIG5v IGhlbGQuCisgICAgICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlU291cmNlOjpwcm92aWRl U3BlYWtlckRhdGEpOiBEb24ndCByZXNldCB0aGUgYnVmZmVyLgorICAgICAgICAoV2ViQ29yZTo6 Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vzc01pY3JvcGhvbmVTYW1wbGVzKTogVGFrZSB0 aGUgc3RhdGUgbG9jay4gRG9uJ3QKKyAgICAgICAgcmVzZXQgdGhlIGJ1ZmZlci4gTm8gbW9yZSBt aWNyb3Bob25lIGNhbGxiYWNrcy4KKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb0NhcHR1cmVT b3VyY2U6OnN0b3BQcm9kdWNpbmdEYXRhKTogUmV0dXJuIGVhcmx5IGlmIHRoZSBpbyB1bml0IGlz bid0CisgICAgICAgIHJ1bm5pbmcuIERyb3AgdGhlIGxvY2sgYmVmb3JlIGNhbGxpbmcgc2V0TXV0 ZWQgdG8gYXZvaWQgYW5vdGhlciBkZWFkbG9jay4KKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRp b0NhcHR1cmVTb3VyY2U6OmFkZE1pY3JvcGhvbmVEYXRhQ29uc3VtZXIpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6cmVtb3ZlTWljcm9waG9uZURh dGFDb25zdW1lcik6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaDoKKwogMjAxNy0wNC0xOSAgQnJlbnQgRnVsZ2hhbSAg PGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TLCBtYWNPU10gR3VhcmQgYWdhaW5z dCBwYXNzaW5nIG51bGxwdHIgdG8gdkltYWdlUHJlbXVsdGlwbHlEYXRhCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuY3BwCShyZXZpc2lvbiAyMTU1MTIpCisrKyBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw2ICsxNzAsOCBAQCBPU1N0YXR1cyBDb3JlQXVkaW9D YXB0dXJlU291cmNlOjpjb25maWd1CiAKIE9TU3RhdHVzIENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6 OmNvbmZpZ3VyZVNwZWFrZXJQcm9jKCkKIHsKKyAgICBBU1NFUlQobV9pbnRlcm5hbFN0YXRlTG9j ay5pc0hlbGQoKSk7CisKICAgICBBVVJlbmRlckNhbGxiYWNrU3RydWN0IGNhbGxiYWNrID0geyBz cGVha2VyQ2FsbGJhY2ssIHRoaXMgfTsKICAgICBhdXRvIGVyciA9IEF1ZGlvVW5pdFNldFByb3Bl cnR5KG1faW9Vbml0LCBrQXVkaW9Vbml0UHJvcGVydHlfU2V0UmVuZGVyQ2FsbGJhY2ssIGtBdWRp b1VuaXRTY29wZV9HbG9iYWwsIG91dHB1dEJ1cywgJmNhbGxiYWNrLCBzaXplb2YoY2FsbGJhY2sp KTsKICAgICBpZiAoZXJyKSB7CkBAIC0xOTIsMjAgKzE5NCw2IEBAIE9TU3RhdHVzIENvcmVBdWRp b0NhcHR1cmVTb3VyY2U6OmNvbmZpZ3UKICAgICByZXR1cm4gZXJyOwogfQogCi11aW50NjRfdCBD b3JlQXVkaW9DYXB0dXJlU291cmNlOjphZGRNaWNyb3Bob25lRGF0YUNvbnN1bWVyKE1pY3JvcGhv bmVEYXRhQ2FsbGJhY2smJiBjYWxsYmFjaykKLXsKLSAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4g bG9jayhtX3BlbmRpbmdTb3VyY2VRdWV1ZUxvY2spOwotICAgIG1fbWljcm9waG9uZURhdGFDYWxs YmFja3MuYWRkKCsrbV9uZXh0TWljcm9waG9uZURhdGFDYWxsYmFja0lELCBjYWxsYmFjayk7Ci0K LSAgICByZXR1cm4gbV9uZXh0TWljcm9waG9uZURhdGFDYWxsYmFja0lEOwotfQotCi12b2lkIENv cmVBdWRpb0NhcHR1cmVTb3VyY2U6OnJlbW92ZU1pY3JvcGhvbmVEYXRhQ29uc3VtZXIodWludDY0 X3QgY2FsbGJhY2tJRCkKLXsKLSAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX3BlbmRp bmdTb3VyY2VRdWV1ZUxvY2spOwotICAgIG1fbWljcm9waG9uZURhdGFDYWxsYmFja3MucmVtb3Zl KGNhbGxiYWNrSUQpOwotfSAgICAKLQogdm9pZCBDb3JlQXVkaW9DYXB0dXJlU291cmNlOjphZGRF Y2hvQ2FuY2VsbGF0aW9uU291cmNlKEF1ZGlvU2FtcGxlRGF0YVNvdXJjZSYgc291cmNlKQogewog ICAgIGlmICghc291cmNlLnNldE91dHB1dEZvcm1hdChtX3NwZWFrZXJQcm9jRm9ybWF0KSkgewpA QCAtMjY0LDggKzI1Miw2IEBAIE9TU3RhdHVzIENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnByb3Zp ZGUKICAgICBkb3VibGUgYWRqdXN0ZWRIb3N0VGltZSA9IG1fRFRTQ29udmVyc2lvblJhdGlvICog dGltZVN0YW1wLm1Ib3N0VGltZTsKICAgICB1aW50NjRfdCBzYW1wbGVUaW1lID0gdGltZVN0YW1w Lm1TYW1wbGVUaW1lOwogICAgIGNoZWNrVGltZXN0YW1wcyh0aW1lU3RhbXAsIHNhbXBsZVRpbWUs IGFkanVzdGVkSG9zdFRpbWUpOwotCi0gICAgbV9zcGVha2VyU2FtcGxlQnVmZmVyLT5yZXNldCgp OwogICAgIG1fc3BlYWtlclNhbXBsZUJ1ZmZlci0+c2V0VGltZXMoYWRqdXN0ZWRIb3N0VGltZSwg c2FtcGxlVGltZSk7CiAKICAgICBBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlckxpc3QgPSBtX3NwZWFr ZXJTYW1wbGVCdWZmZXItPmJ1ZmZlckxpc3QoKTsKQEAgLTI5MSwxMCArMjc3LDExIEBAIE9TU3Rh dHVzIENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnNwZWFrZXIKIAogT1NTdGF0dXMgQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZTo6cHJvY2Vzc01pY3JvcGhvbmVTYW1wbGVzKEF1ZGlvVW5pdFJlbmRlckFj dGlvbkZsYWdzJiBpb0FjdGlvbkZsYWdzLCBjb25zdCBBdWRpb1RpbWVTdGFtcCYgdGltZVN0YW1w LCBVSW50MzIgaW5CdXNOdW1iZXIsIFVJbnQzMiBpbk51bWJlckZyYW1lcywgQXVkaW9CdWZmZXJM aXN0KiAvKmlvRGF0YSovKQogeworICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1faW50 ZXJuYWxTdGF0ZUxvY2spOworCiAgICAgKyttX21pY3JvcGhvbmVQcm9jc0NhbGxlZDsKIAogICAg IC8vIFB1bGwgdGhyb3VnaCB0aGUgdnBpbyB1bml0IHRvIG91ciBtaWMgYnVmZmVyLgotICAgIG1f bWljcm9waG9uZVNhbXBsZUJ1ZmZlci0+cmVzZXQoKTsKICAgICBBdWRpb0J1ZmZlckxpc3QmIGJ1 ZmZlckxpc3QgPSBtX21pY3JvcGhvbmVTYW1wbGVCdWZmZXItPmJ1ZmZlckxpc3QoKTsKICAgICBh dXRvIGVyciA9IEF1ZGlvVW5pdFJlbmRlcihtX2lvVW5pdCwgJmlvQWN0aW9uRmxhZ3MsICZ0aW1l U3RhbXAsIGluQnVzTnVtYmVyLCBpbk51bWJlckZyYW1lcywgJmJ1ZmZlckxpc3QpOwogICAgIGlm IChlcnIpIHsKQEAgLTMwNiwxNyArMjkzLDEwIEBAIE9TU3RhdHVzIENvcmVBdWRpb0NhcHR1cmVT b3VyY2U6OnByb2Nlc3MKICAgICB1aW50NjRfdCBzYW1wbGVUaW1lID0gdGltZVN0YW1wLm1TYW1w bGVUaW1lOwogICAgIGNoZWNrVGltZXN0YW1wcyh0aW1lU3RhbXAsIHNhbXBsZVRpbWUsIGFkanVz dGVkSG9zdFRpbWUpOwogICAgIG1fbGF0ZXN0TWljVGltZVN0YW1wID0gc2FtcGxlVGltZTsKLQog ICAgIG1fbWljcm9waG9uZVNhbXBsZUJ1ZmZlci0+c2V0VGltZXMoYWRqdXN0ZWRIb3N0VGltZSwg c2FtcGxlVGltZSk7CiAKICAgICBhdWRpb1NhbXBsZXNBdmFpbGFibGUoTWVkaWFUaW1lKHNhbXBs ZVRpbWUsIG1fbWljcm9waG9uZVByb2NGb3JtYXQuc2FtcGxlUmF0ZSgpKSwgbV9taWNyb3Bob25l U2FtcGxlQnVmZmVyLT5idWZmZXJMaXN0KCksIG1fbWljcm9waG9uZVByb2NGb3JtYXQsIGluTnVt YmVyRnJhbWVzKTsKIAotICAgIGlmIChtX21pY3JvcGhvbmVEYXRhQ2FsbGJhY2tzLmlzRW1wdHko KSkKLSAgICAgICAgcmV0dXJuIDA7Ci0KLSAgICBmb3IgKGF1dG8mIGNhbGxiYWNrIDogbV9taWNy b3Bob25lRGF0YUNhbGxiYWNrcy52YWx1ZXMoKSkKLSAgICAgICAgY2FsbGJhY2soTWVkaWFUaW1l KHNhbXBsZVRpbWUsIG1fbWljcm9waG9uZVByb2NGb3JtYXQuc2FtcGxlUmF0ZSgpKSwgbV9taWNy b3Bob25lU2FtcGxlQnVmZmVyLT5idWZmZXJMaXN0KCksIG1fbWljcm9waG9uZVByb2NGb3JtYXQs IGluTnVtYmVyRnJhbWVzKTsKLQogICAgIHJldHVybiBub0VycjsKIH0KIApAQCAtNDY3LDE3ICs0 NDcsMjAgQEAgdm9pZCBDb3JlQXVkaW9DYXB0dXJlU291cmNlOjpzdGFydFByb2R1YwogCiB2b2lk IENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnN0b3BQcm9kdWNpbmdEYXRhKCkKIHsKLSAgICBzdGQ6 OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2ludGVybmFsU3RhdGVMb2NrKTsKKyAgICB7CisgICAg ICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1faW50ZXJuYWxTdGF0ZUxvY2spOwogCi0g ICAgaWYgKCFtX2lvVW5pdCkKLSAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAoIW1faW9Vbml0 IHx8ICFtX2lvVW5pdFN0YXJ0ZWQpCisgICAgICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIGVy ciA9IEF1ZGlvT3V0cHV0VW5pdFN0b3AobV9pb1VuaXQpOwotICAgIGlmIChlcnIpIHsKLSAgICAg ICAgTE9HKE1lZGlhLCAiQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3RvcCglcCkgQXVkaW9PdXRw dXRVbml0U3RvcCBmYWlsZWQgd2l0aCBlcnJvciAlZCAoJS40cykiLCB0aGlzLCAoaW50KWVyciwg KGNoYXIqKSZlcnIpOwotICAgICAgICByZXR1cm47CisgICAgICAgIGF1dG8gZXJyID0gQXVkaW9P dXRwdXRVbml0U3RvcChtX2lvVW5pdCk7CisgICAgICAgIGlmIChlcnIpIHsKKyAgICAgICAgICAg IExPRyhNZWRpYSwgIkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnN0b3AoJXApIEF1ZGlvT3V0cHV0 VW5pdFN0b3AgZmFpbGVkIHdpdGggZXJyb3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChj aGFyKikmZXJyKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBtX2lv VW5pdFN0YXJ0ZWQgPSBmYWxzZTsKICAgICB9Ci0gICAgbV9pb1VuaXRTdGFydGVkID0gZmFsc2U7 CisKICAgICBzZXRNdXRlZCh0cnVlKTsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVBdWRpb0NhcHR1cmVTb3VyY2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVy ZVNvdXJjZS5oCShyZXZpc2lvbiAyMTU1MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t ZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xMTUsOSArMTE1LDYgQEAgcHJpdmF0ZToKICAgICB1aW50NjRfdCBtX21pY3JvcGhvbmVQcm9j c0NhbGxlZCB7IDAgfTsKICAgICB1aW50NjRfdCBtX2xhdGVzdE1pY1RpbWVTdGFtcCB7IDAgfTsK IAotICAgIEhhc2hNYXA8dWludDY0X3QsIE1pY3JvcGhvbmVEYXRhQ2FsbGJhY2s+IG1fbWljcm9w aG9uZURhdGFDYWxsYmFja3M7Ci0gICAgdWludDY0X3QgbV9uZXh0TWljcm9waG9uZURhdGFDYWxs YmFja0lEIHsgMCB9OwotCiAgICAgQ0FBdWRpb1N0cmVhbURlc2NyaXB0aW9uIG1fc3BlYWtlclBy b2NGb3JtYXQ7CiAgICAgUmVmUHRyPEF1ZGlvU2FtcGxlQnVmZmVyTGlzdD4gbV9zcGVha2VyU2Ft cGxlQnVmZmVyOwogICAgIHVpbnQ2NF90IG1fc3BlYWtlclByb2NzQ2FsbGVkIHsgMCB9Owo= 307499 2017-04-19 12:49:12 -0700 2017-04-19 17:53:40 -0700 Patch for landing. core_audio_deadlock_patch_3.txt text/plain 6356 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTUyNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA0LTE5ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIEFub3RoZXIgZGVhZGxv Y2sgaW4gQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxMDAxCisKKyAgICAgICAgRml4IGFub3RoZXIgcmVncmVz c2lvbiBpbnRyb2R1Y2VkIGJ5IHIyMTUyMDEsIHBsdXMgbWFrZSBjaGFuZ2VzIHN1Z2dlc3RlZAor ICAgICAgICBpbiB0aGUgcmV2aWV3IG9mIDE3MDc3MS4KKworICAgICAgICBSZXZpZXdlZCBieSBZ b3Vlbm4gRmFibGV0LgorCisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVB dWRpb0NhcHR1cmVTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVy ZVNvdXJjZTo6Y29uZmlndXJlU3BlYWtlclByb2MpOiBBc3NlcnQgaWYgdGhlIGxvY2sgaXMgbm8g aGVsZC4KKyAgICAgICAgKFdlYkNvcmU6OkNvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnByb3ZpZGVT cGVha2VyRGF0YSk6IERvbid0IHJlc2V0IHRoZSBidWZmZXIuCisgICAgICAgIChXZWJDb3JlOjpD b3JlQXVkaW9DYXB0dXJlU291cmNlOjpwcm9jZXNzTWljcm9waG9uZVNhbXBsZXMpOiBUYWtlIHRo ZSBzdGF0ZSBsb2NrLiBEb24ndAorICAgICAgICByZXNldCB0aGUgYnVmZmVyLiBObyBtb3JlIG1p Y3JvcGhvbmUgY2FsbGJhY2tzLgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlvQ2FwdHVyZVNv dXJjZTo6c3RvcFByb2R1Y2luZ0RhdGEpOiBSZXR1cm4gZWFybHkgaWYgdGhlIGlvIHVuaXQgaXNu J3QKKyAgICAgICAgcnVubmluZy4gRHJvcCB0aGUgbG9jayBiZWZvcmUgY2FsbGluZyBzZXRNdXRl ZCB0byBhdm9pZCBhbm90aGVyIGRlYWRsb2NrLgorICAgICAgICAoV2ViQ29yZTo6Q29yZUF1ZGlv Q2FwdHVyZVNvdXJjZTo6YWRkTWljcm9waG9uZURhdGFDb25zdW1lcik6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpDb3JlQXVkaW9DYXB0dXJlU291cmNlOjpyZW1vdmVNaWNyb3Bob25lRGF0 YUNvbnN1bWVyKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5oOgorCiAyMDE3LTA0LTE5ICBCcmVudCBGdWxnaGFtICA8 YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1MsIG1hY09TXSBHdWFyZCBhZ2FpbnN0 IHBhc3NpbmcgbnVsbHB0ciB0byB2SW1hZ2VQcmVtdWx0aXBseURhdGEKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5jcHAJKHJldmlzaW9uIDIxNTUxMikKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9Db3JlQXVkaW9DYXB0dXJlU291cmNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTcwLDYgKzE3MCw4IEBAIE9TU3RhdHVzIENvcmVBdWRpb0Nh cHR1cmVTb3VyY2U6OmNvbmZpZ3UKIAogT1NTdGF0dXMgQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6 Y29uZmlndXJlU3BlYWtlclByb2MoKQogeworICAgIEFTU0VSVChtX2ludGVybmFsU3RhdGVMb2Nr LmlzSGVsZCgpKTsKKwogICAgIEFVUmVuZGVyQ2FsbGJhY2tTdHJ1Y3QgY2FsbGJhY2sgPSB7IHNw ZWFrZXJDYWxsYmFjaywgdGhpcyB9OwogICAgIGF1dG8gZXJyID0gQXVkaW9Vbml0U2V0UHJvcGVy dHkobV9pb1VuaXQsIGtBdWRpb1VuaXRQcm9wZXJ0eV9TZXRSZW5kZXJDYWxsYmFjaywga0F1ZGlv VW5pdFNjb3BlX0dsb2JhbCwgb3V0cHV0QnVzLCAmY2FsbGJhY2ssIHNpemVvZihjYWxsYmFjaykp OwogICAgIGlmIChlcnIpIHsKQEAgLTE5MiwyMCArMTk0LDYgQEAgT1NTdGF0dXMgQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZTo6Y29uZmlndQogICAgIHJldHVybiBlcnI7CiB9CiAKLXVpbnQ2NF90IENv cmVBdWRpb0NhcHR1cmVTb3VyY2U6OmFkZE1pY3JvcGhvbmVEYXRhQ29uc3VtZXIoTWljcm9waG9u ZURhdGFDYWxsYmFjayYmIGNhbGxiYWNrKQotewotICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBs b2NrKG1fcGVuZGluZ1NvdXJjZVF1ZXVlTG9jayk7Ci0gICAgbV9taWNyb3Bob25lRGF0YUNhbGxi YWNrcy5hZGQoKyttX25leHRNaWNyb3Bob25lRGF0YUNhbGxiYWNrSUQsIGNhbGxiYWNrKTsKLQot ICAgIHJldHVybiBtX25leHRNaWNyb3Bob25lRGF0YUNhbGxiYWNrSUQ7Ci19Ci0KLXZvaWQgQ29y ZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6cmVtb3ZlTWljcm9waG9uZURhdGFDb25zdW1lcih1aW50NjRf dCBjYWxsYmFja0lEKQotewotICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fcGVuZGlu Z1NvdXJjZVF1ZXVlTG9jayk7Ci0gICAgbV9taWNyb3Bob25lRGF0YUNhbGxiYWNrcy5yZW1vdmUo Y2FsbGJhY2tJRCk7Ci19ICAgIAotCiB2b2lkIENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OmFkZEVj aG9DYW5jZWxsYXRpb25Tb3VyY2UoQXVkaW9TYW1wbGVEYXRhU291cmNlJiBzb3VyY2UpCiB7CiAg ICAgaWYgKCFzb3VyY2Uuc2V0T3V0cHV0Rm9ybWF0KG1fc3BlYWtlclByb2NGb3JtYXQpKSB7CkBA IC0yNjQsOCArMjUyLDYgQEAgT1NTdGF0dXMgQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6cHJvdmlk ZQogICAgIGRvdWJsZSBhZGp1c3RlZEhvc3RUaW1lID0gbV9EVFNDb252ZXJzaW9uUmF0aW8gKiB0 aW1lU3RhbXAubUhvc3RUaW1lOwogICAgIHVpbnQ2NF90IHNhbXBsZVRpbWUgPSB0aW1lU3RhbXAu bVNhbXBsZVRpbWU7CiAgICAgY2hlY2tUaW1lc3RhbXBzKHRpbWVTdGFtcCwgc2FtcGxlVGltZSwg YWRqdXN0ZWRIb3N0VGltZSk7Ci0KLSAgICBtX3NwZWFrZXJTYW1wbGVCdWZmZXItPnJlc2V0KCk7 CiAgICAgbV9zcGVha2VyU2FtcGxlQnVmZmVyLT5zZXRUaW1lcyhhZGp1c3RlZEhvc3RUaW1lLCBz YW1wbGVUaW1lKTsKIAogICAgIEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlzdCA9IG1fc3BlYWtl clNhbXBsZUJ1ZmZlci0+YnVmZmVyTGlzdCgpOwpAQCAtMjkxLDEwICsyNzcsMTEgQEAgT1NTdGF0 dXMgQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3BlYWtlcgogCiBPU1N0YXR1cyBDb3JlQXVkaW9D YXB0dXJlU291cmNlOjpwcm9jZXNzTWljcm9waG9uZVNhbXBsZXMoQXVkaW9Vbml0UmVuZGVyQWN0 aW9uRmxhZ3MmIGlvQWN0aW9uRmxhZ3MsIGNvbnN0IEF1ZGlvVGltZVN0YW1wJiB0aW1lU3RhbXAs IFVJbnQzMiBpbkJ1c051bWJlciwgVUludDMyIGluTnVtYmVyRnJhbWVzLCBBdWRpb0J1ZmZlckxp c3QqIC8qaW9EYXRhKi8pCiB7CisgICAgc3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9pbnRl cm5hbFN0YXRlTG9jayk7CisKICAgICArK21fbWljcm9waG9uZVByb2NzQ2FsbGVkOwogCiAgICAg Ly8gUHVsbCB0aHJvdWdoIHRoZSB2cGlvIHVuaXQgdG8gb3VyIG1pYyBidWZmZXIuCi0gICAgbV9t aWNyb3Bob25lU2FtcGxlQnVmZmVyLT5yZXNldCgpOwogICAgIEF1ZGlvQnVmZmVyTGlzdCYgYnVm ZmVyTGlzdCA9IG1fbWljcm9waG9uZVNhbXBsZUJ1ZmZlci0+YnVmZmVyTGlzdCgpOwogICAgIGF1 dG8gZXJyID0gQXVkaW9Vbml0UmVuZGVyKG1faW9Vbml0LCAmaW9BY3Rpb25GbGFncywgJnRpbWVT dGFtcCwgaW5CdXNOdW1iZXIsIGluTnVtYmVyRnJhbWVzLCAmYnVmZmVyTGlzdCk7CiAgICAgaWYg KGVycikgewpAQCAtMzA2LDE3ICsyOTMsMTAgQEAgT1NTdGF0dXMgQ29yZUF1ZGlvQ2FwdHVyZVNv dXJjZTo6cHJvY2VzcwogICAgIHVpbnQ2NF90IHNhbXBsZVRpbWUgPSB0aW1lU3RhbXAubVNhbXBs ZVRpbWU7CiAgICAgY2hlY2tUaW1lc3RhbXBzKHRpbWVTdGFtcCwgc2FtcGxlVGltZSwgYWRqdXN0 ZWRIb3N0VGltZSk7CiAgICAgbV9sYXRlc3RNaWNUaW1lU3RhbXAgPSBzYW1wbGVUaW1lOwotCiAg ICAgbV9taWNyb3Bob25lU2FtcGxlQnVmZmVyLT5zZXRUaW1lcyhhZGp1c3RlZEhvc3RUaW1lLCBz YW1wbGVUaW1lKTsKIAogICAgIGF1ZGlvU2FtcGxlc0F2YWlsYWJsZShNZWRpYVRpbWUoc2FtcGxl VGltZSwgbV9taWNyb3Bob25lUHJvY0Zvcm1hdC5zYW1wbGVSYXRlKCkpLCBtX21pY3JvcGhvbmVT YW1wbGVCdWZmZXItPmJ1ZmZlckxpc3QoKSwgbV9taWNyb3Bob25lUHJvY0Zvcm1hdCwgaW5OdW1i ZXJGcmFtZXMpOwogCi0gICAgaWYgKG1fbWljcm9waG9uZURhdGFDYWxsYmFja3MuaXNFbXB0eSgp KQotICAgICAgICByZXR1cm4gMDsKLQotICAgIGZvciAoYXV0byYgY2FsbGJhY2sgOiBtX21pY3Jv cGhvbmVEYXRhQ2FsbGJhY2tzLnZhbHVlcygpKQotICAgICAgICBjYWxsYmFjayhNZWRpYVRpbWUo c2FtcGxlVGltZSwgbV9taWNyb3Bob25lUHJvY0Zvcm1hdC5zYW1wbGVSYXRlKCkpLCBtX21pY3Jv cGhvbmVTYW1wbGVCdWZmZXItPmJ1ZmZlckxpc3QoKSwgbV9taWNyb3Bob25lUHJvY0Zvcm1hdCwg aW5OdW1iZXJGcmFtZXMpOwotCiAgICAgcmV0dXJuIG5vRXJyOwogfQogCkBAIC00NjcsMTcgKzQ0 NywyMCBAQCB2b2lkIENvcmVBdWRpb0NhcHR1cmVTb3VyY2U6OnN0YXJ0UHJvZHVjCiAKIHZvaWQg Q29yZUF1ZGlvQ2FwdHVyZVNvdXJjZTo6c3RvcFByb2R1Y2luZ0RhdGEoKQogewotICAgIHN0ZDo6 bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1faW50ZXJuYWxTdGF0ZUxvY2spOwotCi0gICAgaWYgKCFt X2lvVW5pdCkKKyAgICBpZiAoIW1faW9Vbml0IHx8ICFtX2lvVW5pdFN0YXJ0ZWQpCiAgICAgICAg IHJldHVybjsKIAotICAgIGF1dG8gZXJyID0gQXVkaW9PdXRwdXRVbml0U3RvcChtX2lvVW5pdCk7 Ci0gICAgaWYgKGVycikgewotICAgICAgICBMT0coTWVkaWEsICJDb3JlQXVkaW9DYXB0dXJlU291 cmNlOjpzdG9wKCVwKSBBdWRpb091dHB1dFVuaXRTdG9wIGZhaWxlZCB3aXRoIGVycm9yICVkICgl LjRzKSIsIHRoaXMsIChpbnQpZXJyLCAoY2hhciopJmVycik7Ci0gICAgICAgIHJldHVybjsKKyAg ICB7CisgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1faW50ZXJuYWxTdGF0ZUxv Y2spOworCisgICAgICAgIGF1dG8gZXJyID0gQXVkaW9PdXRwdXRVbml0U3RvcChtX2lvVW5pdCk7 CisgICAgICAgIGlmIChlcnIpIHsKKyAgICAgICAgICAgIExPRyhNZWRpYSwgIkNvcmVBdWRpb0Nh cHR1cmVTb3VyY2U6OnN0b3AoJXApIEF1ZGlvT3V0cHV0VW5pdFN0b3AgZmFpbGVkIHdpdGggZXJy b3IgJWQgKCUuNHMpIiwgdGhpcywgKGludCllcnIsIChjaGFyKikmZXJyKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBtX2lvVW5pdFN0YXJ0ZWQgPSBmYWxzZTsKICAg ICB9Ci0gICAgbV9pb1VuaXRTdGFydGVkID0gZmFsc2U7CisKICAgICBzZXRNdXRlZCh0cnVlKTsK IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0NvcmVB dWRpb0NhcHR1cmVTb3VyY2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlvQ2FwdHVyZVNvdXJjZS5oCShyZXZpc2lvbiAyMTU1 MTIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQ29yZUF1ZGlv Q2FwdHVyZVNvdXJjZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsOSArMTE1LDYgQEAgcHJpdmF0 ZToKICAgICB1aW50NjRfdCBtX21pY3JvcGhvbmVQcm9jc0NhbGxlZCB7IDAgfTsKICAgICB1aW50 NjRfdCBtX2xhdGVzdE1pY1RpbWVTdGFtcCB7IDAgfTsKIAotICAgIEhhc2hNYXA8dWludDY0X3Qs IE1pY3JvcGhvbmVEYXRhQ2FsbGJhY2s+IG1fbWljcm9waG9uZURhdGFDYWxsYmFja3M7Ci0gICAg dWludDY0X3QgbV9uZXh0TWljcm9waG9uZURhdGFDYWxsYmFja0lEIHsgMCB9OwotCiAgICAgQ0FB dWRpb1N0cmVhbURlc2NyaXB0aW9uIG1fc3BlYWtlclByb2NGb3JtYXQ7CiAgICAgUmVmUHRyPEF1 ZGlvU2FtcGxlQnVmZmVyTGlzdD4gbV9zcGVha2VyU2FtcGxlQnVmZmVyOwogICAgIHVpbnQ2NF90 IG1fc3BlYWtlclByb2NzQ2FsbGVkIHsgMCB9Owo=