179127 2017-11-01 10:51:13 -0700 [Curl] Make the order of scheduler sequential when handling registration and cancellation 2017-11-15 12:26:12 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham buildbot commit-queue don.olmstead galpeter pvollan rniwa webkit-bug-importer oldest_to_newest 1366908 0 basuke 2017-11-01 10:51:13 -0700 The scheduler currently has different queues for starting jobs and cancellation jobs to sync with main thread and worker thread. It should be handle sequential for registering the starting job and canceling the job. 1366914 1 325592 basuke 2017-11-01 10:55:53 -0700 Created attachment 325592 patch 1367234 2 325592 commit-queue 2017-11-01 22:55:10 -0700 Comment on attachment 325592 patch Clearing flags on attachment: 325592 Committed r224322: <https://trac.webkit.org/changeset/224322> 1367235 3 commit-queue 2017-11-01 22:55:12 -0700 All reviewed patches have been landed. Closing bug. 1372144 4 webkit-bug-importer 2017-11-15 12:26:12 -0800 <rdar://problem/35567527> 325592 2017-11-01 10:55:53 -0700 2017-11-01 22:55:10 -0700 patch bug-179127.diff text/plain 10063 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyZDJhNmM5NjgyYy4uYzg1YmM3ZmUxYTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAxNy0xMS0wMSAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIE1ha2UgdGhlIG9yZGVyIG9mIHNjaGVkdWxlciBqb2Ig aGFuZGxpbmcgc2VxdWVudGlhbCAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3OTEyNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0U2NoZWR1bGVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0U2NoZWR1bGVyOjphZGQpOgorICAg ICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3RTY2hlZHVsZXI6OmNhbmNlbCk6CisgICAgICAgIChX ZWJDb3JlOjpDdXJsUmVxdWVzdFNjaGVkdWxlcjo6c3RvcFRocmVhZElmTm9Nb3JlSm9iUnVubmlu Zyk6CisgICAgICAgIChXZWJDb3JlOjpDdXJsUmVxdWVzdFNjaGVkdWxlcjo6ZXhlY3V0ZVRhc2tz KToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0U2NoZWR1bGVyOjp3b3JrZXJUaHJlYWQp OgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3RTY2hlZHVsZXI6OnN0YXJ0VHJhbnNmZXIp OgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3RTY2hlZHVsZXI6OmNvbXBsZXRlVHJhbnNm ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3RTY2hlZHVsZXI6OmNhbmNlbFRyYW5z ZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpmaW5hbGl6ZVRy YW5zZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxKb2JMaXN0Ojppc0VtcHR5IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkN1cmxKb2JMaXN0OjpzdGFydEpvYnMpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6Q3VybEpvYkxpc3Q6OmZpbmlzaEpvYnMpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3RTY2hlZHVsZXI6OnVwZGF0ZUpvYkxpc3Qp OiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdFNj aGVkdWxlci5oOgorCiAyMDE3LTEwLTMxICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBCdWlsZCBtb3JlIGZpbGVzIHVuZGVyIFdlYkNv cmUgYXMgdW5pZmllZCBzb3VyY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3RTY2hlZHVsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0U2NoZWR1bGVyLmNwcAppbmRleCA4ZTg4 NDllZDkxNS4uZTNiNDViZTJjOGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdFNjaGVkdWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0U2NoZWR1bGVyLmNwcApAQCAtMzUs NTEgKzM1LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vKgotICogQ3VybEpvYkxpc3Qg aXMgdXNlZCBvbmx5IGluIGJhY2tncm91bmQgc28gdGhhdCBubyBuZWVkIHRvIG1hbmFnZSBtdXRl eAotICovCi1jbGFzcyBDdXJsSm9iTGlzdCA6IHB1YmxpYyBDdXJsTXVsdGlIYW5kbGUgewotcHVi bGljOgotICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aXZlSm9icy5pc0Vt cHR5KCk7IH0KLQotICAgIHZvaWQgc3RhcnRKb2JzKEhhc2hTZXQ8Q3VybFJlcXVlc3RTY2hlZHVs ZXJDbGllbnQqPiYmIGpvYnMpCi0gICAgewotICAgICAgICBhdXRvIGxvY2FsSm9icyA9IFdURk1v dmUoam9icyk7Ci0gICAgICAgIGZvciAoYXV0byYgY2xpZW50IDogbG9jYWxKb2JzKSB7Ci0gICAg ICAgICAgICBDVVJMKiBoYW5kbGUgPSBjbGllbnQtPnNldHVwVHJhbnNmZXIoKTsKLSAgICAgICAg ICAgIGlmICghaGFuZGxlKQotICAgICAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICAgICAg bV9hY3RpdmVKb2JzLmFkZChoYW5kbGUsIGNsaWVudCk7Ci0gICAgICAgICAgICBhZGRIYW5kbGUo aGFuZGxlKTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHZvaWQgZmluaXNoSm9icyhIYXNoTWFw PENVUkwqLCBDVVJMY29kZT4mJiB0aWNrZXRzLCBXVEY6OkZ1bmN0aW9uPHZvaWQoQ3VybFJlcXVl c3RTY2hlZHVsZXJDbGllbnQqLCBDVVJMY29kZSk+IGNvbXBsZXRpb25IYW5kbGVyKQotICAgIHsK LSAgICAgICAgYXV0byBsb2NhbFRpY2tldHMgPSBXVEZNb3ZlKHRpY2tldHMpOwotICAgICAgICBm b3IgKGF1dG8mIHRpY2tldCA6IGxvY2FsVGlja2V0cykgewotICAgICAgICAgICAgaWYgKCFtX2Fj dGl2ZUpvYnMuY29udGFpbnModGlja2V0LmtleSkpCi0gICAgICAgICAgICAgICAgY29udGludWU7 Ci0KLSAgICAgICAgICAgIENVUkwqIGhhbmRsZSA9IHRpY2tldC5rZXk7Ci0gICAgICAgICAgICBD VVJMY29kZSByZXN1bHQgPSB0aWNrZXQudmFsdWU7Ci0gICAgICAgICAgICBDdXJsUmVxdWVzdFNj aGVkdWxlckNsaWVudCogY2xpZW50ID0gbV9hY3RpdmVKb2JzLmlubGluZUdldChoYW5kbGUpOwot Ci0gICAgICAgICAgICByZW1vdmVIYW5kbGUoaGFuZGxlKTsKLSAgICAgICAgICAgIG1fYWN0aXZl Sm9icy5yZW1vdmUoaGFuZGxlKTsKLSAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGNsaWVu dCwgcmVzdWx0KTsKLQotICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbY2xpZW50XSgpIHsK LSAgICAgICAgICAgICAgICBjbGllbnQtPnJlbGVhc2UoKTsKLSAgICAgICAgICAgIH0pOwotICAg ICAgICB9Ci0gICAgfQotCi1wcml2YXRlOgotICAgIEhhc2hNYXA8Q1VSTCosIEN1cmxSZXF1ZXN0 U2NoZWR1bGVyQ2xpZW50Kj4gbV9hY3RpdmVKb2JzOwotfTsKLQogQ3VybFJlcXVlc3RTY2hlZHVs ZXImIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpzaW5nbGV0b24oKQogewogICAgIHN0YXRpYyBOZXZl ckRlc3Ryb3llZDxDdXJsUmVxdWVzdFNjaGVkdWxlcj4gc2hhcmVkSW5zdGFuY2U7CkBAIC05Mywx MyArNDgsNyBAQCBib29sIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjphZGQoQ3VybFJlcXVlc3RTY2hl ZHVsZXJDbGllbnQqIGNsaWVudCkKICAgICBpZiAoIWNsaWVudCkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgY2xpZW50LT5yZXRhaW4oKTsKLQotICAgIHsKLSAgICAgICAgTG9ja0hvbGRl ciBsb2NrZXIobV9tdXRleCk7Ci0gICAgICAgIG1fcGVuZGluZ0pvYnMuYWRkKGNsaWVudCk7Ci0g ICAgfQotCisgICAgc3RhcnRUcmFuc2ZlcihjbGllbnQpOwogICAgIHN0YXJ0VGhyZWFkSWZOZWVk ZWQoKTsKIAogICAgIHJldHVybiB0cnVlOwpAQCAtMTEyLDggKzYxLDcgQEAgdm9pZCBDdXJsUmVx dWVzdFNjaGVkdWxlcjo6Y2FuY2VsKEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50KiBjbGllbnQp CiAgICAgaWYgKCFjbGllbnQgfHwgIWNsaWVudC0+aGFuZGxlKCkpCiAgICAgICAgIHJldHVybjsK IAotICAgIExvY2tIb2xkZXIgbG9ja2VyKG1fbXV0ZXgpOwotICAgIG1fY2FuY2VsbGVkSm9icy5h ZGQoY2xpZW50LT5oYW5kbGUoKSwgQ1VSTEVfT0spOworICAgIGNhbmNlbFRyYW5zZmVyKGNsaWVu dC0+aGFuZGxlKCkpOwogfQogCiB2b2lkIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpjYWxsT25Xb3Jr ZXJUaHJlYWQoV1RGOjpGdW5jdGlvbjx2b2lkKCk+JiYgdGFzaykKQEAgLTE0NywxMCArOTUsMTQg QEAgdm9pZCBDdXJsUmVxdWVzdFNjaGVkdWxlcjo6c3RvcFRocmVhZElmTm9Nb3JlSm9iUnVubmlu ZygpCiB7CiAgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAKKyAgICBpZiAobV9hY3RpdmVK b2JzLnNpemUoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgTG9ja0hvbGRlciBsb2NrZXIobV9t dXRleCk7CisgICAgaWYgKG1fdGFza1F1ZXVlLnNpemUoKSkKKyAgICAgICAgcmV0dXJuOwogCi0g ICAgaWYgKG1fcGVuZGluZ0pvYnMuaXNFbXB0eSgpKQotICAgICAgICBtX3J1blRocmVhZCA9IGZh bHNlOworICAgIG1fcnVuVGhyZWFkID0gZmFsc2U7CiB9CiAKIHZvaWQgQ3VybFJlcXVlc3RTY2hl ZHVsZXI6OnN0b3BUaHJlYWQoKQpAQCAtMTYzLDQ0ICsxMTUsMjkgQEAgdm9pZCBDdXJsUmVxdWVz dFNjaGVkdWxlcjo6c3RvcFRocmVhZCgpCiAgICAgfQogfQogCi12b2lkIEN1cmxSZXF1ZXN0U2No ZWR1bGVyOjp1cGRhdGVKb2JMaXN0KEN1cmxKb2JMaXN0JiBqb2JzKQordm9pZCBDdXJsUmVxdWVz dFNjaGVkdWxlcjo6ZXhlY3V0ZVRhc2tzKCkKIHsKICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgp KTsKIAotICAgIEhhc2hTZXQ8Q3VybFJlcXVlc3RTY2hlZHVsZXJDbGllbnQqPiBwZW5kaW5nSm9i czsKLSAgICBIYXNoTWFwPENVUkwqLCBDVVJMY29kZT4gY2FuY2VsbGVkSm9iczsKICAgICBWZWN0 b3I8V1RGOjpGdW5jdGlvbjx2b2lkKCk+PiB0YXNrUXVldWU7CiAKICAgICB7CiAgICAgICAgIExv Y2tIb2xkZXIgbG9ja2VyKG1fbXV0ZXgpOwotCi0gICAgICAgIHBlbmRpbmdKb2JzID0gV1RGTW92 ZShtX3BlbmRpbmdKb2JzKTsKLSAgICAgICAgY2FuY2VsbGVkSm9icyA9IFdURk1vdmUobV9jYW5j ZWxsZWRKb2JzKTsKICAgICAgICAgdGFza1F1ZXVlID0gV1RGTW92ZShtX3Rhc2tRdWV1ZSk7CiAg ICAgfQogCiAgICAgZm9yIChhdXRvJiB0YXNrIDogdGFza1F1ZXVlKQogICAgICAgICB0YXNrKCk7 Ci0KLSAgICBqb2JzLnN0YXJ0Sm9icyhXVEZNb3ZlKHBlbmRpbmdKb2JzKSk7Ci0KLSAgICBqb2Jz LmZpbmlzaEpvYnMoV1RGTW92ZShjYW5jZWxsZWRKb2JzKSwgW10oQ3VybFJlcXVlc3RTY2hlZHVs ZXJDbGllbnQqIGNsaWVudCwgQ1VSTGNvZGUpIHsKLSAgICAgICAgY2xpZW50LT5kaWRDYW5jZWxU cmFuc2ZlcigpOwotICAgIH0pOwotCi0gICAgam9icy5maW5pc2hKb2JzKFdURk1vdmUobV9maW5p c2hlZEpvYnMpLCBbXShDdXJsUmVxdWVzdFNjaGVkdWxlckNsaWVudCogY2xpZW50LCBDVVJMY29k ZSByZXN1bHQpIHsKLSAgICAgICAgY2xpZW50LT5kaWRDb21wbGV0ZVRyYW5zZmVyKHJlc3VsdCk7 Ci0gICAgfSk7CiB9CiAKIHZvaWQgQ3VybFJlcXVlc3RTY2hlZHVsZXI6OndvcmtlclRocmVhZCgp CiB7CiAgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7CiAKLSAgICBDdXJsSm9iTGlzdCBqb2Jz OworICAgIG1fY3VybE11bHRpSGFuZGxlID0gc3RkOjptYWtlX3VuaXF1ZTxDdXJsTXVsdGlIYW5k bGU+KCk7CiAKICAgICB3aGlsZSAobV9ydW5UaHJlYWQpIHsKLSAgICAgICAgdXBkYXRlSm9iTGlz dChqb2JzKTsKKyAgICAgICAgZXhlY3V0ZVRhc2tzKCk7CiAKICAgICAgICAgLy8gUmV0cnkgJ3Nl bGVjdCcgaWYgaXQgd2FzIGludGVycnVwdGVkIGJ5IGEgcHJvY2VzcyBzaWduYWwuCiAgICAgICAg IGludCByYyA9IDA7CkBAIC0yMTYsNyArMTUzLDcgQEAgdm9pZCBDdXJsUmVxdWVzdFNjaGVkdWxl cjo6d29ya2VyVGhyZWFkKCkKICAgICAgICAgICAgIHRpbWVvdXQudHZfc2VjID0gMDsKICAgICAg ICAgICAgIHRpbWVvdXQudHZfdXNlYyA9IHNlbGVjdFRpbWVvdXRNUyAqIDEwMDA7IC8vIHNlbGVj dCB3YWl0cyBtaWNyb3NlY29uZHMKIAotICAgICAgICAgICAgam9icy5nZXRGZFNldChmZHJlYWQs IGZkd3JpdGUsIGZkZXhjZXAsIG1heGZkKTsKKyAgICAgICAgICAgIG1fY3VybE11bHRpSGFuZGxl LT5nZXRGZFNldChmZHJlYWQsIGZkd3JpdGUsIGZkZXhjZXAsIG1heGZkKTsKIAogICAgICAgICAg ICAgLy8gV2hlbiB0aGUgMyBmaWxlIGRlc2NyaXB0b3JzIGFyZSBlbXB0eSwgd2luc29jayB3aWxs IHJldHVybiAtMQogICAgICAgICAgICAgLy8gYW5kIGJhaWwgb3V0LCBzdG9wcGluZyB0aGUgZmls ZSBkb3dubG9hZC4gU28gbWFrZSBzdXJlIHdlCkBAIC0yMjYsMjMgKzE2Myw3NiBAQCB2b2lkIEN1 cmxSZXF1ZXN0U2NoZWR1bGVyOjp3b3JrZXJUaHJlYWQoKQogICAgICAgICB9IHdoaWxlIChyYyA9 PSAtMSAmJiBlcnJubyA9PSBFSU5UUik7CiAKICAgICAgICAgaW50IGFjdGl2ZUNvdW50ID0gMDsK LSAgICAgICAgd2hpbGUgKGpvYnMucGVyZm9ybShhY3RpdmVDb3VudCkgPT0gQ1VSTE1fQ0FMTF9N VUxUSV9QRVJGT1JNKSB7IH0KKyAgICAgICAgd2hpbGUgKG1fY3VybE11bHRpSGFuZGxlLT5wZXJm b3JtKGFjdGl2ZUNvdW50KSA9PSBDVVJMTV9DQUxMX01VTFRJX1BFUkZPUk0pIHsgfQogCiAgICAg ICAgIC8vIGNoZWNrIHRoZSBjdXJsIG1lc3NhZ2VzIGluZGljYXRpbmcgY29tcGxldGVkIHRyYW5z ZmVycwogICAgICAgICAvLyBhbmQgZnJlZSB0aGVpciByZXNvdXJjZXMKICAgICAgICAgd2hpbGUg KHRydWUpIHsKICAgICAgICAgICAgIGludCBtZXNzYWdlc0luUXVldWUgPSAwOwotICAgICAgICAg ICAgQ1VSTE1zZyogbXNnID0gam9icy5yZWFkSW5mbyhtZXNzYWdlc0luUXVldWUpOworICAgICAg ICAgICAgQ1VSTE1zZyogbXNnID0gbV9jdXJsTXVsdGlIYW5kbGUtPnJlYWRJbmZvKG1lc3NhZ2Vz SW5RdWV1ZSk7CiAgICAgICAgICAgICBpZiAoIW1zZykKICAgICAgICAgICAgICAgICBicmVhazsK IAogICAgICAgICAgICAgQVNTRVJUKG1zZy0+bXNnID09IENVUkxNU0dfRE9ORSk7Ci0gICAgICAg ICAgICBtX2ZpbmlzaGVkSm9icy5hZGQobXNnLT5lYXN5X2hhbmRsZSwgbXNnLT5kYXRhLnJlc3Vs dCk7CisgICAgICAgICAgICBjb21wbGV0ZVRyYW5zZmVyKG1zZy0+ZWFzeV9oYW5kbGUsIG1zZy0+ ZGF0YS5yZXN1bHQpOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKGpvYnMuaXNFbXB0eSgpKQot ICAgICAgICAgICAgc3RvcFRocmVhZElmTm9Nb3JlSm9iUnVubmluZygpOworICAgICAgICBzdG9w VGhyZWFkSWZOb01vcmVKb2JSdW5uaW5nKCk7CiAgICAgfQorCisgICAgbV9jdXJsTXVsdGlIYW5k bGUgPSBudWxscHRyOworfQorCit2b2lkIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpzdGFydFRyYW5z ZmVyKEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50KiBjbGllbnQpCit7CisgICAgY2xpZW50LT5y ZXRhaW4oKTsKKworICAgIGF1dG8gdGFzayA9IFt0aGlzLCBjbGllbnRdKCkgeworICAgICAgICBD VVJMKiBoYW5kbGUgPSBjbGllbnQtPnNldHVwVHJhbnNmZXIoKTsKKyAgICAgICAgaWYgKCFoYW5k bGUpCisgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgbV9hY3RpdmVKb2JzLmFkZChoYW5k bGUsIGNsaWVudCk7CisgICAgICAgIG1fY3VybE11bHRpSGFuZGxlLT5hZGRIYW5kbGUoaGFuZGxl KTsKKyAgICB9OworCisgICAgTG9ja0hvbGRlciBsb2NrZXIobV9tdXRleCk7CisgICAgbV90YXNr UXVldWUuYXBwZW5kKFdURk1vdmUodGFzaykpOworfQorCit2b2lkIEN1cmxSZXF1ZXN0U2NoZWR1 bGVyOjpjb21wbGV0ZVRyYW5zZmVyKENVUkwqIGhhbmRsZSwgQ1VSTGNvZGUgcmVzdWx0KQorewor ICAgIGZpbmFsaXplVHJhbnNmZXIoaGFuZGxlLCBbcmVzdWx0XShDdXJsUmVxdWVzdFNjaGVkdWxl ckNsaWVudCogY2xpZW50KSB7CisgICAgICAgIGNsaWVudC0+ZGlkQ29tcGxldGVUcmFuc2Zlcihy ZXN1bHQpOworICAgIH0pOworfQorCit2b2lkIEN1cmxSZXF1ZXN0U2NoZWR1bGVyOjpjYW5jZWxU cmFuc2ZlcihDVVJMKiBoYW5kbGUpCit7CisgICAgZmluYWxpemVUcmFuc2ZlcihoYW5kbGUsIFtd KEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50KiBjbGllbnQpIHsKKyAgICAgICAgY2xpZW50LT5k aWRDYW5jZWxUcmFuc2ZlcigpOworICAgIH0pOworfQorCit2b2lkIEN1cmxSZXF1ZXN0U2NoZWR1 bGVyOjpmaW5hbGl6ZVRyYW5zZmVyKENVUkwqIGhhbmRsZSwgRnVuY3Rpb248dm9pZChDdXJsUmVx dWVzdFNjaGVkdWxlckNsaWVudCopPiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBhdXRvIHRh c2sgPSBbdGhpcywgaGFuZGxlLCBjb21wbGV0aW9uID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxl cildKCkgeworICAgICAgICBpZiAoIW1fYWN0aXZlSm9icy5jb250YWlucyhoYW5kbGUpKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50KiBj bGllbnQgPSBtX2FjdGl2ZUpvYnMuaW5saW5lR2V0KGhhbmRsZSk7CisKKyAgICAgICAgbV9jdXJs TXVsdGlIYW5kbGUtPnJlbW92ZUhhbmRsZShoYW5kbGUpOworICAgICAgICBtX2FjdGl2ZUpvYnMu cmVtb3ZlKGhhbmRsZSk7CisgICAgICAgIGNvbXBsZXRpb24oY2xpZW50KTsKKworICAgICAgICBj YWxsT25NYWluVGhyZWFkKFtjbGllbnRdKCkgeworICAgICAgICAgICAgY2xpZW50LT5yZWxlYXNl KCk7CisgICAgICAgIH0pOworICAgIH07CisKKyAgICBMb2NrSG9sZGVyIGxvY2tlcihtX211dGV4 KTsKKyAgICBtX3Rhc2tRdWV1ZS5hcHBlbmQoV1RGTW92ZSh0YXNrKSk7CiB9CiAKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdFNj aGVkdWxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1 ZXN0U2NoZWR1bGVyLmgKaW5kZXggZjVmZGU4YzFkOWUuLjhiYWYxOGUwZjczIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3RTY2hlZHVs ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVl c3RTY2hlZHVsZXIuaApAQCAtMjksMTQgKzI5LDEyIEBACiAKICNpbmNsdWRlICJDdXJsQ29udGV4 dC5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+Ci0jaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4K ICNpbmNsdWRlIDx3dGYvTG9jay5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogI2lu Y2x1ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBD dXJsSm9iTGlzdDsKIGNsYXNzIEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50OwogCiBjbGFzcyBD dXJsUmVxdWVzdFNjaGVkdWxlciB7CkBAIC01OSwxNyArNTcsMjMgQEAgcHJpdmF0ZToKICAgICB2 b2lkIHN0b3BUaHJlYWRJZk5vTW9yZUpvYlJ1bm5pbmcoKTsKICAgICB2b2lkIHN0b3BUaHJlYWQo KTsKIAotICAgIHZvaWQgdXBkYXRlSm9iTGlzdChDdXJsSm9iTGlzdCYpOworICAgIHZvaWQgZXhl Y3V0ZVRhc2tzKCk7CiAKICAgICB2b2lkIHdvcmtlclRocmVhZCgpOwogCi0gICAgUmVmUHRyPFRo cmVhZD4gbV90aHJlYWQ7Ci0gICAgSGFzaFNldDxDdXJsUmVxdWVzdFNjaGVkdWxlckNsaWVudCo+ IG1fcGVuZGluZ0pvYnM7Ci0gICAgSGFzaE1hcDxDVVJMKiwgQ1VSTGNvZGU+IG1fZmluaXNoZWRK b2JzOwotICAgIEhhc2hNYXA8Q1VSTCosIENVUkxjb2RlPiBtX2NhbmNlbGxlZEpvYnM7Ci0gICAg VmVjdG9yPFdURjo6RnVuY3Rpb248dm9pZCgpPj4gbV90YXNrUXVldWU7CisgICAgdm9pZCBzdGFy dFRyYW5zZmVyKEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50Kik7CisgICAgdm9pZCBjb21wbGV0 ZVRyYW5zZmVyKENVUkwqLCBDVVJMY29kZSk7CisgICAgdm9pZCBjYW5jZWxUcmFuc2ZlcihDVVJM Kik7CisgICAgdm9pZCBmaW5hbGl6ZVRyYW5zZmVyKENVUkwqLCBGdW5jdGlvbjx2b2lkKEN1cmxS ZXF1ZXN0U2NoZWR1bGVyQ2xpZW50Kik+KTsKKwogICAgIG11dGFibGUgTG9jayBtX211dGV4Owor ICAgIFJlZlB0cjxUaHJlYWQ+IG1fdGhyZWFkOwogICAgIGJvb2wgbV9ydW5UaHJlYWQgeyBmYWxz ZSB9OworCisgICAgVmVjdG9yPEZ1bmN0aW9uPHZvaWQoKT4+IG1fdGFza1F1ZXVlOworICAgIEhh c2hNYXA8Q1VSTCosIEN1cmxSZXF1ZXN0U2NoZWR1bGVyQ2xpZW50Kj4gbV9hY3RpdmVKb2JzOwor CisgICAgc3RkOjp1bmlxdWVfcHRyPEN1cmxNdWx0aUhhbmRsZT4gbV9jdXJsTXVsdGlIYW5kbGU7 CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==