173895 2017-06-27 17:02:37 -0700 [ResourceLoadStatistics] Update minimumTimeBetweeenDataRecordsRemoval to 1 hour instead of 1 minute 2017-06-27 22:14:29 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=173882 InRadar P2 Normal --- 1 cdumez cdumez bfulgham buildbot commit-queue dbates ggaren japhet wilander oldest_to_newest 1323328 0 cdumez 2017-06-27 17:02:37 -0700 Update minimumTimeBetweeenDataRecordsRemoval to 1 hour instead of 1 minute, and port code to modern time types. 1323329 1 cdumez 2017-06-27 17:03:43 -0700 <rdar://problem/32984366> 1323377 2 313974 cdumez 2017-06-27 19:40:58 -0700 Created attachment 313974 Patch 1323383 3 313975 cdumez 2017-06-27 19:54:56 -0700 Created attachment 313975 Patch 1323413 4 313975 bfulgham 2017-06-27 21:44:12 -0700 Comment on attachment 313975 Patch Nice improvements! R=me 1323423 5 313975 commit-queue 2017-06-27 22:14:27 -0700 Comment on attachment 313975 Patch Clearing flags on attachment: 313975 Committed r218865: <http://trac.webkit.org/changeset/218865> 1323424 6 commit-queue 2017-06-27 22:14:29 -0700 All reviewed patches have been landed. Closing bug. 313974 2017-06-27 19:40:58 -0700 2017-06-27 19:54:54 -0700 Patch bug-173895-20170627194057.patch text/plain 25673 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNiNDk4YTFhZDRkZGY1 OGIwYzc4NGI5MmRlMDNmOThmYjU5ZjFhZS4uNTdhMDYxYjgyYzViOTA3ZjRjZjExZDY0MTc1MGIx NmQ0NjQ5M2Q2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE3LTA2LTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRp c3RpY3NdIFVwZGF0ZSBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHRvIDEg aG91ciBpbnN0ZWFkIG9mIDEgbWludXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzM4OTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyOTg0MzY2 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHRvIDEgaG91ciBpbnN0ZWFk IG9mIDEgbWludXRlIHRvIHNhdmUgYmF0dGVyeS4KKyAgICAgICAgQWxzbyBwb3J0IGNvZGUgdG8g bW9kZXJuIHRpbWUgdHlwZXMuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVkdWNlVGltZVJlc29sdXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldpdGhS ZWR1Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2Jz ZXJ2ZXI6OnNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzZXRNaW5pbXVtVGltZUJl dHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h ZE9ic2VydmVyOjpzZXRSZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlvbik6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAg ICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvUmVz b3VyY2VMb2FkU3RhdGlzdGljcy5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3Rh dGlzdGljczo6bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUpOgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGVFbmNvZGVyRnJvbURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWFkRGF0YUZyb21EZWNv ZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlVXNl ckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0 YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6dG9wUHJpdmF0ZWx5 Q29udHJvbGxlZERvbWFpbnNUb1JlbW92ZVdlYnNpdGVEYXRhRm9yKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0 eU9yTm9TdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6ZGF0YVJlY29yZHNCZWluZ1JlbW92ZWQpOgorICAgICAgICAq IGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKwogMjAxNy0wNi0yNyAgQW50 b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNhcmQgaWNvbnMg YWN0IGxpa2UgYnV0dG9ucyAoY2FuIGdldCBrZXlib2FyZCBmb2N1cyBhbmQgc2hvd3MgdXAgaW4g Vm9pY2VPdmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGM3NjY1MTU2Y2Q2NzVjY2I4NDRmNWE3YjIwNmNhMjEx YWM2ZTVmZDkuLmNlY2E3YTAyOGQ5NzJkYTkyYjNhNTBkNDIzNTdjMTgzYTI0YTVhZjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxNy0wNi0yNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCisgICAgICAgIFtSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSBVcGRhdGUgbWlu aW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCB0byAxIGhvdXIgaW5zdGVhZCBvZiAx IG1pbnV0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTczODk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjk4NDM2Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgbWluaW11bVRpbWVCZXR3 ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCB0byAxIGhvdXIgaW5zdGVhZCBvZiAxIG1pbnV0ZSB0byBz YXZlIGJhdHRlcnkuCisgICAgICAgIEFsc28gcG9ydCBjb2RlIHRvIG1vZGVybiB0aW1lIHR5cGVz LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01h bmFnZXIuY3BwOgorICAgICAgICAoV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlclNldFRp bWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV0tSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWFuYWdlclNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToKKyAgICAgICAgKFdL UmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJl Y29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJT ZXRHcmFuZGZhdGhlcmluZ1RpbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRpbWVUb0xp dmVDb29raWVQYXJ0aXRpb25GcmVlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01hbmFnZXI6OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92 YWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlcjo6 c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc01hbmFnZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmg6CisKKzIwMTctMDYtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXSBBdm9pZCB0YWtpbmcgLyByZWxlYXNpbmcgcHJv Y2VzcyBhc3NlcnRpb25zIHRvbyBxdWlja2x5IGR1ZSB0byBkYXRhYmFzZSBhY3Rpdml0eQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczODc5CiAgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8zMjQxMjcwMT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmluZGV4IDkxYTdkOGQzOTBmNmIxNWZmZmJhYjAxODcz MTgxMjc1ZWJiY2IxNjcuLmY4YTY2Zjk1YWQ2MTFlZmQxZjdmZDI3MTY5Mzc4Yzk0YTBhYzRmYjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcApA QCAtNTAsOCArNTAsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIE9uZSBob3VyIGlu IHNlY29uZHMuCi1zdGF0aWMgYXV0byB0aW1lc3RhbXBSZXNvbHV0aW9uID0gMzYwMDsKK3N0YXRp YyBTZWNvbmRzIHRpbWVzdGFtcFJlc29sdXRpb24geyAxX2ggfTsKIAogUmVzb3VyY2VMb2FkT2Jz ZXJ2ZXImIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpCiB7CkBAIC0zNTAs OSArMzQ5LDkgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2ViU29ja2V0TG9hZGlu Zyhjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgdGEKICAgICB9KTsKIH0KIAotc3RhdGlj IGRvdWJsZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihkb3VibGUgc2Vjb25kcykKK3N0YXRpYyBXYWxs VGltZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZSB0aW1lKQogewotICAgIHJldHVybiBz dGQ6OmZsb29yKHNlY29uZHMgLyB0aW1lc3RhbXBSZXNvbHV0aW9uKSAqIHRpbWVzdGFtcFJlc29s dXRpb247CisgICAgcmV0dXJuIFdhbGxUaW1lOjpmcm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRp bWUuc2Vjb25kc1NpbmNlRXBvY2goKSAvIHRpbWVzdGFtcFJlc29sdXRpb24pICogdGltZXN0YW1w UmVzb2x1dGlvbi5zZWNvbmRzKCkpOwogfQogCiB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjps b2dVc2VySW50ZXJhY3Rpb25XaXRoUmVkdWNlZFRpbWVSZXNvbHV0aW9uKGNvbnN0IERvY3VtZW50 JiBkb2N1bWVudCkKQEAgLTM3MywxMiArMzcyLDEyIEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldpdGhSZWR1Y2VkVGltZVJlc29sdXRpb24oY29uc3QgRG9j CiAgICAgICAgIHsKICAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhtX3N0b3JlLT5zdGF0 aXN0aWNzTG9jaygpKTsKICAgICAgICAgYXV0byYgc3RhdGlzdGljcyA9IG1fc3RvcmUtPmVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4ocHJpbWFyeURvbWFpblN0cmluZyk7 Ci0gICAgICAgIGRvdWJsZSBuZXdUaW1lc3RhbXAgPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXVEY6 OmN1cnJlbnRUaW1lKCkpOwotICAgICAgICBpZiAobmV3VGltZXN0YW1wID09IHN0YXRpc3RpY3Mu bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbikKKyAgICAgICAgV2FsbFRpbWUgbmV3VGltZSA9IHJl ZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIGlmIChuZXdUaW1l ID09IHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSkKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBzdGF0aXN0aWNzLmhhZFVzZXJJbnRlcmFjdGlvbiA9IHRy dWU7Ci0gICAgICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiA9IG5ld1Rp bWVzdGFtcDsKKyAgICAgICAgc3RhdGlzdGljcy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uID0g bmV3VGltZS5zZWNvbmRzU2luY2VFcG9jaCgpLnZhbHVlKCk7CiAgICAgICAgIH0KICAgICAgICAg CiAgICAgICAgIG1fc3RvcmUtPmZpcmVEYXRhTW9kaWZpY2F0aW9uSGFuZGxlcigpOwpAQCAtNTMx LDI4ICs1MzAsMjggQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0U3VicmVzb3VyY2VV bmlxdWVSZWRpcmVjdFRvKGNvbnN0IFVSTCYgc3VicmVzb3VyY2UKICAgICB9KTsKIH0KIAotdm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihkb3Vi bGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldFRpbWVUb0xpdmVVc2Vy SW50ZXJhY3Rpb24oU2Vjb25kcyBzZWNvbmRzKQogewogICAgIG1fc3RvcmUtPnNldFRpbWVUb0xp dmVVc2VySW50ZXJhY3Rpb24oc2Vjb25kcyk7CiB9CiAKLXZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKGRvdWJsZSBzZWNvbmRzKQordm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUo U2Vjb25kcyBzZWNvbmRzKQogewogICAgIG1fc3RvcmUtPnNldFRpbWVUb0xpdmVDb29raWVQYXJ0 aXRpb25GcmVlKHNlY29uZHMpOwogfQogCi12b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpzZXRN aW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKGRvdWJsZSBzZWNvbmRzKQordm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRz UmVtb3ZhbChTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgbV9zdG9yZS0+c2V0TWluaW11bVRpbWVC ZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChzZWNvbmRzKTsKIH0KICAgICAKLXZvaWQgUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXI6OnNldFJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKGRvdWJsZSBzZWNv bmRzKQordm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0UmVkdWNlZFRpbWVzdGFtcFJlc29s dXRpb24oU2Vjb25kcyBzZWNvbmRzKQogewotICAgIGlmIChzZWNvbmRzID4gMCkKKyAgICBpZiAo c2Vjb25kcyA+IDBfcykKICAgICAgICAgdGltZXN0YW1wUmVzb2x1dGlvbiA9IHNlY29uZHM7CiB9 CiAKLXZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldEdyYW5kZmF0aGVyaW5nVGltZShkb3Vi bGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldEdyYW5kZmF0aGVyaW5n VGltZShTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgbV9zdG9yZS0+c2V0TWluaW11bVRpbWVCZXR3 ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChzZWNvbmRzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmgKaW5kZXggMDFhYzJmNjk0MzhmZTQ1MWU2ZjljNjNj NzNkMDA0OTU1Y2NlZTcyMi4uYmQ3NTkwYmJjN2I4MmNlN2YyNWZhMGYxMzJiNWYyOGE2YmU1YThl ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmgKQEAg LTY5LDExICs2OSwxMSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTdWJy ZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW4oY29uc3QgVVJMJiBzdWJyZXNvdXJjZSwgY29uc3Qg VVJMJiB0b3BGcmFtZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTdWJyZXNvdXJjZVVu aXF1ZVJlZGlyZWN0VG8oY29uc3QgVVJMJiBzdWJyZXNvdXJjZSwgY29uc3QgVVJMJiBob3N0TmFt ZVJlZGlyZWN0ZWRUbyk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFRpbWVUb0xpdmVV c2VySW50ZXJhY3Rpb24oZG91YmxlIHNlY29uZHMpOwotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91YmxlIHNlY29uZHMpOwotICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3Zh bChkb3VibGUgc2Vjb25kcyk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRSZWR1Y2VkVGlt ZXN0YW1wUmVzb2x1dGlvbihkb3VibGUgc2Vjb25kcyk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91YmxlIHNlY29uZHMpOworICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihTZWNvbmRzKTsKKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKFNlY29uZHMp OworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNv cmRzUmVtb3ZhbChTZWNvbmRzKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFJlZHVjZWRU aW1lc3RhbXBSZXNvbHV0aW9uKFNlY29uZHMpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMpOwogICAgIAogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgZmlyZURhdGFNb2RpZmljYXRpb25IYW5kbGVyKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBmaXJlU2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCmluZGV4IDM1ODNlOTZmMWM4ZWZmYmMx MWM2ZDVlMDU3MjE5ZjVlYzE0YzVhM2QuLmM0ODc1NzUxMTA2MjY1NGVjNzM5OGZiNjg2MWY1YWY5 NjEzMGQzNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaApAQCAtMjYsNiArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYv SGFzaENvdW50ZWRTZXQuaD4KKyNpbmNsdWRlIDx3dGYvV2FsbFRpbWUuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK QEAgLTQ5LDExICs1MCwxNCBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyB7CiAKICAg ICB2b2lkIG1lcmdlKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmKTsKIAorICAgIFdhbGxU aW1lIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lKCkgY29uc3QgeyByZXR1cm4gV2FsbFRp bWU6OmZyb21SYXdTZWNvbmRzKG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24pOyB9CisKICAgICBT dHJpbmcgaGlnaExldmVsRG9tYWluOwogCiAgICAgLy8gVXNlciBpbnRlcmFjdGlvbgogICAgIGJv b2wgaGFkVXNlckludGVyYWN0aW9uIHsgZmFsc2UgfTsKICAgICAvLyBUaW1lc3RhbXAuIERlZmF1 bHQgdmFsdWUgaXMgbmVnYXRpdmUsIDAgbWVhbnMgaXQgd2FzIHJlc2V0LgorICAgIC8vIEZJWE1F OiBDYW4gdGhpcyB1c2UgV2FsbFRpbWU/CiAgICAgZG91YmxlIG1vc3RSZWNlbnRVc2VySW50ZXJh Y3Rpb24geyAtMSB9OwogICAgIGJvb2wgZ3JhbmRmYXRoZXJlZCB7IGZhbHNlIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKaW5kZXggNjRlN2NjODVhMjE2MjIwMGI0YzI1NmE0NGYzMmRjM2FhMWU4NWU2Ni4uMWNkYjk2 Zjc4NDdmMjMwYWFiODFiNDAzOWJhMGYyZmI4M2MzMjZhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTQyLDEy ICs0MiwxMSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgY29uc3QgYXV0byBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uID0gNDsKLXN0YXRpYyBjb25zdCBhdXRvIHNlY29uZHNQZXJIb3Vy ID0gMzYwMDsKLXN0YXRpYyBjb25zdCBhdXRvIHNlY29uZHNQZXJEYXkgPSAyNCAqIHNlY29uZHNQ ZXJIb3VyOwotc3RhdGljIGF1dG8gdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IDMwICogc2Vj b25kc1BlckRheTsKLXN0YXRpYyBhdXRvIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0g MSAqIHNlY29uZHNQZXJEYXk7Ci1zdGF0aWMgYXV0byBncmFuZGZhdGhlcmluZ1RpbWUgPSAxICog c2Vjb25kc1BlckhvdXI7Ci1zdGF0aWMgYXV0byBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29y ZHNSZW1vdmFsID0gNjA7CitzdGF0aWMgY29uc3QgYXV0byBzZWNvbmRzUGVyRGF5ID0gMjQgKiAz NjAwOworc3RhdGljIFNlY29uZHMgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiB7IDI0X2ggKiAz MC4gfTsKK3N0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlIHsgMjRf aCB9Oworc3RhdGljIFNlY29uZHMgZ3JhbmRmYXRoZXJpbmdUaW1lIHsgMV9oIH07CitzdGF0aWMg U2Vjb25kcyBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHsgMV9oIH07CiAK IFJlZjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6Y3JlYXRlKCkKIHsKQEAgLTkwLDcgKzg5LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEtleWVk RW5jb2Rlcj4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGVFbmNvZGVyRnJvbURh dGEKIAogICAgIGF1dG8gbG9ja2VyID0gaG9sZExvY2sobV9zdGF0aXN0aWNzTG9jayk7CiAgICAg ZW5jb2Rlci0+ZW5jb2RlVUludDMyKCJ2ZXJzaW9uIiwgc3RhdGlzdGljc01vZGVsVmVyc2lvbik7 Ci0gICAgZW5jb2Rlci0+ZW5jb2RlRG91YmxlKCJlbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1w IiwgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wKTsKKyAgICBlbmNvZGVyLT5lbmNvZGVE b3VibGUoImVuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAiLCBtX2VuZE9mR3JhbmRmYXRoZXJp bmdUaW1lc3RhbXAuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpKTsKICAgICAKICAgICBlbmNv ZGVyLT5lbmNvZGVPYmplY3RzKCJicm93c2luZ1N0YXRpc3RpY3MiLCBtX3Jlc291cmNlU3RhdGlz dGljc01hcC5iZWdpbigpLCBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5lbmQoKSwgW10oS2V5ZWRF bmNvZGVyJiBlbmNvZGVySW5uZXIsIGNvbnN0IFN0YXRpc3RpY3NWYWx1ZSYgb3JpZ2luKSB7CiAg ICAgICAgIG9yaWdpbi52YWx1ZS5lbmNvZGUoZW5jb2RlcklubmVyKTsKQEAgLTExNCw5ICsxMTMs OSBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVhZERhdGFGcm9tRGVjb2Rl cihLZXllZERlY29kZXImIGRlY29kZXIpCiAgICAgaWYgKHZlcnNpb24gPiBtaW5pbXVtVmVyc2lv bldpdGhHcmFuZGZhdGhlcmluZykgewogICAgICAgICBkb3VibGUgZW5kT2ZHcmFuZGZhdGhlcmlu Z1RpbWVzdGFtcDsKICAgICAgICAgaWYgKGRlY29kZXIuZGVjb2RlRG91YmxlKCJlbmRPZkdyYW5k ZmF0aGVyaW5nVGltZXN0YW1wIiwgZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCkpCi0gICAg ICAgICAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBlbmRPZkdyYW5kZmF0aGVy aW5nVGltZXN0YW1wOworICAgICAgICAgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1w ID0gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKGVuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAp OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3Rh bXAgPSAwOworICAgICAgICAgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wID0geyB9 OwogICAgIH0KIAogICAgIFZlY3RvcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiBsb2FkZWRTdGF0 aXN0aWNzOwpAQCAtMjQ3LDcgKzI0Niw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpmaXJlVGVsZW1ldHJ5SGFuZGxlcigpCiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkUGFy dGl0aW9uQ29va2llcyhjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWMpCiB7 CiAgICAgcmV0dXJuIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlCi0gICAgICAgICYmICgh c3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBjdXJyZW50VGltZSgpID4gc3RhdGlzdGlj Lm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gKyB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJl ZSk7CisgICAgICAgICYmICghc3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBXYWxsVGlt ZTo6bm93KCkgPiBzdGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSArIHRp bWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKTsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OmZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlcigpCkBAIC0zMDEs MjcgKzMwMCwyNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3Vs ZFBhcnRpdGlvbkNvb2tpZXNIYW5kbGVyKGNvbnN0IFZlY3RvcgogICAgICAgICBlbnN1cmVSZXNv dXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKGRvbWFpbikuaXNNYXJrZWRGb3JDb29raWVQ YXJ0aXRpb25pbmcgPSB0cnVlOwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6c2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihkb3VibGUgc2Vjb25kcykKK3ZvaWQgUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNl Y29uZHMgc2Vjb25kcykKIHsKLSAgICBpZiAoc2Vjb25kcyA+PSAwKQorICAgIGlmIChzZWNvbmRz ID49IDBfcykKICAgICAgICAgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IHNlY29uZHM7CiB9 CiAKLXZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2ll UGFydGl0aW9uRnJlZShkb3VibGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzIHNlY29uZHMp CiB7Ci0gICAgaWYgKHNlY29uZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCiAgICAg ICAgIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0gc2Vjb25kczsKIH0KIAotdm9pZCBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVj b3Jkc1JlbW92YWwoZG91YmxlIHNlY29uZHMpCit2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChTZWNvbmRzIHNl Y29uZHMpCiB7Ci0gICAgaWYgKHNlY29uZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3Mp CiAgICAgICAgIG1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwgPSBzZWNvbmRz OwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJp bmdUaW1lKGRvdWJsZSBzZWNvbmRzKQordm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnNldEdyYW5kZmF0aGVyaW5nVGltZShTZWNvbmRzIHNlY29uZHMpCiB7Ci0gICAgaWYgKHNlY29u ZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCiAgICAgICAgIGdyYW5kZmF0aGVyaW5n VGltZSA9IHNlY29uZHM7CiB9CiAKQEAgLTMzOCw3ICszMzcsNyBAQCBib29sIFJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9uKFJlc291cmNlTG9h ZFN0YXRpcwogICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaGFkVXNlckludGVyYWN0aW9uKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoY3VycmVudFRpbWUoKSA+IHJlc291cmNl U3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gKyB0aW1lVG9MaXZlVXNlckludGVy YWN0aW9uKSB7CisgICAgaWYgKFdhbGxUaW1lOjpub3coKSA+IHJlc291cmNlU3RhdGlzdGljLm1v c3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lKCkgKyB0aW1lVG9MaXZlVXNlckludGVyYWN0aW9u KSB7CiAgICAgICAgIC8vIERyb3AgcHJpdmFjeSBzZW5zaXRpdmUgZGF0YSBiZWNhdXNlIHdlIG5v IGxvbmdlciBuZWVkIGl0LgogICAgICAgICAvLyBTZXQgdGltZXN0YW1wIHRvIDAuMCBzbyB0aGF0 IHN0YXRpc3RpY3MgbWVyZ2Ugd2lsbCBrbm93CiAgICAgICAgIC8vIGl0IGhhcyBiZWVuIHJlc2V0 IGFzIG9wcG9zZWQgdG8gaXRzIGRlZmF1bHQgLTEuCkBAIC0zNTMsMTEgKzM1MiwxMSBAQCBib29s IFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9u KFJlc291cmNlTG9hZFN0YXRpcwogCiBWZWN0b3I8U3RyaW5nPiBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zVG9SZW1vdmVXZWJzaXRlRGF0 YUZvcigpCiB7Ci0gICAgYm9vbCBzaG91bGRDaGVja0ZvckdyYW5kZmF0aGVyaW5nID0gbV9lbmRP ZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wID4gY3VycmVudFRpbWUoKTsKKyAgICBib29sIHNob3Vs ZENoZWNrRm9yR3JhbmRmYXRoZXJpbmcgPSBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAg PiBXYWxsVGltZTo6bm93KCk7CiAgICAgYm9vbCBzaG91bGRDbGVhckdyYW5kZmF0aGVyaW5nID0g IXNob3VsZENoZWNrRm9yR3JhbmRmYXRoZXJpbmcgJiYgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGlt ZXN0YW1wOwogCiAgICAgaWYgKHNob3VsZENsZWFyR3JhbmRmYXRoZXJpbmcpCi0gICAgICAgIG1f ZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCA9IDA7CisgICAgICAgIG1fZW5kT2ZHcmFuZGZh dGhlcmluZ1RpbWVzdGFtcCA9IHsgfTsKIAogICAgIFZlY3RvcjxTdHJpbmc+IHByZXZhbGVudFJl c291cmNlczsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fc3RhdGlzdGljc0xvY2spOwpA QCAtNDIxLDcgKzQyMCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYW5k bGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JOb1N0b3JlKEhhc2hTZXQ8U3RyCiAgICAgICAgIFJlc291 cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4odG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbik7CiAgICAgICAgIHN0 YXRpc3RpYy5ncmFuZGZhdGhlcmVkID0gdHJ1ZTsKICAgICB9Ci0gICAgbV9lbmRPZkdyYW5kZmF0 aGVyaW5nVGltZXN0YW1wID0gc3RkOjpmbG9vcihjdXJyZW50VGltZSgpKSArIGdyYW5kZmF0aGVy aW5nVGltZTsKKyAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBXYWxsVGltZTo6 bm93KCkgKyBncmFuZGZhdGhlcmluZ1RpbWU7CiB9CiAKIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNvbnN0CkBAIC00MzAsNyArNDI5 LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFJlbW92ZURhdGFS ZWNvcmRzKCkgY29uc3QKICAgICBpZiAobV9kYXRhUmVjb3Jkc1JlbW92YWxQZW5kaW5nKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJl bW92ZWQgJiYgY3VycmVudFRpbWUoKSA8IG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVk ICsgbWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCkKKyAgICBpZiAobV9sYXN0 VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgPCAobV9s YXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgKyBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJl Y29yZHNSZW1vdmFsKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7 CkBAIC00MzksNyArNDM4LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNo b3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3QKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpkYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZCgpCiB7CiAgICAgQVNTRVJUKCFpc01haW5U aHJlYWQoKSk7Ci0gICAgbV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgPSBjdXJyZW50 VGltZSgpOworICAgIG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkID0gTW9ub3Rvbmlj VGltZTo6bm93KCk7CiAgICAgbV9kYXRhUmVjb3Jkc1JlbW92YWxQZW5kaW5nID0gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCmluZGV4IGRkOWZmMzU3MGMzNDJkODlhOWI2OGU0YzFmMWJlZTEzZGQxODMwZTUuLjkw YTViMTgzOTQwNjFiZGZiOWU1MGQzMzk3MDViMmRkMTc1M2NiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTI4LDcg KzI4LDkgQEAKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgiCiAjaW5jbHVkZSA8 d3RmL0Z1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYv TW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9SZWN1cnNpdmVMb2NrQWRhcHRlci5oPgor I2luY2x1ZGUgPHd0Zi9XYWxsVGltZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTg3 LDEwICs4OSwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZpcmVEYXRhTW9kaWZpY2F0aW9uSGFu ZGxlcigpOwogICAgIHZvaWQgZmlyZVRlbGVtZXRyeUhhbmRsZXIoKTsKLSAgICB2b2lkIHNldFRp bWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oZG91YmxlIHNlY29uZHMpOwotICAgIHZvaWQgc2V0VGlt ZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91YmxlIHNlY29uZHMpOwotICAgIHZvaWQgc2V0 TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChkb3VibGUgc2Vjb25kcyk7Ci0g ICAgdm9pZCBzZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91YmxlIHNlY29uZHMpOyAgICAKKyAgICB2 b2lkIHNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oU2Vjb25kcyk7CisgICAgdm9pZCBzZXRU aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzKTsKKyAgICB2b2lkIHNldE1pbmlt dW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwoU2Vjb25kcyk7CisgICAgdm9pZCBzZXRH cmFuZGZhdGhlcmluZ1RpbWUoU2Vjb25kcyk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaXJl U2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIoKTsKICAgICB2b2lkIGZpcmVTaG91bGRQYXJ0 aXRpb25Db29raWVzSGFuZGxlcihjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvUmVtb3Zl LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvQWRkLCBib29sIGNsZWFyRmlyc3QpOwog CkBAIC0xMTksOCArMTIxLDggQEAgcHJpdmF0ZToKICAgICBXVEY6OkZ1bmN0aW9uPHZvaWQoKT4g bV9ncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGFIYW5kbGVyOwogICAgIFdURjo6RnVuY3Rp b248dm9pZCgpPiBtX2ZpcmVUZWxlbWV0cnlIYW5kbGVyOwogCi0gICAgZG91YmxlIG1fZW5kT2ZH cmFuZGZhdGhlcmluZ1RpbWVzdGFtcCB7IDAgfTsKLSAgICBkb3VibGUgbV9sYXN0VGltZURhdGFS ZWNvcmRzV2VyZVJlbW92ZWQgeyAwIH07CisgICAgV2FsbFRpbWUgbV9lbmRPZkdyYW5kZmF0aGVy aW5nVGltZXN0YW1wOworICAgIE1vbm90b25pY1RpbWUgbV9sYXN0VGltZURhdGFSZWNvcmRzV2Vy ZVJlbW92ZWQ7CiAgICAgYm9vbCBtX2RhdGFSZWNvcmRzUmVtb3ZhbFBlbmRpbmcgeyBmYWxzZSB9 OwogfTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcAppbmRleCBlOTg4 ZDE1ZTM4Yzk4NDI3MzJlNmIzNmRiNjc5ODNjYzM5NTllNjNhLi41MTdkMjlkYzA0MTVkNGU5MGY4 NTdiNTcwYTYzMjgxMjZjMjYxNjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXIu Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRl ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlci5oIgorI2luY2x1ZGUgPHd0Zi9TZWNv bmRzLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTgzLDIyICs4NCwyMiBAQCB2 b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRTdWJyZXNvdXJjZVVuaXF1ZVJl ZGlyZWN0VG8oV0tTdHJpbmdSZWYgaAogCiB2b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01h bmFnZXJTZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKGRvdWJsZSBzZWNvbmRzKQogewotICAg IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVy YWN0aW9uKHNlY29uZHMpOworICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpz ZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2 b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRUaW1lVG9MaXZlQ29va2llUGFy dGl0aW9uRnJlZShkb3VibGUgc2Vjb25kcykKIHsKLSAgICBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWFuYWdlcjo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoc2Vjb25kcyk7Cisg ICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRpbWVUb0xpdmVDb29raWVQ YXJ0aXRpb25GcmVlKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2b2lkIFdLUmVzb3VyY2VM b2FkU3RhdGlzdGljc01hbmFnZXJTZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1v dmFsKGRvdWJsZSBzZWNvbmRzKQogewotICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5h Z2VyOjpzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKHNlY29uZHMpOwor ICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRNaW5pbXVtVGltZUJldHdl ZWVuRGF0YVJlY29yZHNSZW1vdmFsKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2b2lkIFdL UmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91Ymxl IHNlY29uZHMpCiB7Ci0gICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldEdy YW5kZmF0aGVyaW5nVGltZShzZWNvbmRzKTsKKyAgICBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz TWFuYWdlcjo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQog CiB2b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJGaXJlRGF0YU1vZGlmaWNhdGlv bkhhbmRsZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJDb2NvYS5tbQpp bmRleCBkNTcwZTRmNWNiMzk4Y2Y5MWU2Y2I1N2UxM2Y0NmI5OWVhYzViMzRlLi5kZTVhNjM1Yzli YzA4ZWVkODQwYTdkYWUyMDNjOTYxNzI4NTEzMDkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc01hbmFnZXJDb2NvYS5tbQpAQCAtNTEsNyArNTEsNyBAQCB2b2lkIFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpyZWdpc3RlclVzZXJEZWZhdWx0c0lmTmVlZGVkKCkKICAg ICAgICAgCiAgICAgICAgIGRvdWJsZSByZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlvbiA9IFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGRvdWJsZUZvcktleTogV2ViUHJlZmVy ZW5jZXNLZXk6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NSZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlv bktleSgpXTsKICAgICAgICAgaWYgKHJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uID4gMCAmJiBy ZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlvbiA8PSBob3VySW5TZWNvbmRzKQotICAgICAgICAgICAg UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0UmVkdWNlZFRpbWVzdGFt cFJlc29sdXRpb24ocmVkdWNlZFRpbWVzdGFtcFJlc29sdXRpb24pOworICAgICAgICAgICAgUmVz b3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0UmVkdWNlZFRpbWVzdGFtcFJl c29sdXRpb24oU2Vjb25kcyB7IHJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uIH0pOwogCiAgICAg ICAgIGRvdWJsZSBncmFuZGZhdGhlcmluZ1RpbWUgPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJk VXNlckRlZmF1bHRzXSBkb3VibGVGb3JLZXk6IFdlYlByZWZlcmVuY2VzS2V5OjpyZXNvdXJjZUxv YWRTdGF0aXN0aWNzR3JhbmRmYXRoZXJpbmdUaW1lS2V5KCldOwogICAgICAgICBpZiAoZ3JhbmRm YXRoZXJpbmdUaW1lID4gMCAmJiBncmFuZGZhdGhlcmluZ1RpbWUgPD0gNyAqIGRheUluU2Vjb25k cykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01hbmFnZXIuY3BwCmluZGV4IGE4YWMxODJlY2I0ZTcxMTI0YTc2MmM0 MjdhNzVmZGNhMmMzZmNjZDQuLjViMTQyYTk1NzI0MjVjNWNjNDI2OTAxY2VhNGEzYjI5OTI5ODU5 NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcApAQCAtODYsMjIgKzg2LDIyIEBAIHZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFN1YnJlc291cmNlVW5pcXVlUmVk aXJlY3RUbyhjb25zdCBTdHJpCiAgICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNo YXJlZE9ic2VydmVyKCkuc2V0U3VicmVzb3VyY2VVbmlxdWVSZWRpcmVjdFRvKFVSTChVUkwoKSwg aG9zdE5hbWUpLCBVUkwoVVJMKCksIGhvc3ROYW1lUmVkaXJlY3RlZFRvKSk7CiB9CiAKLXZvaWQg V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRpbWVUb0xpdmVVc2VySW50ZXJh Y3Rpb24oZG91YmxlIHNlY29uZHMpCit2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5h Z2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNlY29uZHMgc2Vjb25kcykKIHsKICAg ICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1l VG9MaXZlVXNlckludGVyYWN0aW9uKHNlY29uZHMpOwogfQogCi12b2lkIFdlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShkb3Vi bGUgc2Vjb25kcykKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRp bWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKFNlY29uZHMgc2Vjb25kcykKIHsKICAgICBXZWJD b3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9MaXZl Q29va2llUGFydGl0aW9uRnJlZShzZWNvbmRzKTsKIH0KIAotdm9pZCBXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzTWFuYWdlcjo6c2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3Zh bChkb3VibGUgc2Vjb25kcykKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6 OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwoU2Vjb25kcyBzZWNvbmRz KQogewogICAgIFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigp LnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwoc2Vjb25kcyk7CiB9CiAK LXZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldEdyYW5kZmF0aGVyaW5n VGltZShkb3VibGUgc2Vjb25kcykKK3ZvaWQgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFn ZXI6OnNldEdyYW5kZmF0aGVyaW5nVGltZShTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgV2ViQ29y ZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0R3JhbmRmYXRoZXJp bmdUaW1lKHNlY29uZHMpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXIuaAppbmRleCA3Y2NkODU1Yjhk NTFkNWVkMjQyNTA0MTlkYzBkY2EyMjg5M2ZmMGI0Li41MDQxZWM4YjBlMGM1NDFhNDFlY2M1ZTA0 MjBlYzVkNjkzMjYzNjI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXIuaApAQCAtMjgsNiArMjgsNyBA QAogI2luY2x1ZGUgIkFQSU9iamVjdC5oIgogCiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2lu Y2x1ZGUgPHd0Zi9TZWNvbmRzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK IG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNDcsMTEgKzQ4LDExIEBAIHB1YmxpYzoKICAgICBzdGF0 aWMgdm9pZCBzZXRTdWJmcmFtZVVuZGVyVG9wRnJhbWVPcmlnaW4oY29uc3QgU3RyaW5nJiBob3N0 TmFtZSwgY29uc3QgU3RyaW5nJiB0b3BGcmFtZUhvc3ROYW1lKTsKICAgICBzdGF0aWMgdm9pZCBz ZXRTdWJyZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW4oY29uc3QgU3RyaW5nJiBob3N0TmFtZSwg Y29uc3QgU3RyaW5nJiB0b3BGcmFtZUhvc3ROYW1lKTsKICAgICBzdGF0aWMgdm9pZCBzZXRTdWJy ZXNvdXJjZVVuaXF1ZVJlZGlyZWN0VG8oY29uc3QgU3RyaW5nJiBob3N0TmFtZSwgY29uc3QgU3Ry aW5nJiBob3N0TmFtZVJlZGlyZWN0ZWRUbyk7Ci0gICAgc3RhdGljIHZvaWQgc2V0VGltZVRvTGl2 ZVVzZXJJbnRlcmFjdGlvbihkb3VibGUgc2Vjb25kcyk7Ci0gICAgc3RhdGljIHZvaWQgc2V0VGlt ZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91YmxlIHNlY29uZHMpOwotICAgIHN0YXRpYyB2 b2lkIHNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwoZG91YmxlIHNlY29u ZHMpOwotICAgIHN0YXRpYyB2b2lkIHNldEdyYW5kZmF0aGVyaW5nVGltZShkb3VibGUgc2Vjb25k cyk7Ci0gICAgc3RhdGljIHZvaWQgc2V0UmVkdWNlZFRpbWVzdGFtcFJlc29sdXRpb24oZG91Ymxl IHNlY29uZHMpOworICAgIHN0YXRpYyB2b2lkIHNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24o U2Vjb25kcyk7CisgICAgc3RhdGljIHZvaWQgc2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZy ZWUoU2Vjb25kcyk7CisgICAgc3RhdGljIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFS ZWNvcmRzUmVtb3ZhbChTZWNvbmRzKTsKKyAgICBzdGF0aWMgdm9pZCBzZXRHcmFuZGZhdGhlcmlu Z1RpbWUoU2Vjb25kcyk7CisgICAgc3RhdGljIHZvaWQgc2V0UmVkdWNlZFRpbWVzdGFtcFJlc29s dXRpb24oU2Vjb25kcyk7CiAgICAgc3RhdGljIHZvaWQgZmlyZURhdGFNb2RpZmljYXRpb25IYW5k bGVyKCk7CiAgICAgc3RhdGljIHZvaWQgZmlyZVNob3VsZFBhcnRpdGlvbkNvb2tpZXNIYW5kbGVy KCk7CiAgICAgc3RhdGljIHZvaWQgZmlyZVNob3VsZFBhcnRpdGlvbkNvb2tpZXNIYW5kbGVyRm9y T25lRG9tYWluKGNvbnN0IFN0cmluZyYgaG9zdE5hbWUsIGJvb2wgdmFsdWUpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCmluZGV4IGYxZmNjNjQxNDk1MjE4Mzk2NTk2NmI0ZGFhN2I4NTI0MGQ3OGFmZWIuLjFm YWQxOGQ4MTJkNzRhYjY0OTM5NDRlZjRiNWY0ZjRjYzY5NWNhMWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl LmgKQEAgLTU5LDcgKzU5LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBSZWY8V2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlPiBjcmVhdGUoY29uc3QgU3RyaW5nJik7CiAgICAgc3RhdGljIHZv aWQgc2V0Tm90aWZ5UGFnZXNXaGVuRGF0YVJlY29yZHNXZXJlU2Nhbm5lZChib29sKTsKICAgICBz dGF0aWMgdm9pZCBzZXRTaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVt b3ZhbChib29sKTsKLSAgICBzdGF0aWMgdm9pZCBzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJl Y29yZHNSZW1vdmFsKGRvdWJsZSk7CisgICAgc3RhdGljIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3 ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChTZWNvbmRzKTsKICAgICB2aXJ0dWFsIH5XZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmUoKTsKICAgICAKICAgICB2b2lkIHNldFJlc291cmNlTG9hZFN0 YXRpc3RpY3NFbmFibGVkKGJvb2wpOwo= 313975 2017-06-27 19:54:56 -0700 2017-06-27 22:14:27 -0700 Patch bug-173895-20170627195455.patch text/plain 28110 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTNiNDk4YTFhZDRkZGY1 OGIwYzc4NGI5MmRlMDNmOThmYjU5ZjFhZS4uNTdhMDYxYjgyYzViOTA3ZjRjZjExZDY0MTc1MGIx NmQ0NjQ5M2Q2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE3LTA2LTI3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW1Jlc291cmNlTG9hZFN0YXRp c3RpY3NdIFVwZGF0ZSBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHRvIDEg aG91ciBpbnN0ZWFkIG9mIDEgbWludXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzM4OTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMyOTg0MzY2 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0 ZSBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHRvIDEgaG91ciBpbnN0ZWFk IG9mIDEgbWludXRlIHRvIHNhdmUgYmF0dGVyeS4KKyAgICAgICAgQWxzbyBwb3J0IGNvZGUgdG8g bW9kZXJuIHRpbWUgdHlwZXMuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6cmVkdWNlVGltZVJlc29sdXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldpdGhS ZWR1Y2VkVGltZVJlc29sdXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2Jz ZXJ2ZXI6OnNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToK KyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzZXRNaW5pbXVtVGltZUJl dHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h ZE9ic2VydmVyOjpzZXRSZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlvbik6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAg ICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuaDoKKyAgICAgICAgKiBsb2FkZXIvUmVz b3VyY2VMb2FkU3RhdGlzdGljcy5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3Rh dGlzdGljczo6bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUpOgorICAgICAgICAqIGxvYWRl ci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGVFbmNvZGVyRnJvbURhdGEpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpyZWFkRGF0YUZyb21EZWNv ZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFBhcnRpdGlvbkNvb2tpZXMpOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlVXNl ckludGVyYWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0 YVJlY29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6dG9wUHJpdmF0ZWx5 Q29udHJvbGxlZERvbWFpbnNUb1JlbW92ZVdlYnNpdGVEYXRhRm9yKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFuZGxlRnJlc2hTdGFydFdpdGhFbXB0 eU9yTm9TdG9yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OnNob3VsZFJlbW92ZURhdGFSZWNvcmRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6ZGF0YVJlY29yZHNCZWluZ1JlbW92ZWQpOgorICAgICAgICAq IGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoKKwogMjAxNy0wNi0yNyAgQW50 b2luZSBRdWludCAgPGdyYW91dHNAYXBwbGUuY29tPgogCiAgICAgICAgIFBsYWNhcmQgaWNvbnMg YWN0IGxpa2UgYnV0dG9ucyAoY2FuIGdldCBrZXlib2FyZCBmb2N1cyBhbmQgc2hvd3MgdXAgaW4g Vm9pY2VPdmVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGM3NjY1MTU2Y2Q2NzVjY2I4NDRmNWE3YjIwNmNhMjEx YWM2ZTVmZDkuLmNlY2E3YTAyOGQ5NzJkYTkyYjNhNTBkNDIzNTdjMTgzYTI0YTVhZjMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxNy0wNi0yNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpA YXBwbGUuY29tPgogCisgICAgICAgIFtSZXNvdXJjZUxvYWRTdGF0aXN0aWNzXSBVcGRhdGUgbWlu aW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCB0byAxIGhvdXIgaW5zdGVhZCBvZiAx IG1pbnV0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTczODk1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMjk4NDM2Nj4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgbWluaW11bVRpbWVCZXR3 ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCB0byAxIGhvdXIgaW5zdGVhZCBvZiAxIG1pbnV0ZSB0byBz YXZlIGJhdHRlcnkuCisgICAgICAgIEFsc28gcG9ydCBjb2RlIHRvIG1vZGVybiB0aW1lIHR5cGVz LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01h bmFnZXIuY3BwOgorICAgICAgICAoV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlclNldFRp bWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOgorICAgICAgICAoV0tSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWFuYWdlclNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKToKKyAgICAgICAgKFdL UmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJl Y29yZHNSZW1vdmFsKToKKyAgICAgICAgKFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJT ZXRHcmFuZGZhdGhlcmluZ1RpbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlTG9h ZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRpbWVUb0xp dmVDb29raWVQYXJ0aXRpb25GcmVlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01hbmFnZXI6OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92 YWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlcjo6 c2V0R3JhbmRmYXRoZXJpbmdUaW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc01hbmFnZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VM b2FkU3RhdGlzdGljc1N0b3JlLmg6CisKKzIwMTctMDYtMjcgIENocmlzIER1bWV6ICA8Y2R1bWV6 QGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXSBBdm9pZCB0YWtpbmcgLyByZWxlYXNpbmcgcHJv Y2VzcyBhc3NlcnRpb25zIHRvbyBxdWlja2x5IGR1ZSB0byBkYXRhYmFzZSBhY3Rpdml0eQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczODc5CiAgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8zMjQxMjcwMT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmluZGV4IDkxYTdkOGQzOTBmNmIxNWZmZmJhYjAxODcz MTgxMjc1ZWJiY2IxNjcuLmY4YTY2Zjk1YWQ2MTFlZmQxZjdmZDI3MTY5Mzc4Yzk0YTBhYzRmYjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcApA QCAtNTAsOCArNTAsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLS8vIE9uZSBob3VyIGlu IHNlY29uZHMuCi1zdGF0aWMgYXV0byB0aW1lc3RhbXBSZXNvbHV0aW9uID0gMzYwMDsKK3N0YXRp YyBTZWNvbmRzIHRpbWVzdGFtcFJlc29sdXRpb24geyAxX2ggfTsKIAogUmVzb3VyY2VMb2FkT2Jz ZXJ2ZXImIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpCiB7CkBAIC0zNTAs OSArMzQ5LDkgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2ViU29ja2V0TG9hZGlu Zyhjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgdGEKICAgICB9KTsKIH0KIAotc3RhdGlj IGRvdWJsZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihkb3VibGUgc2Vjb25kcykKK3N0YXRpYyBXYWxs VGltZSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXYWxsVGltZSB0aW1lKQogewotICAgIHJldHVybiBz dGQ6OmZsb29yKHNlY29uZHMgLyB0aW1lc3RhbXBSZXNvbHV0aW9uKSAqIHRpbWVzdGFtcFJlc29s dXRpb247CisgICAgcmV0dXJuIFdhbGxUaW1lOjpmcm9tUmF3U2Vjb25kcyhzdGQ6OmZsb29yKHRp bWUuc2Vjb25kc1NpbmNlRXBvY2goKSAvIHRpbWVzdGFtcFJlc29sdXRpb24pICogdGltZXN0YW1w UmVzb2x1dGlvbi5zZWNvbmRzKCkpOwogfQogCiB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjps b2dVc2VySW50ZXJhY3Rpb25XaXRoUmVkdWNlZFRpbWVSZXNvbHV0aW9uKGNvbnN0IERvY3VtZW50 JiBkb2N1bWVudCkKQEAgLTM3MywxMiArMzcyLDEyIEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldpdGhSZWR1Y2VkVGltZVJlc29sdXRpb24oY29uc3QgRG9j CiAgICAgICAgIHsKICAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhtX3N0b3JlLT5zdGF0 aXN0aWNzTG9jaygpKTsKICAgICAgICAgYXV0byYgc3RhdGlzdGljcyA9IG1fc3RvcmUtPmVuc3Vy ZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4ocHJpbWFyeURvbWFpblN0cmluZyk7 Ci0gICAgICAgIGRvdWJsZSBuZXdUaW1lc3RhbXAgPSByZWR1Y2VUaW1lUmVzb2x1dGlvbihXVEY6 OmN1cnJlbnRUaW1lKCkpOwotICAgICAgICBpZiAobmV3VGltZXN0YW1wID09IHN0YXRpc3RpY3Mu bW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbikKKyAgICAgICAgV2FsbFRpbWUgbmV3VGltZSA9IHJl ZHVjZVRpbWVSZXNvbHV0aW9uKFdhbGxUaW1lOjpub3coKSk7CisgICAgICAgIGlmIChuZXdUaW1l ID09IHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSkKICAgICAgICAg ICAgIHJldHVybjsKIAogICAgICAgICBzdGF0aXN0aWNzLmhhZFVzZXJJbnRlcmFjdGlvbiA9IHRy dWU7Ci0gICAgICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvbiA9IG5ld1Rp bWVzdGFtcDsKKyAgICAgICAgc3RhdGlzdGljcy5tb3N0UmVjZW50VXNlckludGVyYWN0aW9uID0g bmV3VGltZS5zZWNvbmRzU2luY2VFcG9jaCgpLnZhbHVlKCk7CiAgICAgICAgIH0KICAgICAgICAg CiAgICAgICAgIG1fc3RvcmUtPmZpcmVEYXRhTW9kaWZpY2F0aW9uSGFuZGxlcigpOwpAQCAtNTMx LDI4ICs1MzAsMjggQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0U3VicmVzb3VyY2VV bmlxdWVSZWRpcmVjdFRvKGNvbnN0IFVSTCYgc3VicmVzb3VyY2UKICAgICB9KTsKIH0KIAotdm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihkb3Vi bGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldFRpbWVUb0xpdmVVc2Vy SW50ZXJhY3Rpb24oU2Vjb25kcyBzZWNvbmRzKQogewogICAgIG1fc3RvcmUtPnNldFRpbWVUb0xp dmVVc2VySW50ZXJhY3Rpb24oc2Vjb25kcyk7CiB9CiAKLXZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXI6OnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKGRvdWJsZSBzZWNvbmRzKQordm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUo U2Vjb25kcyBzZWNvbmRzKQogewogICAgIG1fc3RvcmUtPnNldFRpbWVUb0xpdmVDb29raWVQYXJ0 aXRpb25GcmVlKHNlY29uZHMpOwogfQogCi12b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpzZXRN aW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKGRvdWJsZSBzZWNvbmRzKQordm9p ZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRz UmVtb3ZhbChTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgbV9zdG9yZS0+c2V0TWluaW11bVRpbWVC ZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChzZWNvbmRzKTsKIH0KICAgICAKLXZvaWQgUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXI6OnNldFJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKGRvdWJsZSBzZWNv bmRzKQordm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2V0UmVkdWNlZFRpbWVzdGFtcFJlc29s dXRpb24oU2Vjb25kcyBzZWNvbmRzKQogewotICAgIGlmIChzZWNvbmRzID4gMCkKKyAgICBpZiAo c2Vjb25kcyA+IDBfcykKICAgICAgICAgdGltZXN0YW1wUmVzb2x1dGlvbiA9IHNlY29uZHM7CiB9 CiAKLXZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldEdyYW5kZmF0aGVyaW5nVGltZShkb3Vi bGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNldEdyYW5kZmF0aGVyaW5n VGltZShTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgbV9zdG9yZS0+c2V0TWluaW11bVRpbWVCZXR3 ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChzZWNvbmRzKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5oIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmgKaW5kZXggMDFhYzJmNjk0MzhmZTQ1MWU2ZjljNjNj NzNkMDA0OTU1Y2NlZTcyMi4uYmQ3NTkwYmJjN2I4MmNlN2YyNWZhMGYxMzJiNWYyOGE2YmU1YThl ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmgKQEAg LTY5LDExICs2OSwxMSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTdWJy ZXNvdXJjZVVuZGVyVG9wRnJhbWVPcmlnaW4oY29uc3QgVVJMJiBzdWJyZXNvdXJjZSwgY29uc3Qg VVJMJiB0b3BGcmFtZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTdWJyZXNvdXJjZVVu aXF1ZVJlZGlyZWN0VG8oY29uc3QgVVJMJiBzdWJyZXNvdXJjZSwgY29uc3QgVVJMJiBob3N0TmFt ZVJlZGlyZWN0ZWRUbyk7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFRpbWVUb0xpdmVV c2VySW50ZXJhY3Rpb24oZG91YmxlIHNlY29uZHMpOwotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQg c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91YmxlIHNlY29uZHMpOwotICAgIFdF QkNPUkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3Zh bChkb3VibGUgc2Vjb25kcyk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRSZWR1Y2VkVGlt ZXN0YW1wUmVzb2x1dGlvbihkb3VibGUgc2Vjb25kcyk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBzZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91YmxlIHNlY29uZHMpOworICAgIFdFQkNPUkVfRVhQ T1JUIHZvaWQgc2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihTZWNvbmRzKTsKKyAgICBXRUJD T1JFX0VYUE9SVCB2b2lkIHNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKFNlY29uZHMp OworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNv cmRzUmVtb3ZhbChTZWNvbmRzKTsKKyAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFJlZHVjZWRU aW1lc3RhbXBSZXNvbHV0aW9uKFNlY29uZHMpOworICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0 R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMpOwogICAgIAogICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgZmlyZURhdGFNb2RpZmljYXRpb25IYW5kbGVyKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9p ZCBmaXJlU2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmggYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljcy5oCmluZGV4IDM1ODNlOTZmMWM4ZWZmYmMx MWM2ZDVlMDU3MjE5ZjVlYzE0YzVhM2QuLmM0ODc1NzUxMTA2MjY1NGVjNzM5OGZiNjg2MWY1YWY5 NjEzMGQzNTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRT dGF0aXN0aWNzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRp c3RpY3MuaApAQCAtMjYsNiArMjYsNyBAQAogI3ByYWdtYSBvbmNlCiAKICNpbmNsdWRlIDx3dGYv SGFzaENvdW50ZWRTZXQuaD4KKyNpbmNsdWRlIDx3dGYvV2FsbFRpbWUuaD4KICNpbmNsdWRlIDx3 dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK QEAgLTQ5LDExICs1MCwxNCBAQCBzdHJ1Y3QgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyB7CiAKICAg ICB2b2lkIG1lcmdlKGNvbnN0IFJlc291cmNlTG9hZFN0YXRpc3RpY3MmKTsKIAorICAgIFdhbGxU aW1lIG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lKCkgY29uc3QgeyByZXR1cm4gV2FsbFRp bWU6OmZyb21SYXdTZWNvbmRzKG1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24pOyB9CisKICAgICBT dHJpbmcgaGlnaExldmVsRG9tYWluOwogCiAgICAgLy8gVXNlciBpbnRlcmFjdGlvbgogICAgIGJv b2wgaGFkVXNlckludGVyYWN0aW9uIHsgZmFsc2UgfTsKICAgICAvLyBUaW1lc3RhbXAuIERlZmF1 bHQgdmFsdWUgaXMgbmVnYXRpdmUsIDAgbWVhbnMgaXQgd2FzIHJlc2V0LgorICAgIC8vIEZJWE1F OiBDYW4gdGhpcyB1c2UgV2FsbFRpbWU/CiAgICAgZG91YmxlIG1vc3RSZWNlbnRVc2VySW50ZXJh Y3Rpb24geyAtMSB9OwogICAgIGJvb2wgZ3JhbmRmYXRoZXJlZCB7IGZhbHNlIH07CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5j cHAKaW5kZXggNjRlN2NjODVhMjE2MjIwMGI0YzI1NmE0NGYzMmRjM2FhMWU4NWU2Ni4uMWNkYjk2 Zjc4NDdmMjMwYWFiODFiNDAzOWJhMGYyZmI4M2MzMjZhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAKQEAgLTQyLDEy ICs0MiwxMSBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgY29uc3QgYXV0byBzdGF0 aXN0aWNzTW9kZWxWZXJzaW9uID0gNDsKLXN0YXRpYyBjb25zdCBhdXRvIHNlY29uZHNQZXJIb3Vy ID0gMzYwMDsKLXN0YXRpYyBjb25zdCBhdXRvIHNlY29uZHNQZXJEYXkgPSAyNCAqIHNlY29uZHNQ ZXJIb3VyOwotc3RhdGljIGF1dG8gdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IDMwICogc2Vj b25kc1BlckRheTsKLXN0YXRpYyBhdXRvIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0g MSAqIHNlY29uZHNQZXJEYXk7Ci1zdGF0aWMgYXV0byBncmFuZGZhdGhlcmluZ1RpbWUgPSAxICog c2Vjb25kc1BlckhvdXI7Ci1zdGF0aWMgYXV0byBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29y ZHNSZW1vdmFsID0gNjA7CitzdGF0aWMgY29uc3QgYXV0byBzZWNvbmRzUGVyRGF5ID0gMjQgKiAz NjAwOworc3RhdGljIFNlY29uZHMgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiB7IDI0X2ggKiAz MC4gfTsKK3N0YXRpYyBTZWNvbmRzIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlIHsgMjRf aCB9Oworc3RhdGljIFNlY29uZHMgZ3JhbmRmYXRoZXJpbmdUaW1lIHsgMV9oIH07CitzdGF0aWMg U2Vjb25kcyBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsIHsgMV9oIH07CiAK IFJlZjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6Y3JlYXRlKCkKIHsKQEAgLTkwLDcgKzg5LDcgQEAgc3RkOjp1bmlxdWVfcHRyPEtleWVk RW5jb2Rlcj4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpjcmVhdGVFbmNvZGVyRnJvbURh dGEKIAogICAgIGF1dG8gbG9ja2VyID0gaG9sZExvY2sobV9zdGF0aXN0aWNzTG9jayk7CiAgICAg ZW5jb2Rlci0+ZW5jb2RlVUludDMyKCJ2ZXJzaW9uIiwgc3RhdGlzdGljc01vZGVsVmVyc2lvbik7 Ci0gICAgZW5jb2Rlci0+ZW5jb2RlRG91YmxlKCJlbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1w IiwgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wKTsKKyAgICBlbmNvZGVyLT5lbmNvZGVE b3VibGUoImVuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAiLCBtX2VuZE9mR3JhbmRmYXRoZXJp bmdUaW1lc3RhbXAuc2Vjb25kc1NpbmNlRXBvY2goKS52YWx1ZSgpKTsKICAgICAKICAgICBlbmNv ZGVyLT5lbmNvZGVPYmplY3RzKCJicm93c2luZ1N0YXRpc3RpY3MiLCBtX3Jlc291cmNlU3RhdGlz dGljc01hcC5iZWdpbigpLCBtX3Jlc291cmNlU3RhdGlzdGljc01hcC5lbmQoKSwgW10oS2V5ZWRF bmNvZGVyJiBlbmNvZGVySW5uZXIsIGNvbnN0IFN0YXRpc3RpY3NWYWx1ZSYgb3JpZ2luKSB7CiAg ICAgICAgIG9yaWdpbi52YWx1ZS5lbmNvZGUoZW5jb2RlcklubmVyKTsKQEAgLTExNCw5ICsxMTMs OSBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6cmVhZERhdGFGcm9tRGVjb2Rl cihLZXllZERlY29kZXImIGRlY29kZXIpCiAgICAgaWYgKHZlcnNpb24gPiBtaW5pbXVtVmVyc2lv bldpdGhHcmFuZGZhdGhlcmluZykgewogICAgICAgICBkb3VibGUgZW5kT2ZHcmFuZGZhdGhlcmlu Z1RpbWVzdGFtcDsKICAgICAgICAgaWYgKGRlY29kZXIuZGVjb2RlRG91YmxlKCJlbmRPZkdyYW5k ZmF0aGVyaW5nVGltZXN0YW1wIiwgZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCkpCi0gICAg ICAgICAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBlbmRPZkdyYW5kZmF0aGVy aW5nVGltZXN0YW1wOworICAgICAgICAgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1w ID0gV2FsbFRpbWU6OmZyb21SYXdTZWNvbmRzKGVuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAp OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3Rh bXAgPSAwOworICAgICAgICAgICAgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wID0geyB9 OwogICAgIH0KIAogICAgIFZlY3RvcjxSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPiBsb2FkZWRTdGF0 aXN0aWNzOwpAQCAtMjQ3LDcgKzI0Niw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpmaXJlVGVsZW1ldHJ5SGFuZGxlcigpCiBzdGF0aWMgaW5saW5lIGJvb2wgc2hvdWxkUGFy dGl0aW9uQ29va2llcyhjb25zdCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBzdGF0aXN0aWMpCiB7 CiAgICAgcmV0dXJuIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlCi0gICAgICAgICYmICgh c3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBjdXJyZW50VGltZSgpID4gc3RhdGlzdGlj Lm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gKyB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJl ZSk7CisgICAgICAgICYmICghc3RhdGlzdGljLmhhZFVzZXJJbnRlcmFjdGlvbiB8fCBXYWxsVGlt ZTo6bm93KCkgPiBzdGF0aXN0aWMubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUoKSArIHRp bWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKTsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzU3RvcmU6OmZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlcigpCkBAIC0zMDEs MjcgKzMwMCwyNyBAQCB2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6ZmlyZVNob3Vs ZFBhcnRpdGlvbkNvb2tpZXNIYW5kbGVyKGNvbnN0IFZlY3RvcgogICAgICAgICBlbnN1cmVSZXNv dXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKGRvbWFpbikuaXNNYXJrZWRGb3JDb29raWVQ YXJ0aXRpb25pbmcgPSB0cnVlOwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9y ZTo6c2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihkb3VibGUgc2Vjb25kcykKK3ZvaWQgUmVz b3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNl Y29uZHMgc2Vjb25kcykKIHsKLSAgICBpZiAoc2Vjb25kcyA+PSAwKQorICAgIGlmIChzZWNvbmRz ID49IDBfcykKICAgICAgICAgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiA9IHNlY29uZHM7CiB9 CiAKLXZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2ll UGFydGl0aW9uRnJlZShkb3VibGUgc2Vjb25kcykKK3ZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpzZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzIHNlY29uZHMp CiB7Ci0gICAgaWYgKHNlY29uZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCiAgICAg ICAgIHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID0gc2Vjb25kczsKIH0KIAotdm9pZCBS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVj b3Jkc1JlbW92YWwoZG91YmxlIHNlY29uZHMpCit2b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZTo6c2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChTZWNvbmRzIHNl Y29uZHMpCiB7Ci0gICAgaWYgKHNlY29uZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3Mp CiAgICAgICAgIG1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwgPSBzZWNvbmRz OwogfQogCi12b2lkIFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6c2V0R3JhbmRmYXRoZXJp bmdUaW1lKGRvdWJsZSBzZWNvbmRzKQordm9pZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6 OnNldEdyYW5kZmF0aGVyaW5nVGltZShTZWNvbmRzIHNlY29uZHMpCiB7Ci0gICAgaWYgKHNlY29u ZHMgPj0gMCkKKyAgICBpZiAoc2Vjb25kcyA+PSAwX3MpCiAgICAgICAgIGdyYW5kZmF0aGVyaW5n VGltZSA9IHNlY29uZHM7CiB9CiAKQEAgLTMzOCw3ICszMzcsNyBAQCBib29sIFJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9uKFJlc291cmNlTG9h ZFN0YXRpcwogICAgIGlmICghcmVzb3VyY2VTdGF0aXN0aWMuaGFkVXNlckludGVyYWN0aW9uKQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAoY3VycmVudFRpbWUoKSA+IHJlc291cmNl U3RhdGlzdGljLm1vc3RSZWNlbnRVc2VySW50ZXJhY3Rpb24gKyB0aW1lVG9MaXZlVXNlckludGVy YWN0aW9uKSB7CisgICAgaWYgKFdhbGxUaW1lOjpub3coKSA+IHJlc291cmNlU3RhdGlzdGljLm1v c3RSZWNlbnRVc2VySW50ZXJhY3Rpb25UaW1lKCkgKyB0aW1lVG9MaXZlVXNlckludGVyYWN0aW9u KSB7CiAgICAgICAgIC8vIERyb3AgcHJpdmFjeSBzZW5zaXRpdmUgZGF0YSBiZWNhdXNlIHdlIG5v IGxvbmdlciBuZWVkIGl0LgogICAgICAgICAvLyBTZXQgdGltZXN0YW1wIHRvIDAuMCBzbyB0aGF0 IHN0YXRpc3RpY3MgbWVyZ2Ugd2lsbCBrbm93CiAgICAgICAgIC8vIGl0IGhhcyBiZWVuIHJlc2V0 IGFzIG9wcG9zZWQgdG8gaXRzIGRlZmF1bHQgLTEuCkBAIC0zNTMsMTEgKzM1MiwxMSBAQCBib29s IFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6aGFzSGFkUmVjZW50VXNlckludGVyYWN0aW9u KFJlc291cmNlTG9hZFN0YXRpcwogCiBWZWN0b3I8U3RyaW5nPiBSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzU3RvcmU6OnRvcFByaXZhdGVseUNvbnRyb2xsZWREb21haW5zVG9SZW1vdmVXZWJzaXRlRGF0 YUZvcigpCiB7Ci0gICAgYm9vbCBzaG91bGRDaGVja0ZvckdyYW5kZmF0aGVyaW5nID0gbV9lbmRP ZkdyYW5kZmF0aGVyaW5nVGltZXN0YW1wID4gY3VycmVudFRpbWUoKTsKKyAgICBib29sIHNob3Vs ZENoZWNrRm9yR3JhbmRmYXRoZXJpbmcgPSBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAg PiBXYWxsVGltZTo6bm93KCk7CiAgICAgYm9vbCBzaG91bGRDbGVhckdyYW5kZmF0aGVyaW5nID0g IXNob3VsZENoZWNrRm9yR3JhbmRmYXRoZXJpbmcgJiYgbV9lbmRPZkdyYW5kZmF0aGVyaW5nVGlt ZXN0YW1wOwogCiAgICAgaWYgKHNob3VsZENsZWFyR3JhbmRmYXRoZXJpbmcpCi0gICAgICAgIG1f ZW5kT2ZHcmFuZGZhdGhlcmluZ1RpbWVzdGFtcCA9IDA7CisgICAgICAgIG1fZW5kT2ZHcmFuZGZh dGhlcmluZ1RpbWVzdGFtcCA9IHsgfTsKIAogICAgIFZlY3RvcjxTdHJpbmc+IHByZXZhbGVudFJl c291cmNlczsKICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKG1fc3RhdGlzdGljc0xvY2spOwpA QCAtNDIxLDcgKzQyMCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpoYW5k bGVGcmVzaFN0YXJ0V2l0aEVtcHR5T3JOb1N0b3JlKEhhc2hTZXQ8U3RyCiAgICAgICAgIFJlc291 cmNlTG9hZFN0YXRpc3RpY3MmIHN0YXRpc3RpYyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0Zv clByaW1hcnlEb21haW4odG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbik7CiAgICAgICAgIHN0 YXRpc3RpYy5ncmFuZGZhdGhlcmVkID0gdHJ1ZTsKICAgICB9Ci0gICAgbV9lbmRPZkdyYW5kZmF0 aGVyaW5nVGltZXN0YW1wID0gc3RkOjpmbG9vcihjdXJyZW50VGltZSgpKSArIGdyYW5kZmF0aGVy aW5nVGltZTsKKyAgICBtX2VuZE9mR3JhbmRmYXRoZXJpbmdUaW1lc3RhbXAgPSBXYWxsVGltZTo6 bm93KCkgKyBncmFuZGZhdGhlcmluZ1RpbWU7CiB9CiAKIGJvb2wgUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpzaG91bGRSZW1vdmVEYXRhUmVjb3JkcygpIGNvbnN0CkBAIC00MzAsNyArNDI5 LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNob3VsZFJlbW92ZURhdGFS ZWNvcmRzKCkgY29uc3QKICAgICBpZiAobV9kYXRhUmVjb3Jkc1JlbW92YWxQZW5kaW5nKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJl bW92ZWQgJiYgY3VycmVudFRpbWUoKSA8IG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVk ICsgbWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbCkKKyAgICBpZiAobV9sYXN0 VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgJiYgTW9ub3RvbmljVGltZTo6bm93KCkgPCAobV9s YXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgKyBtaW5pbXVtVGltZUJldHdlZWVuRGF0YVJl Y29yZHNSZW1vdmFsKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7 CkBAIC00MzksNyArNDM4LDcgQEAgYm9vbCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OnNo b3VsZFJlbW92ZURhdGFSZWNvcmRzKCkgY29uc3QKIHZvaWQgUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlOjpkYXRhUmVjb3Jkc0JlaW5nUmVtb3ZlZCgpCiB7CiAgICAgQVNTRVJUKCFpc01haW5U aHJlYWQoKSk7Ci0gICAgbV9sYXN0VGltZURhdGFSZWNvcmRzV2VyZVJlbW92ZWQgPSBjdXJyZW50 VGltZSgpOworICAgIG1fbGFzdFRpbWVEYXRhUmVjb3Jkc1dlcmVSZW1vdmVkID0gTW9ub3Rvbmlj VGltZTo6bm93KCk7CiAgICAgbV9kYXRhUmVjb3Jkc1JlbW92YWxQZW5kaW5nID0gdHJ1ZTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZS5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5oCmluZGV4IGRkOWZmMzU3MGMzNDJkODlhOWI2OGU0YzFmMWJlZTEzZGQxODMwZTUuLjkw YTViMTgzOTQwNjFiZGZiOWU1MGQzMzk3MDViMmRkMTc1M2NiZWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKQEAgLTI4LDcg KzI4LDkgQEAKICNpbmNsdWRlICJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLmgiCiAjaW5jbHVkZSA8 d3RmL0Z1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYv TW9ub3RvbmljVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9SZWN1cnNpdmVMb2NrQWRhcHRlci5oPgor I2luY2x1ZGUgPHd0Zi9XYWxsVGltZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTg3 LDEwICs4OSwxMCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGZpcmVEYXRhTW9kaWZpY2F0aW9uSGFu ZGxlcigpOwogICAgIHZvaWQgZmlyZVRlbGVtZXRyeUhhbmRsZXIoKTsKLSAgICB2b2lkIHNldFRp bWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oZG91YmxlIHNlY29uZHMpOwotICAgIHZvaWQgc2V0VGlt ZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91YmxlIHNlY29uZHMpOwotICAgIHZvaWQgc2V0 TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChkb3VibGUgc2Vjb25kcyk7Ci0g ICAgdm9pZCBzZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91YmxlIHNlY29uZHMpOyAgICAKKyAgICB2 b2lkIHNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24oU2Vjb25kcyk7CisgICAgdm9pZCBzZXRU aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzKTsKKyAgICB2b2lkIHNldE1pbmlt dW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwoU2Vjb25kcyk7CisgICAgdm9pZCBzZXRH cmFuZGZhdGhlcmluZ1RpbWUoU2Vjb25kcyk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBmaXJl U2hvdWxkUGFydGl0aW9uQ29va2llc0hhbmRsZXIoKTsKICAgICB2b2lkIGZpcmVTaG91bGRQYXJ0 aXRpb25Db29raWVzSGFuZGxlcihjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvUmVtb3Zl LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgZG9tYWluc1RvQWRkLCBib29sIGNsZWFyRmlyc3QpOwog CkBAIC0xMTksOCArMTIxLDggQEAgcHJpdmF0ZToKICAgICBXVEY6OkZ1bmN0aW9uPHZvaWQoKT4g bV9ncmFuZGZhdGhlckV4aXN0aW5nV2Vic2l0ZURhdGFIYW5kbGVyOwogICAgIFdURjo6RnVuY3Rp b248dm9pZCgpPiBtX2ZpcmVUZWxlbWV0cnlIYW5kbGVyOwogCi0gICAgZG91YmxlIG1fZW5kT2ZH cmFuZGZhdGhlcmluZ1RpbWVzdGFtcCB7IDAgfTsKLSAgICBkb3VibGUgbV9sYXN0VGltZURhdGFS ZWNvcmRzV2VyZVJlbW92ZWQgeyAwIH07CisgICAgV2FsbFRpbWUgbV9lbmRPZkdyYW5kZmF0aGVy aW5nVGltZXN0YW1wOworICAgIE1vbm90b25pY1RpbWUgbV9sYXN0VGltZURhdGFSZWNvcmRzV2Vy ZVJlbW92ZWQ7CiAgICAgYm9vbCBtX2RhdGFSZWNvcmRzUmVtb3ZhbFBlbmRpbmcgeyBmYWxzZSB9 OwogfTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcAppbmRleCBlOTg4 ZDE1ZTM4Yzk4NDI3MzJlNmIzNmRiNjc5ODNjYzM5NTllNjNhLi41MTdkMjlkYzA0MTVkNGU5MGY4 NTdiNTcwYTYzMjgxMjZjMjYxNjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXIu Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRl ICJXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlci5oIgorI2luY2x1ZGUgPHd0Zi9TZWNv bmRzLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKQEAgLTgzLDIyICs4NCwyMiBAQCB2 b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRTdWJyZXNvdXJjZVVuaXF1ZVJl ZGlyZWN0VG8oV0tTdHJpbmdSZWYgaAogCiB2b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01h bmFnZXJTZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKGRvdWJsZSBzZWNvbmRzKQogewotICAg IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVy YWN0aW9uKHNlY29uZHMpOworICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpz ZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2 b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRUaW1lVG9MaXZlQ29va2llUGFy dGl0aW9uRnJlZShkb3VibGUgc2Vjb25kcykKIHsKLSAgICBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzTWFuYWdlcjo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoc2Vjb25kcyk7Cisg ICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldFRpbWVUb0xpdmVDb29raWVQ YXJ0aXRpb25GcmVlKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2b2lkIFdLUmVzb3VyY2VM b2FkU3RhdGlzdGljc01hbmFnZXJTZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1v dmFsKGRvdWJsZSBzZWNvbmRzKQogewotICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5h Z2VyOjpzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKHNlY29uZHMpOwor ICAgIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRNaW5pbXVtVGltZUJldHdl ZWVuRGF0YVJlY29yZHNSZW1vdmFsKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQogCiB2b2lkIFdL UmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJTZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91Ymxl IHNlY29uZHMpCiB7Ci0gICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnNldEdy YW5kZmF0aGVyaW5nVGltZShzZWNvbmRzKTsKKyAgICBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz TWFuYWdlcjo6c2V0R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMgeyBzZWNvbmRzIH0pOwogfQog CiB2b2lkIFdLUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJGaXJlRGF0YU1vZGlmaWNhdGlv bkhhbmRsZXIoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL1dl YlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJDb2NvYS5tbQpp bmRleCBkNTcwZTRmNWNiMzk4Y2Y5MWU2Y2I1N2UxM2Y0NmI5OWVhYzViMzRlLi5iZTFkOTU0OTI4 NTU1MzhmMmUwODI1MTZjZmYzMmNiM2M1ZjY0NjZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc01hbmFnZXJDb2NvYS5t bQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvV2ViUmVzb3VyY2VMb2FkU3Rh dGlzdGljc01hbmFnZXJDb2NvYS5tbQpAQCAtNDMsMTkgKzQzLDE5IEBAIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OnJlZ2lzdGVyVXNlckRlZmF1bHRzSWZOZWVkZWQoKQog ICAgICAgICAKICAgICAgICAgZG91YmxlIHRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24gPSBbW05T VXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBkb3VibGVGb3JLZXk6IFdlYlByZWZl cmVuY2VzS2V5OjpyZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlv bktleSgpXTsKICAgICAgICAgaWYgKHRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24gPiAwICYmIHRp bWVUb0xpdmVVc2VySW50ZXJhY3Rpb24gPD0gMzAgKiBkYXlJblNlY29uZHMpCi0gICAgICAgICAg ICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9MaXZlVXNl ckludGVyYWN0aW9uKHRpbWVUb0xpdmVVc2VySW50ZXJhY3Rpb24pOworICAgICAgICAgICAgUmVz b3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0VGltZVRvTGl2ZVVzZXJJbnRl cmFjdGlvbihTZWNvbmRzIHsgdGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbiB9KTsKICAgICAgICAg CiAgICAgICAgIGRvdWJsZSB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSA9IFtbTlNVc2Vy RGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIGRvdWJsZUZvcktleTogV2ViUHJlZmVyZW5j ZXNLZXk6OnJlc291cmNlTG9hZFN0YXRpc3RpY3NUaW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJl ZUtleSgpXTsKICAgICAgICAgaWYgKHRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlID4gMCAm JiB0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSA8PSBkYXlJblNlY29uZHMpCi0gICAgICAg ICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9MaXZl Q29va2llUGFydGl0aW9uRnJlZSh0aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZSk7CisgICAg ICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9M aXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzIHsgdGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlv bkZyZWUgfSk7CiAgICAgICAgIAogICAgICAgICBkb3VibGUgcmVkdWNlZFRpbWVzdGFtcFJlc29s dXRpb24gPSBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXSBkb3VibGVGb3JL ZXk6IFdlYlByZWZlcmVuY2VzS2V5OjpyZXNvdXJjZUxvYWRTdGF0aXN0aWNzUmVkdWNlZFRpbWVz dGFtcFJlc29sdXRpb25LZXkoKV07CiAgICAgICAgIGlmIChyZWR1Y2VkVGltZXN0YW1wUmVzb2x1 dGlvbiA+IDAgJiYgcmVkdWNlZFRpbWVzdGFtcFJlc29sdXRpb24gPD0gaG91ckluU2Vjb25kcykK LSAgICAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpLnNldFJl ZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKHJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKTsKKyAg ICAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpLnNldFJlZHVj ZWRUaW1lc3RhbXBSZXNvbHV0aW9uKFNlY29uZHMgeyByZWR1Y2VkVGltZXN0YW1wUmVzb2x1dGlv biB9KTsKIAogICAgICAgICBkb3VibGUgZ3JhbmRmYXRoZXJpbmdUaW1lID0gW1tOU1VzZXJEZWZh dWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c10gZG91YmxlRm9yS2V5OiBXZWJQcmVmZXJlbmNlc0tl eTo6cmVzb3VyY2VMb2FkU3RhdGlzdGljc0dyYW5kZmF0aGVyaW5nVGltZUtleSgpXTsKICAgICAg ICAgaWYgKGdyYW5kZmF0aGVyaW5nVGltZSA+IDAgJiYgZ3JhbmRmYXRoZXJpbmdUaW1lIDw9IDcg KiBkYXlJblNlY29uZHMpCi0gICAgICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVk T2JzZXJ2ZXIoKS5zZXRHcmFuZGZhdGhlcmluZ1RpbWUoZ3JhbmRmYXRoZXJpbmdUaW1lKTsKKyAg ICAgICAgICAgIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpLnNldEdyYW5k ZmF0aGVyaW5nVGltZShTZWNvbmRzIHsgZ3JhbmRmYXRoZXJpbmdUaW1lIH0pOwogICAgIH0pOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmNwcAppbmRleCBhOGFjMTgyZWNiNGU3MTEyNGE3NjJj NDI3YTc1ZmRjYTJjM2ZjY2Q0Li4xNTBiMzg3OTk0ZThmYTMxYjMzMmJiOTk5MGE5MDVlMGQ4NjBm NTAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFuYWdlci5jcHAKQEAgLTg2LDIyICs4NiwyMiBAQCB2b2lk IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRTdWJyZXNvdXJjZVVuaXF1ZVJl ZGlyZWN0VG8oY29uc3QgU3RyaQogICAgIFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpz aGFyZWRPYnNlcnZlcigpLnNldFN1YnJlc291cmNlVW5pcXVlUmVkaXJlY3RUbyhVUkwoVVJMKCks IGhvc3ROYW1lKSwgVVJMKFVSTCgpLCBob3N0TmFtZVJlZGlyZWN0ZWRUbykpOwogfQogCi12b2lk IFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRUaW1lVG9MaXZlVXNlckludGVy YWN0aW9uKGRvdWJsZSBzZWNvbmRzKQordm9pZCBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWFu YWdlcjo6c2V0VGltZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihTZWNvbmRzIHNlY29uZHMpCiB7CiAg ICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0VGlt ZVRvTGl2ZVVzZXJJbnRlcmFjdGlvbihzZWNvbmRzKTsKIH0KIAotdm9pZCBXZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWFuYWdlcjo6c2V0VGltZVRvTGl2ZUNvb2tpZVBhcnRpdGlvbkZyZWUoZG91 YmxlIHNlY29uZHMpCit2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRU aW1lVG9MaXZlQ29va2llUGFydGl0aW9uRnJlZShTZWNvbmRzIHNlY29uZHMpCiB7CiAgICAgV2Vi Q29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0VGltZVRvTGl2 ZUNvb2tpZVBhcnRpdGlvbkZyZWUoc2Vjb25kcyk7CiB9CiAKLXZvaWQgV2ViUmVzb3VyY2VMb2Fk U3RhdGlzdGljc01hbmFnZXI6OnNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92 YWwoZG91YmxlIHNlY29uZHMpCit2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2Vy OjpzZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKFNlY29uZHMgc2Vjb25k cykKIHsKICAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIo KS5zZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKHNlY29uZHMpOwogfQog Ci12b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpzZXRHcmFuZGZhdGhlcmlu Z1RpbWUoZG91YmxlIHNlY29uZHMpCit2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5h Z2VyOjpzZXRHcmFuZGZhdGhlcmluZ1RpbWUoU2Vjb25kcyBzZWNvbmRzKQogewogICAgIFdlYkNv cmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigpLnNldEdyYW5kZmF0aGVy aW5nVGltZShzZWNvbmRzKTsKIH0KQEAgLTE1NiwxMCArMTU2LDEwIEBAIHZvaWQgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01hbmFnZXI6OmNsZWFySW5NZW1vcnlBbmRQZXJzaXN0ZW50U3RvcmVN b2RpZmllZFNpCiAgICAgCiB2b2lkIFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyOjpy ZXNldFRvQ29uc2lzdGVudFN0YXRlKCkKIHsKLSAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNl cnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKDI1OTIw MDApOwotICAgIFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWRPYnNlcnZlcigp LnNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKDg2NDAwKTsKLSAgICBXZWJDb3JlOjpS ZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRNaW5pbXVtVGltZUJldHdl ZWVuRGF0YVJlY29yZHNSZW1vdmFsKDYwKTsKLSAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNl cnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRHcmFuZGZhdGhlcmluZ1RpbWUoMzYwMCk7CisgICAg V2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0VGltZVRv TGl2ZVVzZXJJbnRlcmFjdGlvbigyNF9oICogMzAuKTsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZUxv YWRPYnNlcnZlcjo6c2hhcmVkT2JzZXJ2ZXIoKS5zZXRUaW1lVG9MaXZlQ29va2llUGFydGl0aW9u RnJlZSgyNF9oKTsKKyAgICBXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkT2Jz ZXJ2ZXIoKS5zZXRNaW5pbXVtVGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKDFfaCk7Cisg ICAgV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZE9ic2VydmVyKCkuc2V0R3Jh bmRmYXRoZXJpbmdUaW1lKDFfaCk7CiAgICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3Jl OjpzZXROb3RpZnlQYWdlc1doZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKGZhbHNlKTsKICAgICBX ZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzVGVsZW1ldHJ5OjpzZXROb3RpZnlQYWdlc1doZW5UZWxl bWV0cnlXYXNDYXB0dXJlZChmYWxzZSk7CiAgICAgV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpzZXRTaG91bGRDbGFzc2lmeVJlc291cmNlc0JlZm9yZURhdGFSZWNvcmRzUmVtb3ZhbCh0 cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxv YWRTdGF0aXN0aWNzTWFuYWdlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmgKaW5kZXggN2NjZDg1NWI4ZDUxZDVlZDI0MjUwNDE5 ZGMwZGNhMjI4OTNmZjBiNC4uNTA0MWVjOGIwZTBjNTQxYTQxZWNjNWUwNDIwZWM1ZDY5MzI2MzYy NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0 YXRpc3RpY3NNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NNYW5hZ2VyLmgKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJB UElPYmplY3QuaCIKIAogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvU2Vj b25kcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2Vi S2l0IHsKQEAgLTQ3LDExICs0OCwxMSBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0U3Vi ZnJhbWVVbmRlclRvcEZyYW1lT3JpZ2luKGNvbnN0IFN0cmluZyYgaG9zdE5hbWUsIGNvbnN0IFN0 cmluZyYgdG9wRnJhbWVIb3N0TmFtZSk7CiAgICAgc3RhdGljIHZvaWQgc2V0U3VicmVzb3VyY2VV bmRlclRvcEZyYW1lT3JpZ2luKGNvbnN0IFN0cmluZyYgaG9zdE5hbWUsIGNvbnN0IFN0cmluZyYg dG9wRnJhbWVIb3N0TmFtZSk7CiAgICAgc3RhdGljIHZvaWQgc2V0U3VicmVzb3VyY2VVbmlxdWVS ZWRpcmVjdFRvKGNvbnN0IFN0cmluZyYgaG9zdE5hbWUsIGNvbnN0IFN0cmluZyYgaG9zdE5hbWVS ZWRpcmVjdGVkVG8pOwotICAgIHN0YXRpYyB2b2lkIHNldFRpbWVUb0xpdmVVc2VySW50ZXJhY3Rp b24oZG91YmxlIHNlY29uZHMpOwotICAgIHN0YXRpYyB2b2lkIHNldFRpbWVUb0xpdmVDb29raWVQ YXJ0aXRpb25GcmVlKGRvdWJsZSBzZWNvbmRzKTsKLSAgICBzdGF0aWMgdm9pZCBzZXRNaW5pbXVt VGltZUJldHdlZWVuRGF0YVJlY29yZHNSZW1vdmFsKGRvdWJsZSBzZWNvbmRzKTsKLSAgICBzdGF0 aWMgdm9pZCBzZXRHcmFuZGZhdGhlcmluZ1RpbWUoZG91YmxlIHNlY29uZHMpOwotICAgIHN0YXRp YyB2b2lkIHNldFJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKGRvdWJsZSBzZWNvbmRzKTsKKyAg ICBzdGF0aWMgdm9pZCBzZXRUaW1lVG9MaXZlVXNlckludGVyYWN0aW9uKFNlY29uZHMpOworICAg IHN0YXRpYyB2b2lkIHNldFRpbWVUb0xpdmVDb29raWVQYXJ0aXRpb25GcmVlKFNlY29uZHMpOwor ICAgIHN0YXRpYyB2b2lkIHNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jkc1JlbW92YWwo U2Vjb25kcyk7CisgICAgc3RhdGljIHZvaWQgc2V0R3JhbmRmYXRoZXJpbmdUaW1lKFNlY29uZHMp OworICAgIHN0YXRpYyB2b2lkIHNldFJlZHVjZWRUaW1lc3RhbXBSZXNvbHV0aW9uKFNlY29uZHMp OwogICAgIHN0YXRpYyB2b2lkIGZpcmVEYXRhTW9kaWZpY2F0aW9uSGFuZGxlcigpOwogICAgIHN0 YXRpYyB2b2lkIGZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlcigpOwogICAgIHN0YXRp YyB2b2lkIGZpcmVTaG91bGRQYXJ0aXRpb25Db29raWVzSGFuZGxlckZvck9uZURvbWFpbihjb25z dCBTdHJpbmcmIGhvc3ROYW1lLCBib29sIHZhbHVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAppbmRleCBm MWZjYzY0MTQ5NTIxODM5NjU5NjZiNGRhYTdiODUyNDBkNzhhZmViLi4xZmFkMThkODEyZDc0YWI2 NDkzOTQ0ZWY0YjVmNGY0Y2M2OTVjYTFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5oCkBAIC01OSw3ICs1 OSw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZT4gY3JlYXRlKGNvbnN0IFN0cmluZyYpOwogICAgIHN0YXRpYyB2b2lkIHNldE5vdGlmeVBh Z2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQoYm9vbCk7CiAgICAgc3RhdGljIHZvaWQgc2V0 U2hvdWxkQ2xhc3NpZnlSZXNvdXJjZXNCZWZvcmVEYXRhUmVjb3Jkc1JlbW92YWwoYm9vbCk7Ci0g ICAgc3RhdGljIHZvaWQgc2V0TWluaW11bVRpbWVCZXR3ZWVlbkRhdGFSZWNvcmRzUmVtb3ZhbChk b3VibGUpOworICAgIHN0YXRpYyB2b2lkIHNldE1pbmltdW1UaW1lQmV0d2VlZW5EYXRhUmVjb3Jk c1JlbW92YWwoU2Vjb25kcyk7CiAgICAgdmlydHVhbCB+V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGlj c1N0b3JlKCk7CiAgICAgCiAgICAgdm9pZCBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxl ZChib29sKTsK