195865 2019-03-17 14:47:29 -0700 Web Inspector: Timeline: lazily create the agent 2019-03-19 11:42:10 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 195590 195591 195592 1 hi hi commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck sroberts webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1517556 0 hi 2019-03-17 14:47:29 -0700 . 1517557 1 webkit-bug-importer 2019-03-17 15:01:08 -0700 <rdar://problem/48965403> 1517569 2 364981 hi 2019-03-17 16:24:32 -0700 Created attachment 364981 Patch 1517870 3 364981 joepeck 2019-03-18 13:15:43 -0700 Comment on attachment 364981 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=364981&action=review r=me > Source/WebCore/inspector/agents/InspectorTimelineAgent.cpp:719 > + record->setString("frameId", pageAgent->frameId(frame)); Nit: "frameId"_s to use ASCIILiteral construction. 1517909 4 365061 hi 2019-03-18 14:14:22 -0700 Created attachment 365061 Patch 1518033 5 365061 commit-queue 2019-03-18 17:31:30 -0700 Comment on attachment 365061 Patch Clearing flags on attachment: 365061 Committed r243119: <https://trac.webkit.org/changeset/243119> 1518034 6 commit-queue 2019-03-18 17:31:32 -0700 All reviewed patches have been landed. Closing bug. 1518278 7 sroberts 2019-03-19 08:32:53 -0700 This commit is causing 2 new failures in the following tests on all of Mac inspector/timeline/line-column.html inspector/timeline/setInstruments-programmatic-capture.html Reproduced with: run-webkit-tests inspector/timeline/setInstruments-programmatic-capture.html --iterations 10 -f run-webkit-tests inspector/timeline/line-column.html -- iterations 10 -f all iterations produce a text diff failure in 243119 all iterations pass in 243116 Flakiness Dashboard: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=inspector%2Ftimeline%2Fline-column.html%20inspector%2Ftimeline%2FsetInstruments-programmatic-capture.html Diff: https://build.webkit.org/results/Apple%20Mojave%20Release%20WK2%20(Tests)/r243136%20(3171)/inspector/timeline/line-column-diff.txt https://build.webkit.org/results/Apple%20Mojave%20Release%20WK2%20(Tests)/r243136%20(3171)/inspector/timeline/setInstruments-programmatic-capture-diff.txt 1518405 8 hi 2019-03-19 11:42:10 -0700 (In reply to Shawn Roberts from comment #7) > This commit is causing 2 new failures in the following tests on all of Mac > > inspector/timeline/line-column.html > inspector/timeline/setInstruments-programmatic-capture.html > > Reproduced with: > > run-webkit-tests inspector/timeline/setInstruments-programmatic-capture.html > --iterations 10 -f > run-webkit-tests inspector/timeline/line-column.html -- iterations 10 -f > > all iterations produce a text diff failure in 243119 > all iterations pass in 243116 > > > Flakiness Dashboard: > > https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard. > html#showAllRuns=true&tests=inspector%2Ftimeline%2Fline-column. > html%20inspector%2Ftimeline%2FsetInstruments-programmatic-capture.html > > Diff: > > https://build.webkit.org/results/Apple%20Mojave%20Release%20WK2%20(Tests)/ > r243136%20(3171)/inspector/timeline/line-column-diff.txt > > https://build.webkit.org/results/Apple%20Mojave%20Release%20WK2%20(Tests)/ > r243136%20(3171)/inspector/timeline/setInstruments-programmatic-capture-diff. > txt Fixed in followup r243155 <http://trac.webkit.org/changeset/243155>. 364981 2019-03-17 16:24:32 -0700 2019-03-18 14:14:21 -0700 Patch bug-195865-20190317162431.patch text/plain 12829 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0MzQxYTJkODBiYzRlMzRhMWYwY2M0NDliN2JkODY5OGFmOTdmYWZmLi40 Nzg0ODE0ZTUwMGE2YTViNTk4YTU2NDgyNGY5ODY0OWM4ZDE1MjM1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzYgQEAKKzIwMTktMDMtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lOiBsYXppbHkgY3JlYXRlIHRoZSBh Z2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1 ODY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODk2NTQwMz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0 eS4KKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5o OgorICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpJbnNwZWN0b3JUaW1l bGluZUFnZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnRv Z2dsZVNjcmlwdFByb2ZpbGVySW5zdHJ1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JUaW1lbGluZUFnZW50Ojp0b2dnbGVIZWFwSW5zdHJ1bWVudCk6CisgICAgICAgIChXZWJDb3Jl OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50OjpzZXRGcmFtZUlkZW50aWZpZXIpOgorCisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzdGFydFByb2ZpbGluZyk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnN0b3BQcm9maWxpbmcpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZXF1ZXN0QW5pbWF0aW9u RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRD YW5jZWxBbmltYXRpb25GcmFtZSk6CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zdHJ1bWVudGlu Z0FnZW50cy5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zdHJ1bWVudGluZ0FnZW50czo6aW5zcGVj dG9yU2NyaXB0UHJvZmlsZXJBZ2VudCBjb25zdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6 SW5zdHJ1bWVudGluZ0FnZW50czo6c2V0SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudCk6IEFk ZGVkLgorICAgICAgICAqIGluc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3RydW1lbnRpbmdBZ2VudHM6OnJlc2V0KToKKworICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvckNvbnRyb2xsZXI6Okluc3BlY3RvckNvbnRyb2xsZXIpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjo6Y3JlYXRlTGF6eUFnZW50cyk6CisKIDIwMTktMDMtMTYgIERh cmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcHJvdmUgbm9ybWFsaXph dGlvbiBjb2RlLCBpbmNsdWRpbmcgbW92aW5nIGZyb20gdW5vcm0uaCB0byB1bm9ybTIuaApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwCmluZGV4 IDk3Zjk0ODA0Njk0MGE0MmNiMjcyNWUyZGMxNjc3YTAzNTE5N2U0YzguLjQ5OGEzZDdjZTk5YzJl NjUwMjVmM2JjYTcyOWFhYmU4ZjYyZWI3YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAKQEAgLTEzNiw3ICsxMzYsNyBAQCBJbnNwZWN0 b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UmIHBhZ2UsIEluc3BlY3RvckNs aWVudCogaW5zcGVjdG9yQwogICAgIG1fYWdlbnRzLmFwcGVuZChXVEZNb3ZlKGhlYXBBZ2VudFB0 cikpOwogCiAgICAgYXV0byBzY3JpcHRQcm9maWxlckFnZW50UHRyID0gc3RkOjptYWtlX3VuaXF1 ZTxJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50PihwYWdlQ29udGV4dCk7Ci0gICAgSW5zcGVj dG9yU2NyaXB0UHJvZmlsZXJBZ2VudCogc2NyaXB0UHJvZmlsZXJBZ2VudCA9IHNjcmlwdFByb2Zp bGVyQWdlbnRQdHIuZ2V0KCk7CisgICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRJbnNwZWN0 b3JTY3JpcHRQcm9maWxlckFnZW50KHNjcmlwdFByb2ZpbGVyQWdlbnRQdHIuZ2V0KCkpOwogICAg IG1fYWdlbnRzLmFwcGVuZChXVEZNb3ZlKHNjcmlwdFByb2ZpbGVyQWdlbnRQdHIpKTsKIAogICAg IGF1dG8gY29uc29sZUFnZW50UHRyID0gc3RkOjptYWtlX3VuaXF1ZTxQYWdlQ29uc29sZUFnZW50 PihwYWdlQ29udGV4dCwgaGVhcEFnZW50LCBtX2RvbUFnZW50KTsKQEAgLTE0NCw4ICsxNDQsNiBA QCBJbnNwZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2UmIHBhZ2UsIElu c3BlY3RvckNsaWVudCogaW5zcGVjdG9yQwogICAgIG1faW5zdHJ1bWVudGluZ0FnZW50cy0+c2V0 V2ViQ29uc29sZUFnZW50KGNvbnNvbGVBZ2VudFB0ci5nZXQoKSk7CiAgICAgbV9hZ2VudHMuYXBw ZW5kKFdURk1vdmUoY29uc29sZUFnZW50UHRyKSk7CiAKLSAgICBtX2FnZW50cy5hcHBlbmQoc3Rk OjptYWtlX3VuaXF1ZTxJbnNwZWN0b3JUaW1lbGluZUFnZW50PihwYWdlQ29udGV4dCwgc2NyaXB0 UHJvZmlsZXJBZ2VudCwgaGVhcEFnZW50LCBwYWdlQWdlbnQpKTsKLQogICAgIEFTU0VSVChtX2lu amVjdGVkU2NyaXB0TWFuYWdlci0+Y29tbWFuZExpbmVBUElIb3N0KCkpOwogICAgIGlmIChDb21t YW5kTGluZUFQSUhvc3QqIGNvbW1hbmRMaW5lQVBJSG9zdCA9IG1faW5qZWN0ZWRTY3JpcHRNYW5h Z2VyLT5jb21tYW5kTGluZUFQSUhvc3QoKSkKICAgICAgICAgY29tbWFuZExpbmVBUElIb3N0LT5p bml0KG1faW5zcGVjdG9yQWdlbnQsIGNvbnNvbGVBZ2VudCwgZG9tU3RvcmFnZUFnZW50LCBkYXRh YmFzZUFnZW50KTsKQEAgLTIwNyw2ICsyMDUsNyBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6 OmNyZWF0ZUxhenlBZ2VudHMoKQogI2VuZGlmCiAgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFr ZV91bmlxdWU8UGFnZUF1ZGl0QWdlbnQ+KHBhZ2VDb250ZXh0KSk7CiAgICAgbV9hZ2VudHMuYXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yQ2FudmFzQWdlbnQ+KHBhZ2VDb250ZXh0KSk7 CisgICAgbV9hZ2VudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SW5zcGVjdG9yVGltZWxpbmVB Z2VudD4ocGFnZUNvbnRleHQpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjppbnNw ZWN0ZWRQYWdlRGVzdHJveWVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCA4ODVmM2QwNTQ5MjQ4MGU3YmQyNTVlY2Nm MjI1MWRjMjRkYzAyNWNhLi5lMTAyODVkOTNjMzk0YTU3YzllODI4NWI2NjFkODE2MTRjMjUxYjYx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1l bnRhdGlvbi5oCkBAIC0xNDA4LDExICsxNDA4LDEzIEBAIGlubGluZSB2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6Y29uc29sZVRpbWVTdGFtcChGcmFtZSYgZnJhbWUsIFJlZjxJbnNwZWN0 CiAKIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c3RhcnRQcm9maWxpbmco UGFnZSYgcGFnZSwgSlNDOjpFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IFN0cmluZyAmdGl0bGUpCiB7 CisgICAgRkFTVF9SRVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7CiAgICAgc3RhcnRQcm9m aWxpbmdJbXBsKGluc3RydW1lbnRpbmdBZ2VudHNGb3JQYWdlKHBhZ2UpLCBleGVjLCB0aXRsZSk7 CiB9CiAKIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c3RvcFByb2ZpbGlu ZyhQYWdlJiBwYWdlLCBKU0M6OkV4ZWNTdGF0ZSogZXhlYywgY29uc3QgU3RyaW5nICZ0aXRsZSkK IHsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFModm9pZCgpKTsKICAgICBzdG9wUHJv ZmlsaW5nSW1wbChpbnN0cnVtZW50aW5nQWdlbnRzRm9yUGFnZShwYWdlKSwgZXhlYywgdGl0bGUp OwogfQogCkBAIC0xNDI1LDEyICsxNDI3LDE0IEBAIGlubGluZSB2b2lkIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6Y29uc29sZVN0YXJ0UmVjb3JkaW5nQ2FudmFzKENhbnZhc1JlbmRlcmluCiAK IGlubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVxdWVzdEFuaW1hdGlv bkZyYW1lKERvY3VtZW50JiBkb2N1bWVudCwgaW50IGNhbGxiYWNrSWQpCiB7CisgICAgRkFTVF9S RVRVUk5fSUZfTk9fRlJPTlRFTkRTKHZvaWQoKSk7CiAgICAgaWYgKEluc3RydW1lbnRpbmdBZ2Vu dHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0cnVtZW50aW5nQWdlbnRzRm9yRG9jdW1lbnQo ZG9jdW1lbnQpKQogICAgICAgICBkaWRSZXF1ZXN0QW5pbWF0aW9uRnJhbWVJbXBsKCppbnN0cnVt ZW50aW5nQWdlbnRzLCBjYWxsYmFja0lkLCBkb2N1bWVudCk7CiB9CiAKIGlubGluZSB2b2lkIElu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkQ2FuY2VsQW5pbWF0aW9uRnJhbWUoRG9jdW1lbnQm IGRvY3VtZW50LCBpbnQgY2FsbGJhY2tJZCkKIHsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9O VEVORFModm9pZCgpKTsKICAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGlu Z0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JEb2N1bWVudChkb2N1bWVudCkpCiAgICAg ICAgIGRpZENhbmNlbEFuaW1hdGlvbkZyYW1lSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgY2Fs bGJhY2tJZCwgZG9jdW1lbnQpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3RydW1lbnRpbmdBZ2VudHMuY3BwCmluZGV4IGI1ODg2YzRmODcwNDE5NTRhNThlZjdjNWE3ODcw YzBmYTYzMzEyOGEuLmEwZWFlNGIxN2I3YmM2MzJkNTA5NzZmYjBiZmUxNDhkYjgyODg3MTAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5jcHAK QEAgLTUzLDYgKzUzLDcgQEAgdm9pZCBJbnN0cnVtZW50aW5nQWdlbnRzOjpyZXNldCgpCiAgICAg bV9pbnNwZWN0b3JET01BZ2VudCA9IG51bGxwdHI7CiAgICAgbV9pbnNwZWN0b3JOZXR3b3JrQWdl bnQgPSBudWxscHRyOwogICAgIG1fcGFnZVJ1bnRpbWVBZ2VudCA9IG51bGxwdHI7CisgICAgbV9p bnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50ID0gbnVsbHB0cjsKICAgICBtX2luc3BlY3RvclRp bWVsaW5lQWdlbnQgPSBudWxscHRyOwogICAgIG1fcGVyc2lzdGVudEluc3BlY3RvclRpbWVsaW5l QWdlbnQgPSBudWxscHRyOwogICAgIG1faW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50ID0gbnVsbHB0 cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdl bnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5oCmlu ZGV4IDU0Nzc3MzJhNWU1YzI1NTIzYjdkMjI0MTBjNTE0ZTg1YzZiNjA0Y2IuLjlhOWNlNmNlMmM5 ZjcxOGNkNjE3MmMwNGNjOWU2Yjg5NzJmYzQzMzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuaApAQCAtMzksNiArMzksNyBAQAogbmFtZXNwYWNl IEluc3BlY3RvciB7CiBjbGFzcyBJbnNwZWN0b3JBZ2VudDsKIGNsYXNzIEluc3BlY3RvckRlYnVn Z2VyQWdlbnQ7CitjbGFzcyBJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50OwogfQogCiBuYW1l c3BhY2UgV2ViQ29yZSB7CkBAIC0xMDIsNiArMTAzLDkgQEAgcHVibGljOgogICAgIFBhZ2VSdW50 aW1lQWdlbnQqIHBhZ2VSdW50aW1lQWdlbnQoKSBjb25zdCB7IHJldHVybiBtX3BhZ2VSdW50aW1l QWdlbnQ7IH0KICAgICB2b2lkIHNldFBhZ2VSdW50aW1lQWdlbnQoUGFnZVJ1bnRpbWVBZ2VudCog YWdlbnQpIHsgbV9wYWdlUnVudGltZUFnZW50ID0gYWdlbnQ7IH0KIAorICAgIEluc3BlY3Rvcjo6 SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudCogaW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2Vu dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudDsgfQorICAg IHZvaWQgc2V0SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudChJbnNwZWN0b3I6Okluc3BlY3Rv clNjcmlwdFByb2ZpbGVyQWdlbnQqIGFnZW50KSB7IG1faW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJB Z2VudCA9IGFnZW50OyB9CisKICAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiBpbnNwZWN0b3JU aW1lbGluZUFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9pbnNwZWN0b3JUaW1lbGluZUFnZW50OyB9 CiAgICAgdm9pZCBzZXRJbnNwZWN0b3JUaW1lbGluZUFnZW50KEluc3BlY3RvclRpbWVsaW5lQWdl bnQqIGFnZW50KSB7IG1faW5zcGVjdG9yVGltZWxpbmVBZ2VudCA9IGFnZW50OyB9CiAKQEAgLTE1 Nyw2ICsxNjEsNyBAQCBwcml2YXRlOgogICAgIEluc3BlY3RvckRPTUFnZW50KiBtX2luc3BlY3Rv ckRPTUFnZW50IHsgbnVsbHB0ciB9OwogICAgIEluc3BlY3Rvck5ldHdvcmtBZ2VudCogbV9pbnNw ZWN0b3JOZXR3b3JrQWdlbnQgeyBudWxscHRyIH07CiAgICAgUGFnZVJ1bnRpbWVBZ2VudCogbV9w YWdlUnVudGltZUFnZW50IHsgbnVsbHB0ciB9OworICAgIEluc3BlY3Rvcjo6SW5zcGVjdG9yU2Ny aXB0UHJvZmlsZXJBZ2VudCogbV9pbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50IHsgbnVsbHB0 ciB9OwogICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIG1faW5zcGVjdG9yVGltZWxpbmVBZ2Vu dCB7IG51bGxwdHIgfTsKICAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KiBtX3BlcnNpc3RlbnRJ bnNwZWN0b3JUaW1lbGluZUFnZW50IHsgbnVsbHB0ciB9OwogICAgIEluc3BlY3RvckRPTVN0b3Jh Z2VBZ2VudCogbV9pbnNwZWN0b3JET01TdG9yYWdlQWdlbnQgeyBudWxscHRyIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdl bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGlu ZUFnZW50LmNwcAppbmRleCAwNTA1YmQzZTZlOGM2MWRiODVkNGEyZTRhNWQ5NzQ0N2EyZTljYTNl Li45MjIyNGZiMWY5M2VkODg4ODY3MTI0MGY3NTFlNTJkY2RmMGNlZWYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVB Z2VudC5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNsdWRlICJJbnNwZWN0b3JQYWdlQWdlbnQu aCIKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiSlNET01XaW5k b3cuaCIKKyNpbmNsdWRlICJQYWdlSGVhcEFnZW50LmgiCiAjaW5jbHVkZSAiUGFnZVNjcmlwdERl YnVnU2VydmVyLmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlNjcmlwdFN0 YXRlLmgiCkBAIC00OCw3ICs0OSw2IEBACiAjaW5jbHVkZSAiV2ViQ29uc29sZUFnZW50LmgiCiAj aW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvQ29uc29sZU1lc3NhZ2UuaD4KICNpbmNsdWRlIDxKYXZh U2NyaXB0Q29yZS9JbnNwZWN0b3JEZWJ1Z2dlckFnZW50Lmg+Ci0jaW5jbHVkZSA8SmF2YVNjcmlw dENvcmUvSW5zcGVjdG9ySGVhcEFnZW50Lmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSW5z cGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudC5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1Nj cmlwdEJyZWFrcG9pbnQuaD4KICNpbmNsdWRlIDx3dGYvU3RvcHdhdGNoLmg+CkBAIC04MywxMyAr ODMsMTAgQEAgc3RhdGljIENGUnVuTG9vcFJlZiBjdXJyZW50UnVuTG9vcCgpCiB9CiAjZW5kaWYK IAotSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudChXZWJBZ2Vu dENvbnRleHQmIGNvbnRleHQsIEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQqIHNjcmlwdFBy b2ZpbGVBZ2VudCwgSW5zcGVjdG9ySGVhcEFnZW50KiBoZWFwQWdlbnQsIEluc3BlY3RvclBhZ2VB Z2VudCogcGFnZUFnZW50KQorSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6SW5zcGVjdG9yVGltZWxp bmVBZ2VudChXZWJBZ2VudENvbnRleHQmIGNvbnRleHQpCiAgICAgOiBJbnNwZWN0b3JBZ2VudEJh c2UoIlRpbWVsaW5lIl9zLCBjb250ZXh0KQogICAgICwgbV9mcm9udGVuZERpc3BhdGNoZXIoc3Rk OjptYWtlX3VuaXF1ZTxJbnNwZWN0b3I6OlRpbWVsaW5lRnJvbnRlbmREaXNwYXRjaGVyPihjb250 ZXh0LmZyb250ZW5kUm91dGVyKSkKICAgICAsIG1fYmFja2VuZERpc3BhdGNoZXIoSW5zcGVjdG9y OjpUaW1lbGluZUJhY2tlbmREaXNwYXRjaGVyOjpjcmVhdGUoY29udGV4dC5iYWNrZW5kRGlzcGF0 Y2hlciwgdGhpcykpCi0gICAgLCBtX3NjcmlwdFByb2ZpbGVyQWdlbnQoc2NyaXB0UHJvZmlsZUFn ZW50KQotICAgICwgbV9oZWFwQWdlbnQoaGVhcEFnZW50KQotICAgICwgbV9wYWdlQWdlbnQocGFn ZUFnZW50KQogewogfQogCkBAIC01MzIsMjUgKzUyOSwyNSBAQCB2b2lkIEluc3BlY3RvclRpbWVs aW5lQWdlbnQ6OnRvZ2dsZUluc3RydW1lbnRzKEluc3RydW1lbnRTdGF0ZSBzdGF0ZSkKIAogdm9p ZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0b2dnbGVTY3JpcHRQcm9maWxlckluc3RydW1lbnQo SW5zdHJ1bWVudFN0YXRlIHN0YXRlKQogewotICAgIGlmIChtX3NjcmlwdFByb2ZpbGVyQWdlbnQp IHsKKyAgICBpZiAoYXV0byogc2NyaXB0UHJvZmlsZXJBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0Fn ZW50cy5pbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50KCkpIHsKICAgICAgICAgRXJyb3JTdHJp bmcgdW51c2VkOwogICAgICAgICBpZiAoc3RhdGUgPT0gSW5zdHJ1bWVudFN0YXRlOjpTdGFydCkg ewogICAgICAgICAgICAgY29uc3QgYm9vbCBpbmNsdWRlU2FtcGxlcyA9IHRydWU7Ci0gICAgICAg ICAgICBtX3NjcmlwdFByb2ZpbGVyQWdlbnQtPnN0YXJ0VHJhY2tpbmcodW51c2VkLCAmaW5jbHVk ZVNhbXBsZXMpOworICAgICAgICAgICAgc2NyaXB0UHJvZmlsZXJBZ2VudC0+c3RhcnRUcmFja2lu Zyh1bnVzZWQsICZpbmNsdWRlU2FtcGxlcyk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg bV9zY3JpcHRQcm9maWxlckFnZW50LT5zdG9wVHJhY2tpbmcodW51c2VkKTsKKyAgICAgICAgICAg IHNjcmlwdFByb2ZpbGVyQWdlbnQtPnN0b3BUcmFja2luZyh1bnVzZWQpOwogICAgIH0KIH0KIAog dm9pZCBJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0b2dnbGVIZWFwSW5zdHJ1bWVudChJbnN0cnVt ZW50U3RhdGUgc3RhdGUpCiB7Ci0gICAgaWYgKG1faGVhcEFnZW50KSB7CisgICAgaWYgKGF1dG8q IGhlYXBBZ2VudCA9IG1faW5zdHJ1bWVudGluZ0FnZW50cy5wYWdlSGVhcEFnZW50KCkpIHsKICAg ICAgICAgRXJyb3JTdHJpbmcgdW51c2VkOwogICAgICAgICBpZiAoc3RhdGUgPT0gSW5zdHJ1bWVu dFN0YXRlOjpTdGFydCkgewogICAgICAgICAgICAgaWYgKG1fYXV0b0NhcHR1cmVQaGFzZSA9PSBB dXRvQ2FwdHVyZVBoYXNlOjpOb25lIHx8IG1fYXV0b0NhcHR1cmVQaGFzZSA9PSBBdXRvQ2FwdHVy ZVBoYXNlOjpGaXJzdE5hdmlnYXRpb24pCi0gICAgICAgICAgICAgICAgbV9oZWFwQWdlbnQtPnN0 YXJ0VHJhY2tpbmcodW51c2VkKTsKKyAgICAgICAgICAgICAgICBoZWFwQWdlbnQtPnN0YXJ0VHJh Y2tpbmcodW51c2VkKTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBtX2hlYXBBZ2VudC0+ c3RvcFRyYWNraW5nKHVudXNlZCk7CisgICAgICAgICAgICBoZWFwQWdlbnQtPnN0b3BUcmFja2lu Zyh1bnVzZWQpOwogICAgIH0KIH0KIApAQCAtNzEyLDEyICs3MDksMTQgQEAgdm9pZCBJbnNwZWN0 b3JUaW1lbGluZUFnZW50OjphZGRSZWNvcmRUb1RpbWVsaW5lKFJlZlB0cjxKU09OOjpPYmplY3Q+ JiYgcmVjb3JkLAogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnNldEZyYW1lSWRlbnRp ZmllcihKU09OOjpPYmplY3QqIHJlY29yZCwgRnJhbWUqIGZyYW1lKQogewotICAgIGlmICghZnJh bWUgfHwgIW1fcGFnZUFnZW50KQorICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAg ICBTdHJpbmcgZnJhbWVJZDsKLSAgICBpZiAoZnJhbWUgJiYgbV9wYWdlQWdlbnQpCi0gICAgICAg IGZyYW1lSWQgPSBtX3BhZ2VBZ2VudC0+ZnJhbWVJZChmcmFtZSk7Ci0gICAgcmVjb3JkLT5zZXRT dHJpbmcoImZyYW1lSWQiLCBmcmFtZUlkKTsKKworICAgIGF1dG8qIHBhZ2VBZ2VudCA9IG1faW5z dHJ1bWVudGluZ0FnZW50cy5pbnNwZWN0b3JQYWdlQWdlbnQoKTsKKyAgICBpZiAoIXBhZ2VBZ2Vu dCkKKyAgICAgICAgcmV0dXJuOworCisgICAgcmVjb3JkLT5zZXRTdHJpbmcoImZyYW1lSWQiLCBw YWdlQWdlbnQtPmZyYW1lSWQoZnJhbWUpKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JUaW1lbGluZUFn ZW50OjpkaWRDb21wbGV0ZVJlY29yZEVudHJ5KGNvbnN0IFRpbWVsaW5lUmVjb3JkRW50cnkmIGVu dHJ5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0 b3JUaW1lbGluZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3Bl Y3RvclRpbWVsaW5lQWdlbnQuaAppbmRleCA4Mjg0N2M2Nzg4YjllM2NjYjRiNTBiNjJiYzc5ZjIy M2UyNzk1Yjg5Li45MGEzOTZmNGI5Yzg4NTY2ZDA2ZDQxZjY5ODEyZmRjYjBiYmVjMTFhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5l QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRp bWVsaW5lQWdlbnQuaApAQCAtNDAsMTcgKzQwLDExIEBACiAjaW5jbHVkZSA8d3RmL0pTT05WYWx1 ZXMuaD4KICNpbmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKLW5hbWVzcGFjZSBJbnNwZWN0b3Igewot Y2xhc3MgSW5zcGVjdG9ySGVhcEFnZW50OwotY2xhc3MgSW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJB Z2VudDsKLX0KLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBFdmVudDsKIGNsYXNzIEZs b2F0UXVhZDsKIGNsYXNzIEZyYW1lOwotY2xhc3MgSW5zcGVjdG9yUGFnZUFnZW50OwogY2xhc3Mg UmVuZGVyT2JqZWN0OwogY2xhc3MgUnVuTG9vcE9ic2VydmVyOwogCkBAIC05NCw3ICs4OCw3IEBA IGNsYXNzIEluc3BlY3RvclRpbWVsaW5lQWdlbnQgZmluYWwKICAgICBXVEZfTUFLRV9OT05DT1BZ QUJMRShJbnNwZWN0b3JUaW1lbGluZUFnZW50KTsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRF RDsKIHB1YmxpYzoKLSAgICBJbnNwZWN0b3JUaW1lbGluZUFnZW50KFdlYkFnZW50Q29udGV4dCYs IEluc3BlY3Rvcjo6SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudCosIEluc3BlY3Rvcjo6SW5z cGVjdG9ySGVhcEFnZW50KiwgSW5zcGVjdG9yUGFnZUFnZW50Kik7CisgICAgSW5zcGVjdG9yVGlt ZWxpbmVBZ2VudChXZWJBZ2VudENvbnRleHQmKTsKICAgICB2aXJ0dWFsIH5JbnNwZWN0b3JUaW1l bGluZUFnZW50KCk7CiAKICAgICB2b2lkIGRpZENyZWF0ZUZyb250ZW5kQW5kQmFja2VuZChJbnNw ZWN0b3I6OkZyb250ZW5kUm91dGVyKiwgSW5zcGVjdG9yOjpCYWNrZW5kRGlzcGF0Y2hlciopIGZp bmFsOwpAQCAtMjEyLDkgKzIwNiw2IEBAIHByaXZhdGU6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8 SW5zcGVjdG9yOjpUaW1lbGluZUZyb250ZW5kRGlzcGF0Y2hlcj4gbV9mcm9udGVuZERpc3BhdGNo ZXI7CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6VGltZWxpbmVCYWNrZW5kRGlzcGF0Y2hlcj4gbV9i YWNrZW5kRGlzcGF0Y2hlcjsKLSAgICBJbnNwZWN0b3I6Okluc3BlY3RvclNjcmlwdFByb2ZpbGVy QWdlbnQqIG1fc2NyaXB0UHJvZmlsZXJBZ2VudDsKLSAgICBJbnNwZWN0b3I6Okluc3BlY3Rvckhl YXBBZ2VudCogbV9oZWFwQWdlbnQ7Ci0gICAgSW5zcGVjdG9yUGFnZUFnZW50KiBtX3BhZ2VBZ2Vu dDsKIAogICAgIFZlY3RvcjxUaW1lbGluZVJlY29yZEVudHJ5PiBtX3JlY29yZFN0YWNrOwogICAg IFZlY3RvcjxUaW1lbGluZVJlY29yZEVudHJ5PiBtX3BlbmRpbmdDb25zb2xlUHJvZmlsZVJlY29y ZHM7Cg== 365061 2019-03-18 14:14:22 -0700 2019-03-18 17:31:30 -0700 Patch bug-195865-20190318141422.patch text/plain 12860 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0Mjk0OTNlN2RjMzI1NzM5NWZhZTdkZGE1ZmZiN2U5MWNlNDNiNTlhLi40 YWQ0YmJhNzhhODJiYjAyMWVmMTE2YTNhYjk2MGEwZTc1NjUxMjEyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMzYgQEAKKzIwMTktMDMtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRpbWVsaW5lOiBsYXppbHkgY3JlYXRlIHRoZSBh Z2VudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1 ODY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80ODk2NTQwMz4KKworICAgICAgICBSZXZpZXdl ZCBieSBKb3NlcGggUGVjb3Jhcm8uCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxp dHkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6SW5zcGVjdG9yVGlt ZWxpbmVBZ2VudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JUaW1lbGluZUFnZW50Ojp0 b2dnbGVTY3JpcHRQcm9maWxlckluc3RydW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yVGltZWxpbmVBZ2VudDo6dG9nZ2xlSGVhcEluc3RydW1lbnQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6c2V0RnJhbWVJZGVudGlmaWVyKToKKworICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNv cmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6c3RhcnRQcm9maWxpbmcpOgorICAgICAgICAo V2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzdG9wUHJvZmlsaW5nKToKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVxdWVzdEFuaW1hdGlv bkZyYW1lKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk Q2FuY2VsQW5pbWF0aW9uRnJhbWUpOgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3RydW1lbnRp bmdBZ2VudHMuaDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3RydW1lbnRpbmdBZ2VudHM6Omluc3Bl Y3RvclNjcmlwdFByb2ZpbGVyQWdlbnQgY29uc3QpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6 Okluc3RydW1lbnRpbmdBZ2VudHM6OnNldEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQpOiBB ZGRlZC4KKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnN0cnVtZW50aW5nQWdlbnRzOjpyZXNldCk6CisKKyAgICAgICAgKiBp bnNwZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNw ZWN0b3JDb250cm9sbGVyOjpJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckNvbnRyb2xsZXI6OmNyZWF0ZUxhenlBZ2VudHMpOgorCiAyMDE5LTAzLTE4ICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gVGhlIG5ldHdv cmsgcHJvY2VzcyBzb21ldGltZXMgZ2V0cyBraWxsZWQgZm9yIHRyeWluZyB0byBzdXNwZW5kIHdo aWxlIGhvbGRpbmcgbG9ja2VkIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5jcHAKaW5kZXggOTdmOTQ4MDQ2OTQwYTQyY2IyNzI1ZTJkYzE2 NzdhMDM1MTk3ZTRjOC4uNDk4YTNkN2NlOTljMmU2NTAyNWYzYmNhNzI5YWFiZThmNjJlYjdhZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNw cApAQCAtMTM2LDcgKzEzNiw3IEBAIEluc3BlY3RvckNvbnRyb2xsZXI6Okluc3BlY3RvckNvbnRy b2xsZXIoUGFnZSYgcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBpbnNwZWN0b3JDCiAgICAgbV9hZ2Vu dHMuYXBwZW5kKFdURk1vdmUoaGVhcEFnZW50UHRyKSk7CiAKICAgICBhdXRvIHNjcmlwdFByb2Zp bGVyQWdlbnRQdHIgPSBzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdl bnQ+KHBhZ2VDb250ZXh0KTsKLSAgICBJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50KiBzY3Jp cHRQcm9maWxlckFnZW50ID0gc2NyaXB0UHJvZmlsZXJBZ2VudFB0ci5nZXQoKTsKKyAgICBtX2lu c3RydW1lbnRpbmdBZ2VudHMtPnNldEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQoc2NyaXB0 UHJvZmlsZXJBZ2VudFB0ci5nZXQoKSk7CiAgICAgbV9hZ2VudHMuYXBwZW5kKFdURk1vdmUoc2Ny aXB0UHJvZmlsZXJBZ2VudFB0cikpOwogCiAgICAgYXV0byBjb25zb2xlQWdlbnRQdHIgPSBzdGQ6 Om1ha2VfdW5pcXVlPFBhZ2VDb25zb2xlQWdlbnQ+KHBhZ2VDb250ZXh0LCBoZWFwQWdlbnQsIG1f ZG9tQWdlbnQpOwpAQCAtMTQ0LDggKzE0NCw2IEBAIEluc3BlY3RvckNvbnRyb2xsZXI6Okluc3Bl Y3RvckNvbnRyb2xsZXIoUGFnZSYgcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBpbnNwZWN0b3JDCiAg ICAgbV9pbnN0cnVtZW50aW5nQWdlbnRzLT5zZXRXZWJDb25zb2xlQWdlbnQoY29uc29sZUFnZW50 UHRyLmdldCgpKTsKICAgICBtX2FnZW50cy5hcHBlbmQoV1RGTW92ZShjb25zb2xlQWdlbnRQdHIp KTsKIAotICAgIG1fYWdlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3RvclRpbWVs aW5lQWdlbnQ+KHBhZ2VDb250ZXh0LCBzY3JpcHRQcm9maWxlckFnZW50LCBoZWFwQWdlbnQsIHBh Z2VBZ2VudCkpOwotCiAgICAgQVNTRVJUKG1faW5qZWN0ZWRTY3JpcHRNYW5hZ2VyLT5jb21tYW5k TGluZUFQSUhvc3QoKSk7CiAgICAgaWYgKENvbW1hbmRMaW5lQVBJSG9zdCogY29tbWFuZExpbmVB UElIb3N0ID0gbV9pbmplY3RlZFNjcmlwdE1hbmFnZXItPmNvbW1hbmRMaW5lQVBJSG9zdCgpKQog ICAgICAgICBjb21tYW5kTGluZUFQSUhvc3QtPmluaXQobV9pbnNwZWN0b3JBZ2VudCwgY29uc29s ZUFnZW50LCBkb21TdG9yYWdlQWdlbnQsIGRhdGFiYXNlQWdlbnQpOwpAQCAtMjA3LDYgKzIwNSw3 IEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6Y3JlYXRlTGF6eUFnZW50cygpCiAjZW5kaWYK ICAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxQYWdlQXVkaXRBZ2VudD4ocGFn ZUNvbnRleHQpKTsKICAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxJbnNwZWN0 b3JDYW52YXNBZ2VudD4ocGFnZUNvbnRleHQpKTsKKyAgICBtX2FnZW50cy5hcHBlbmQoc3RkOjpt YWtlX3VuaXF1ZTxJbnNwZWN0b3JUaW1lbGluZUFnZW50PihwYWdlQ29udGV4dCkpOwogfQogCiB2 b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Omluc3BlY3RlZFBhZ2VEZXN0cm95ZWQoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5o IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5oCmlu ZGV4IDg4NWYzZDA1NDkyNDgwZTdiZDI1NWVjY2YyMjUxZGMyNGRjMDI1Y2EuLmUxMDI4NWQ5M2Mz OTRhNTdjOWU4Mjg1YjY2MWQ4MTYxNGMyNTFiNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmgKQEAgLTE0MDgsMTEgKzE0MDgs MTMgQEAgaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb25zb2xlVGltZVN0 YW1wKEZyYW1lJiBmcmFtZSwgUmVmPEluc3BlY3QKIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjpzdGFydFByb2ZpbGluZyhQYWdlJiBwYWdlLCBKU0M6OkV4ZWNTdGF0ZSog ZXhlYywgY29uc3QgU3RyaW5nICZ0aXRsZSkKIHsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9O VEVORFModm9pZCgpKTsKICAgICBzdGFydFByb2ZpbGluZ0ltcGwoaW5zdHJ1bWVudGluZ0FnZW50 c0ZvclBhZ2UocGFnZSksIGV4ZWMsIHRpdGxlKTsKIH0KIAogaW5saW5lIHZvaWQgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpzdG9wUHJvZmlsaW5nKFBhZ2UmIHBhZ2UsIEpTQzo6RXhlY1N0YXRl KiBleGVjLCBjb25zdCBTdHJpbmcgJnRpdGxlKQogeworICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZS T05URU5EUyh2b2lkKCkpOwogICAgIHN0b3BQcm9maWxpbmdJbXBsKGluc3RydW1lbnRpbmdBZ2Vu dHNGb3JQYWdlKHBhZ2UpLCBleGVjLCB0aXRsZSk7CiB9CiAKQEAgLTE0MjUsMTIgKzE0MjcsMTQg QEAgaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpjb25zb2xlU3RhcnRSZWNv cmRpbmdDYW52YXMoQ2FudmFzUmVuZGVyaW4KIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpkaWRSZXF1ZXN0QW5pbWF0aW9uRnJhbWUoRG9jdW1lbnQmIGRvY3VtZW50LCBp bnQgY2FsbGJhY2tJZCkKIHsKKyAgICBGQVNUX1JFVFVSTl9JRl9OT19GUk9OVEVORFModm9pZCgp KTsKICAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGlu c3RydW1lbnRpbmdBZ2VudHNGb3JEb2N1bWVudChkb2N1bWVudCkpCiAgICAgICAgIGRpZFJlcXVl c3RBbmltYXRpb25GcmFtZUltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMsIGNhbGxiYWNrSWQsIGRv Y3VtZW50KTsKIH0KIAogaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRD YW5jZWxBbmltYXRpb25GcmFtZShEb2N1bWVudCYgZG9jdW1lbnQsIGludCBjYWxsYmFja0lkKQog eworICAgIEZBU1RfUkVUVVJOX0lGX05PX0ZST05URU5EUyh2b2lkKCkpOwogICAgIGlmIChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50 c0ZvckRvY3VtZW50KGRvY3VtZW50KSkKICAgICAgICAgZGlkQ2FuY2VsQW5pbWF0aW9uRnJhbWVJ bXBsKCppbnN0cnVtZW50aW5nQWdlbnRzLCBjYWxsYmFja0lkLCBkb2N1bWVudCk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5jcHAKaW5kZXgg YjU4ODZjNGY4NzA0MTk1NGE1OGVmN2M1YTc4NzBjMGZhNjMzMTI4YS4uYTBlYWU0YjE3YjdiYzYz MmQ1MDk3NmZiMGJmZTE0OGRiODI4ODcxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmNwcApAQCAtNTMsNiArNTMsNyBAQCB2b2lkIEluc3Ry dW1lbnRpbmdBZ2VudHM6OnJlc2V0KCkKICAgICBtX2luc3BlY3RvckRPTUFnZW50ID0gbnVsbHB0 cjsKICAgICBtX2luc3BlY3Rvck5ldHdvcmtBZ2VudCA9IG51bGxwdHI7CiAgICAgbV9wYWdlUnVu dGltZUFnZW50ID0gbnVsbHB0cjsKKyAgICBtX2luc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQg PSBudWxscHRyOwogICAgIG1faW5zcGVjdG9yVGltZWxpbmVBZ2VudCA9IG51bGxwdHI7CiAgICAg bV9wZXJzaXN0ZW50SW5zcGVjdG9yVGltZWxpbmVBZ2VudCA9IG51bGxwdHI7CiAgICAgbV9pbnNw ZWN0b3JET01TdG9yYWdlQWdlbnQgPSBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2VudHMuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnN0cnVtZW50aW5nQWdlbnRzLmgKaW5kZXggNTQ3NzczMmE1ZTVjMjU1MjNiN2QyMjQx MGM1MTRlODVjNmI2MDRjYi4uOWE5Y2U2Y2UyYzlmNzE4Y2Q2MTcyYzA0Y2M5ZTZiODk3MmZjNDMz NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3RydW1lbnRpbmdBZ2Vu dHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zdHJ1bWVudGluZ0FnZW50cy5o CkBAIC0zOSw2ICszOSw3IEBACiBuYW1lc3BhY2UgSW5zcGVjdG9yIHsKIGNsYXNzIEluc3BlY3Rv ckFnZW50OwogY2xhc3MgSW5zcGVjdG9yRGVidWdnZXJBZ2VudDsKK2NsYXNzIEluc3BlY3RvclNj cmlwdFByb2ZpbGVyQWdlbnQ7CiB9CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEwMiw2ICsx MDMsOSBAQCBwdWJsaWM6CiAgICAgUGFnZVJ1bnRpbWVBZ2VudCogcGFnZVJ1bnRpbWVBZ2VudCgp IGNvbnN0IHsgcmV0dXJuIG1fcGFnZVJ1bnRpbWVBZ2VudDsgfQogICAgIHZvaWQgc2V0UGFnZVJ1 bnRpbWVBZ2VudChQYWdlUnVudGltZUFnZW50KiBhZ2VudCkgeyBtX3BhZ2VSdW50aW1lQWdlbnQg PSBhZ2VudDsgfQogCisgICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50 KiBpbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50KCkgY29uc3QgeyByZXR1cm4gbV9pbnNwZWN0 b3JTY3JpcHRQcm9maWxlckFnZW50OyB9CisgICAgdm9pZCBzZXRJbnNwZWN0b3JTY3JpcHRQcm9m aWxlckFnZW50KEluc3BlY3Rvcjo6SW5zcGVjdG9yU2NyaXB0UHJvZmlsZXJBZ2VudCogYWdlbnQp IHsgbV9pbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50ID0gYWdlbnQ7IH0KKwogICAgIEluc3Bl Y3RvclRpbWVsaW5lQWdlbnQqIGluc3BlY3RvclRpbWVsaW5lQWdlbnQoKSBjb25zdCB7IHJldHVy biBtX2luc3BlY3RvclRpbWVsaW5lQWdlbnQ7IH0KICAgICB2b2lkIHNldEluc3BlY3RvclRpbWVs aW5lQWdlbnQoSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogYWdlbnQpIHsgbV9pbnNwZWN0b3JUaW1l bGluZUFnZW50ID0gYWdlbnQ7IH0KIApAQCAtMTU3LDYgKzE2MSw3IEBAIHByaXZhdGU6CiAgICAg SW5zcGVjdG9yRE9NQWdlbnQqIG1faW5zcGVjdG9yRE9NQWdlbnQgeyBudWxscHRyIH07CiAgICAg SW5zcGVjdG9yTmV0d29ya0FnZW50KiBtX2luc3BlY3Rvck5ldHdvcmtBZ2VudCB7IG51bGxwdHIg fTsKICAgICBQYWdlUnVudGltZUFnZW50KiBtX3BhZ2VSdW50aW1lQWdlbnQgeyBudWxscHRyIH07 CisgICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50KiBtX2luc3BlY3Rv clNjcmlwdFByb2ZpbGVyQWdlbnQgeyBudWxscHRyIH07CiAgICAgSW5zcGVjdG9yVGltZWxpbmVB Z2VudCogbV9pbnNwZWN0b3JUaW1lbGluZUFnZW50IHsgbnVsbHB0ciB9OwogICAgIEluc3BlY3Rv clRpbWVsaW5lQWdlbnQqIG1fcGVyc2lzdGVudEluc3BlY3RvclRpbWVsaW5lQWdlbnQgeyBudWxs cHRyIH07CiAgICAgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50KiBtX2luc3BlY3RvckRPTVN0b3Jh Z2VBZ2VudCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvYWdlbnRzL0luc3BlY3RvclRpbWVsaW5lQWdlbnQuY3BwCmluZGV4IDA1MDViZDNlNmU4 YzYxZGI4NWQ0YTJlNGE1ZDk3NDQ3YTJlOWNhM2UuLjZiMmI1NmEyYzVjZGVlMGQ2NDI2YTM2MmI0 ZjRmODAwZjFkZTVjY2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2Vu dHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmNwcApAQCAtNDEsNiArNDEsNyBAQAog I2luY2x1ZGUgIkluc3BlY3RvclBhZ2VBZ2VudC5oIgogI2luY2x1ZGUgIkluc3RydW1lbnRpbmdB Z2VudHMuaCIKICNpbmNsdWRlICJKU0RPTVdpbmRvdy5oIgorI2luY2x1ZGUgIlBhZ2VIZWFwQWdl bnQuaCIKICNpbmNsdWRlICJQYWdlU2NyaXB0RGVidWdTZXJ2ZXIuaCIKICNpbmNsdWRlICJSZW5k ZXJWaWV3LmgiCiAjaW5jbHVkZSAiU2NyaXB0U3RhdGUuaCIKQEAgLTQ4LDcgKzQ5LDYgQEAKICNp bmNsdWRlICJXZWJDb25zb2xlQWdlbnQuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Db25z b2xlTWVzc2FnZS5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0luc3BlY3RvckRlYnVnZ2Vy QWdlbnQuaD4KLSNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JIZWFwQWdlbnQuaD4K ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9JbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50Lmg+ CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvU2NyaXB0QnJlYWtwb2ludC5oPgogI2luY2x1ZGUg PHd0Zi9TdG9wd2F0Y2guaD4KQEAgLTgzLDEzICs4MywxMCBAQCBzdGF0aWMgQ0ZSdW5Mb29wUmVm IGN1cnJlbnRSdW5Mb29wKCkKIH0KICNlbmRpZgogCi1JbnNwZWN0b3JUaW1lbGluZUFnZW50OjpJ bnNwZWN0b3JUaW1lbGluZUFnZW50KFdlYkFnZW50Q29udGV4dCYgY29udGV4dCwgSW5zcGVjdG9y U2NyaXB0UHJvZmlsZXJBZ2VudCogc2NyaXB0UHJvZmlsZUFnZW50LCBJbnNwZWN0b3JIZWFwQWdl bnQqIGhlYXBBZ2VudCwgSW5zcGVjdG9yUGFnZUFnZW50KiBwYWdlQWdlbnQpCitJbnNwZWN0b3JU aW1lbGluZUFnZW50OjpJbnNwZWN0b3JUaW1lbGluZUFnZW50KFdlYkFnZW50Q29udGV4dCYgY29u dGV4dCkKICAgICA6IEluc3BlY3RvckFnZW50QmFzZSgiVGltZWxpbmUiX3MsIGNvbnRleHQpCiAg ICAgLCBtX2Zyb250ZW5kRGlzcGF0Y2hlcihzdGQ6Om1ha2VfdW5pcXVlPEluc3BlY3Rvcjo6VGlt ZWxpbmVGcm9udGVuZERpc3BhdGNoZXI+KGNvbnRleHQuZnJvbnRlbmRSb3V0ZXIpKQogICAgICwg bV9iYWNrZW5kRGlzcGF0Y2hlcihJbnNwZWN0b3I6OlRpbWVsaW5lQmFja2VuZERpc3BhdGNoZXI6 OmNyZWF0ZShjb250ZXh0LmJhY2tlbmREaXNwYXRjaGVyLCB0aGlzKSkKLSAgICAsIG1fc2NyaXB0 UHJvZmlsZXJBZ2VudChzY3JpcHRQcm9maWxlQWdlbnQpCi0gICAgLCBtX2hlYXBBZ2VudChoZWFw QWdlbnQpCi0gICAgLCBtX3BhZ2VBZ2VudChwYWdlQWdlbnQpCiB7CiB9CiAKQEAgLTUzMiwyNSAr NTI5LDI1IEBAIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6dG9nZ2xlSW5zdHJ1bWVudHMo SW5zdHJ1bWVudFN0YXRlIHN0YXRlKQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OnRv Z2dsZVNjcmlwdFByb2ZpbGVySW5zdHJ1bWVudChJbnN0cnVtZW50U3RhdGUgc3RhdGUpCiB7Ci0g ICAgaWYgKG1fc2NyaXB0UHJvZmlsZXJBZ2VudCkgeworICAgIGlmIChhdXRvKiBzY3JpcHRQcm9m aWxlckFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclNjcmlwdFByb2ZpbGVy QWdlbnQoKSkgewogICAgICAgICBFcnJvclN0cmluZyB1bnVzZWQ7CiAgICAgICAgIGlmIChzdGF0 ZSA9PSBJbnN0cnVtZW50U3RhdGU6OlN0YXJ0KSB7CiAgICAgICAgICAgICBjb25zdCBib29sIGlu Y2x1ZGVTYW1wbGVzID0gdHJ1ZTsKLSAgICAgICAgICAgIG1fc2NyaXB0UHJvZmlsZXJBZ2VudC0+ c3RhcnRUcmFja2luZyh1bnVzZWQsICZpbmNsdWRlU2FtcGxlcyk7CisgICAgICAgICAgICBzY3Jp cHRQcm9maWxlckFnZW50LT5zdGFydFRyYWNraW5nKHVudXNlZCwgJmluY2x1ZGVTYW1wbGVzKTsK ICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBtX3NjcmlwdFByb2ZpbGVyQWdlbnQtPnN0b3BU cmFja2luZyh1bnVzZWQpOworICAgICAgICAgICAgc2NyaXB0UHJvZmlsZXJBZ2VudC0+c3RvcFRy YWNraW5nKHVudXNlZCk7CiAgICAgfQogfQogCiB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6 OnRvZ2dsZUhlYXBJbnN0cnVtZW50KEluc3RydW1lbnRTdGF0ZSBzdGF0ZSkKIHsKLSAgICBpZiAo bV9oZWFwQWdlbnQpIHsKKyAgICBpZiAoYXV0byogaGVhcEFnZW50ID0gbV9pbnN0cnVtZW50aW5n QWdlbnRzLnBhZ2VIZWFwQWdlbnQoKSkgewogICAgICAgICBFcnJvclN0cmluZyB1bnVzZWQ7CiAg ICAgICAgIGlmIChzdGF0ZSA9PSBJbnN0cnVtZW50U3RhdGU6OlN0YXJ0KSB7CiAgICAgICAgICAg ICBpZiAobV9hdXRvQ2FwdHVyZVBoYXNlID09IEF1dG9DYXB0dXJlUGhhc2U6Ok5vbmUgfHwgbV9h dXRvQ2FwdHVyZVBoYXNlID09IEF1dG9DYXB0dXJlUGhhc2U6OkZpcnN0TmF2aWdhdGlvbikKLSAg ICAgICAgICAgICAgICBtX2hlYXBBZ2VudC0+c3RhcnRUcmFja2luZyh1bnVzZWQpOworICAgICAg ICAgICAgICAgIGhlYXBBZ2VudC0+c3RhcnRUcmFja2luZyh1bnVzZWQpOwogICAgICAgICB9IGVs c2UKLSAgICAgICAgICAgIG1faGVhcEFnZW50LT5zdG9wVHJhY2tpbmcodW51c2VkKTsKKyAgICAg ICAgICAgIGhlYXBBZ2VudC0+c3RvcFRyYWNraW5nKHVudXNlZCk7CiAgICAgfQogfQogCkBAIC03 MTIsMTIgKzcwOSwxNCBAQCB2b2lkIEluc3BlY3RvclRpbWVsaW5lQWdlbnQ6OmFkZFJlY29yZFRv VGltZWxpbmUoUmVmUHRyPEpTT046Ok9iamVjdD4mJiByZWNvcmQsCiAKIHZvaWQgSW5zcGVjdG9y VGltZWxpbmVBZ2VudDo6c2V0RnJhbWVJZGVudGlmaWVyKEpTT046Ok9iamVjdCogcmVjb3JkLCBG cmFtZSogZnJhbWUpCiB7Ci0gICAgaWYgKCFmcmFtZSB8fCAhbV9wYWdlQWdlbnQpCisgICAgaWYg KCFmcmFtZSkKICAgICAgICAgcmV0dXJuOwotICAgIFN0cmluZyBmcmFtZUlkOwotICAgIGlmIChm cmFtZSAmJiBtX3BhZ2VBZ2VudCkKLSAgICAgICAgZnJhbWVJZCA9IG1fcGFnZUFnZW50LT5mcmFt ZUlkKGZyYW1lKTsKLSAgICByZWNvcmQtPnNldFN0cmluZygiZnJhbWVJZCIsIGZyYW1lSWQpOwor CisgICAgYXV0byogcGFnZUFnZW50ID0gbV9pbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvclBh Z2VBZ2VudCgpOworICAgIGlmICghcGFnZUFnZW50KQorICAgICAgICByZXR1cm47CisKKyAgICBy ZWNvcmQtPnNldFN0cmluZygiZnJhbWVJZCJfcywgcGFnZUFnZW50LT5mcmFtZUlkKGZyYW1lKSk7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yVGltZWxpbmVBZ2VudDo6ZGlkQ29tcGxldGVSZWNvcmRFbnRy eShjb25zdCBUaW1lbGluZVJlY29yZEVudHJ5JiBlbnRyeSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yVGltZWxpbmVBZ2VudC5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKaW5kZXgg ODI4NDdjNjc4OGI5ZTNjY2I0YjUwYjYyYmM3OWYyMjNlMjc5NWI4OS4uOTBhMzk2ZjRiOWM4ODU2 NmQwNmQ0MWY2OTgxMmZkY2IwYmJlYzExYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JUaW1lbGluZUFnZW50LmgKQEAgLTQwLDE3ICs0 MCwxMSBAQAogI2luY2x1ZGUgPHd0Zi9KU09OVmFsdWVzLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rv ci5oPgogCi1uYW1lc3BhY2UgSW5zcGVjdG9yIHsKLWNsYXNzIEluc3BlY3RvckhlYXBBZ2VudDsK LWNsYXNzIEluc3BlY3RvclNjcmlwdFByb2ZpbGVyQWdlbnQ7Ci19Ci0KIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAogY2xhc3MgRXZlbnQ7CiBjbGFzcyBGbG9hdFF1YWQ7CiBjbGFzcyBGcmFtZTsKLWNs YXNzIEluc3BlY3RvclBhZ2VBZ2VudDsKIGNsYXNzIFJlbmRlck9iamVjdDsKIGNsYXNzIFJ1bkxv b3BPYnNlcnZlcjsKIApAQCAtOTQsNyArODgsNyBAQCBjbGFzcyBJbnNwZWN0b3JUaW1lbGluZUFn ZW50IGZpbmFsCiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoSW5zcGVjdG9yVGltZWxpbmVBZ2Vu dCk7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgSW5zcGVjdG9y VGltZWxpbmVBZ2VudChXZWJBZ2VudENvbnRleHQmLCBJbnNwZWN0b3I6Okluc3BlY3RvclNjcmlw dFByb2ZpbGVyQWdlbnQqLCBJbnNwZWN0b3I6Okluc3BlY3RvckhlYXBBZ2VudCosIEluc3BlY3Rv clBhZ2VBZ2VudCopOworICAgIEluc3BlY3RvclRpbWVsaW5lQWdlbnQoV2ViQWdlbnRDb250ZXh0 Jik7CiAgICAgdmlydHVhbCB+SW5zcGVjdG9yVGltZWxpbmVBZ2VudCgpOwogCiAgICAgdm9pZCBk aWRDcmVhdGVGcm9udGVuZEFuZEJhY2tlbmQoSW5zcGVjdG9yOjpGcm9udGVuZFJvdXRlciosIElu c3BlY3Rvcjo6QmFja2VuZERpc3BhdGNoZXIqKSBmaW5hbDsKQEAgLTIxMiw5ICsyMDYsNiBAQCBw cml2YXRlOgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPEluc3BlY3Rvcjo6VGltZWxpbmVGcm9udGVu ZERpc3BhdGNoZXI+IG1fZnJvbnRlbmREaXNwYXRjaGVyOwogICAgIFJlZlB0cjxJbnNwZWN0b3I6 OlRpbWVsaW5lQmFja2VuZERpc3BhdGNoZXI+IG1fYmFja2VuZERpc3BhdGNoZXI7Ci0gICAgSW5z cGVjdG9yOjpJbnNwZWN0b3JTY3JpcHRQcm9maWxlckFnZW50KiBtX3NjcmlwdFByb2ZpbGVyQWdl bnQ7Ci0gICAgSW5zcGVjdG9yOjpJbnNwZWN0b3JIZWFwQWdlbnQqIG1faGVhcEFnZW50OwotICAg IEluc3BlY3RvclBhZ2VBZ2VudCogbV9wYWdlQWdlbnQ7CiAKICAgICBWZWN0b3I8VGltZWxpbmVS ZWNvcmRFbnRyeT4gbV9yZWNvcmRTdGFjazsKICAgICBWZWN0b3I8VGltZWxpbmVSZWNvcmRFbnRy eT4gbV9wZW5kaW5nQ29uc29sZVByb2ZpbGVSZWNvcmRzOwo=