127555 2014-01-24 06:07:42 -0800 [curl] Add WEB_TIMING support 2014-04-16 12:54:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 117300 1 sipka webkit-unassigned bfulgham commit-queue galpeter mmatyas oldest_to_newest 971580 0 sipka 2014-01-24 06:07:42 -0800 Add web_timing informations. 971581 1 222094 sipka 2014-01-24 06:12:49 -0800 Created attachment 222094 proposed patch Access timing information related to navigation. 971594 2 222106 sipka 2014-01-24 06:30:12 -0800 Created attachment 222106 proposed patch 973783 3 222106 bfulgham 2014-01-30 10:02:37 -0800 Comment on attachment 222106 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=222106&action=review Looks good, but I had a question about the removal of a "didReceiveResponse" call. Also, you accidentally introduced a blank line. > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:-468 > - client->didReceiveResponse(job, d->m_response); Why don't we need this call to didReceiveResponse anymore? Does CurlCacheManager do this work as well? > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:657 > + Extra blank line! 974266 4 mmatyas 2014-01-31 04:01:04 -0800 (In reply to comment #3) > Why don't we need this call to didReceiveResponse anymore? Does CurlCacheManager do this work as well? No it doesn't, only the function name is similar. 974268 5 sipka 2014-01-31 05:30:40 -0800 (In reply to comment #3) > (From update of attachment 222106 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=222106&action=review > > Looks good, but I had a question about the removal of a "didReceiveResponse" call. Also, you accidentally introduced a blank line. > > > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:-468 > > - client->didReceiveResponse(job, d->m_response); > > Why don't we need this call to didReceiveResponse anymore? Does CurlCacheManager do this work as well? > > > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:657 > > + > > Extra blank line! Instead of calling didReceiveResponse from the headerCallback function, I call it from downloadTimerCallback (and from dispatchSynchronousJob in synchronous case) to make sure that the webtiming informations will be retrieved and set properly. 1001262 6 222106 bfulgham 2014-04-16 12:23:00 -0700 Comment on attachment 222106 proposed patch r=me 1001275 7 222106 commit-queue 2014-04-16 12:54:30 -0700 Comment on attachment 222106 proposed patch Clearing flags on attachment: 222106 Committed r167377: <http://trac.webkit.org/changeset/167377> 1001276 8 commit-queue 2014-04-16 12:54:33 -0700 All reviewed patches have been landed. Closing bug. 222094 2014-01-24 06:12:49 -0800 2014-01-24 06:30:12 -0800 proposed patch webtiming.patch text/plain 6524 sipka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3Yzk2OTRkLi5mMjdiOTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDEtMjQgIFJvYmVydCBTaXBrYSAgPHNpcGthQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gQWRkIFdFQl9USU1JTkcgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTU1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXNzIHRpbWluZyBpbmZvcm1hdGlvbiBy ZWxhdGVkIHRvIG5hdmlnYXRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1pbGlzZWNvbmRz U2luY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZVdlYlRpbWluZ0luZm9y bWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpzb2Nrb3B0ZnVuY3Rpb24pOgorICAgICAgICAo V2ViQ29yZTo6aGVhZGVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGVNYW5hZ2VyOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKToKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRsZSk6CisKIDIwMTQt MDEtMjQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQgR1RLIGJ1aWxkIGZpeCBhZnRlciByMTYyNjYzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5h Z2VyLmNwcAppbmRleCAxMzI2ZGRmLi5lYTAwOTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2Vy LmNwcApAQCAtNTksNiArNTksOSBAQAogCiAjaW5jbHVkZSA8ZXJybm8uaD4KICNpbmNsdWRlIDxz dGRpby5oPgorI2lmIEVOQUJMRShXRUJfVElNSU5HKQorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGlt ZS5oPgorI2VuZGlmCiAjaWYgVVNFKENGKQogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNl bmRpZgpAQCAtMTQ1LDYgKzE0OCw1MyBAQCBzdGF0aWMgTXV0ZXgqIHNoYXJlZFJlc291cmNlTXV0 ZXgoY3VybF9sb2NrX2RhdGEgZGF0YSkgewogICAgIH0KIH0KIAorI2lmIEVOQUJMRShXRUJfVElN SU5HKQorc3RhdGljIGludCBtaWxpc2Vjb25kc1NpbmNlUmVxdWVzdChkb3VibGUgcmVxdWVzdFRp bWUpCit7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oKG1vbm90b25pY2FsbHlJbmNyZWFz aW5nVGltZSgpIC0gcmVxdWVzdFRpbWUpICogMTAwMC4wKTsKK30KKworc3RhdGljIHZvaWQgY2Fs Y3VsYXRlV2ViVGltaW5nSW5mb3JtYXRpb25zKFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQpCit7 CisgICAgZG91YmxlIHN0YXJ0VHJhbnNmZXJ0VGltZTsKKyAgICBkb3VibGUgcHJlVHJhbnNmZXJU aW1lOworICAgIGRvdWJsZSBkbnNsb29rdXBUaW1lOworICAgIGRvdWJsZSBjb25uZWN0VGltZTsK KyAgICBkb3VibGUgYXBwQ29ubmVjdFRpbWU7CisKKyAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhkLT5t X2hhbmRsZSwgQ1VSTElORk9fTkFNRUxPT0tVUF9USU1FLCAmZG5zbG9va3VwVGltZSk7CisgICAg Y3VybF9lYXN5X2dldGluZm8oZC0+bV9oYW5kbGUsIENVUkxJTkZPX0NPTk5FQ1RfVElNRSwgJmNv bm5lY3RUaW1lKTsKKyAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhkLT5tX2hhbmRsZSwgQ1VSTElORk9f QVBQQ09OTkVDVF9USU1FLCAmYXBwQ29ubmVjdFRpbWUpOworICAgIGN1cmxfZWFzeV9nZXRpbmZv KGQtPm1faGFuZGxlLCBDVVJMSU5GT19TVEFSVFRSQU5TRkVSX1RJTUUsICZzdGFydFRyYW5zZmVy dFRpbWUpOworICAgIGN1cmxfZWFzeV9nZXRpbmZvKGQtPm1faGFuZGxlLCBDVVJMSU5GT19QUkVU UkFOU0ZFUl9USU1FLCAmcHJlVHJhbnNmZXJUaW1lKTsKKworICAgIGQtPm1fcmVzcG9uc2UucmVz b3VyY2VMb2FkVGltaW5nKCktPmRuc1N0YXJ0ID0gMDsKKyAgICBkLT5tX3Jlc3BvbnNlLnJlc291 cmNlTG9hZFRpbWluZygpLT5kbnNFbmQgPSAoaW50KShkbnNsb29rdXBUaW1lICogMTAwMCk7CisK KyAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5jb25uZWN0U3RhcnQgPSAo aW50KShkbnNsb29rdXBUaW1lICogMTAwMCk7CisgICAgZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxv YWRUaW1pbmcoKS0+Y29ubmVjdEVuZCA9IChpbnQpKGNvbm5lY3RUaW1lICogMTAwMCk7CisKKyAg ICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5zZW5kU3RhcnQgPSAoaW50KShj b25uZWN0VGltZSAqMTAwMCk7CisgICAgZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmco KS0+c2VuZEVuZCA9IChpbnQpKHByZVRyYW5zZmVyVGltZSAqIDEwMDApOworCisgICAgaWYgKGFw cENvbm5lY3RUaW1lKSB7CisgICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5n KCktPnNzbFN0YXJ0ID0gKGludCkoY29ubmVjdFRpbWUgKiAxMDAwKTsKKyAgICAgICAgZC0+bV9y ZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKS0+c3NsRW5kID0gKGludCkoYXBwQ29ubmVjdFRp bWUgKjEwMDApOworICAgIH0KK30KKworc3RhdGljIGludCBzb2Nrb3B0ZnVuY3Rpb24odm9pZCog ZGF0YSwgY3VybF9zb2NrZXRfdCAvKmN1cmxmZCovLCBjdXJsc29ja3R5cGUgLypwdXJwb3NlKi8p Cit7CisgICAgUmVzb3VyY2VIYW5kbGUqIGpvYiA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxl Kj4oZGF0YSk7CisgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGpvYi0+Z2V0SW50ZXJu YWwoKTsKKworICAgIGlmIChkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKQorICAg ICAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5yZXF1ZXN0VGltZSA9IG1v bm90b25pY2FsbHlJbmNyZWFzaW5nVGltZSgpOworCisgICAgcmV0dXJuIDA7Cit9CisjZW5kaWYK KwogLy8gbGliY3VybCBkb2VzIG5vdCBpbXBsZW1lbnQgaXRzIG93biB0aHJlYWQgc3luY2hyb25p emF0aW9uIHByaW1pdGl2ZXMuCiAvLyB0aGVzZSB0d28gZnVuY3Rpb25zIHByb3ZpZGUgbXV0ZXhl cyBmb3IgY29va2llcywgYW5kIGZvciB0aGUgZ2xvYmFsIEROUwogLy8gY2FjaGUuCkBAIC00Mzcs NiArNDg3LDExIEBAIHN0YXRpYyBzaXplX3QgaGVhZGVyQ2FsbGJhY2soY2hhciogcHRyLCBzaXpl X3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgICAgICAgICAgICAgIGQtPm1f bXVsdGlwYXJ0SGFuZGxlID0gTXVsdGlwYXJ0SGFuZGxlOjpjcmVhdGUoam9iLCBib3VuZGFyeSk7 CiAgICAgICAgIH0KIAorI2lmIEVOQUJMRShXRUJfVElNSU5HKQorICAgICAgICBpZiAoZC0+bV9y ZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKSAmJiBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9h ZFRpbWluZygpLT5yZXF1ZXN0VGltZSkKKyAgICAgICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3Vy Y2VMb2FkVGltaW5nKCktPnJlY2VpdmVIZWFkZXJzRW5kID0gbWlsaXNlY29uZHNTaW5jZVJlcXVl c3QoZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKS0+cmVxdWVzdFRpbWUpOworI2Vu ZGlmCisKICAgICAgICAgLy8gSFRUUCByZWRpcmVjdGlvbgogICAgICAgICBpZiAoaXNIdHRwUmVk aXJlY3QoaHR0cENvZGUpKSB7CiAgICAgICAgICAgICBTdHJpbmcgbG9jYXRpb24gPSBkLT5tX3Jl c3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgibG9jYXRpb24iKTsKQEAgLTQ2NCwxMCArNTE5LDkgQEAg c3RhdGljIHNpemVfdCBoZWFkZXJDYWxsYmFjayhjaGFyKiBwdHIsIHNpemVfdCBzaXplLCBzaXpl X3Qgbm1lbWIsIHZvaWQqIGRhdGEpCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAg ICBpZiAoY2xpZW50KSB7Ci0gICAgICAgICAgICBjbGllbnQtPmRpZFJlY2VpdmVSZXNwb25zZShq b2IsIGQtPm1fcmVzcG9uc2UpOworICAgICAgICBpZiAoY2xpZW50KQogICAgICAgICAgICAgQ3Vy bENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5kaWRSZWNlaXZlUmVzcG9uc2Uoam9iLCBkLT5t X3Jlc3BvbnNlKTsKLSAgICAgICAgfQorCiAgICAgICAgIGQtPm1fcmVzcG9uc2Uuc2V0UmVzcG9u c2VGaXJlZCh0cnVlKTsKIAogICAgIH0gZWxzZSB7CkBAIC02MDAsNyArNjU0LDEyIEBAIHZvaWQg UmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2soVGltZXI8UmVzb3Vy Y2VIYW5kbGVNYW5hZ2VyPioKICAgICAgICAgaWYgKENVUkxNU0dfRE9ORSAhPSBtc2ctPm1zZykK ICAgICAgICAgICAgIGNvbnRpbnVlOwogCisKICAgICAgICAgaWYgKENVUkxFX09LID09IG1zZy0+ ZGF0YS5yZXN1bHQpIHsKKworI2lmIEVOQUJMRShXRUJfVElNSU5HKQorICAgICAgICAgICAgY2Fs Y3VsYXRlV2ViVGltaW5nSW5mb3JtYXRpb25zKGQpOworI2VuZGlmCiAgICAgICAgICAgICBpZiAo IWQtPm1fcmVzcG9uc2UucmVzcG9uc2VGaXJlZCgpKSB7CiAgICAgICAgICAgICAgICAgaGFuZGxl TG9jYWxSZWNlaXZlUmVzcG9uc2UoZC0+bV9oYW5kbGUsIGpvYiwgZCk7CiAgICAgICAgICAgICAg ICAgaWYgKGQtPm1fY2FuY2VsbGVkKSB7CkBAIC02MTMsNiArNjcyLDcgQEAgdm9pZCBSZXNvdXJj ZUhhbmRsZU1hbmFnZXI6OmRvd25sb2FkVGltZXJDYWxsYmFjayhUaW1lcjxSZXNvdXJjZUhhbmRs ZU1hbmFnZXI+KgogICAgICAgICAgICAgICAgIGQtPm1fbXVsdGlwYXJ0SGFuZGxlLT5jb250ZW50 RW5kZWQoKTsKIAogICAgICAgICAgICAgaWYgKGQtPmNsaWVudCgpKSB7CisgICAgICAgICAgICAg ICAgZC0+Y2xpZW50KCktPmRpZFJlY2VpdmVSZXNwb25zZShqb2IsIGQtPm1fcmVzcG9uc2UpOwog ICAgICAgICAgICAgICAgIGQtPmNsaWVudCgpLT5kaWRGaW5pc2hMb2FkaW5nKGpvYiwgMCk7CiAg ICAgICAgICAgICAgICAgQ3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5kaWRGaW5pc2hM b2FkaW5nKGpvYi0+Zmlyc3RSZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCkpOwogICAgICAgICAgICAg fQpAQCAtODQ3LDggKzkwNywxNiBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZGlzcGF0 Y2hTeW5jaHJvbm91c0pvYihSZXNvdXJjZUhhbmRsZSogam9iKQogICAgICAgICBSZXNvdXJjZUVy cm9yIGVycm9yKFN0cmluZyhoYW5kbGUtPm1fdXJsKSwgcmV0LCBTdHJpbmcoaGFuZGxlLT5tX3Vy bCksIFN0cmluZyhjdXJsX2Vhc3lfc3RyZXJyb3IocmV0KSkpOwogICAgICAgICBlcnJvci5zZXRT U0xFcnJvcnMoaGFuZGxlLT5tX3NzbEVycm9ycyk7CiAgICAgICAgIGhhbmRsZS0+Y2xpZW50KCkt PmRpZEZhaWwoam9iLCBlcnJvcik7CisgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKGhhbmRsZS0+ Y2xpZW50KCkpCisgICAgICAgICAgICBoYW5kbGUtPmNsaWVudCgpLT5kaWRSZWNlaXZlUmVzcG9u c2Uoam9iLCBoYW5kbGUtPm1fcmVzcG9uc2UpOwogICAgIH0KIAorCisjaWYgRU5BQkxFKFdFQl9U SU1JTkcpCisgICAgY2FsY3VsYXRlV2ViVGltaW5nSW5mb3JtYXRpb25zKGhhbmRsZSk7CisjZW5k aWYKKwogICAgIGN1cmxfZWFzeV9jbGVhbnVwKGhhbmRsZS0+bV9oYW5kbGUpOwogfQogCkBAIC0x MDQ0LDYgKzExMTIsMTEgQEAgdm9pZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmluaXRpYWxpemVI YW5kbGUoUmVzb3VyY2VIYW5kbGUqIGpvYikKICAgICAgICAgY3VybF9lYXN5X3NldG9wdChkLT5t X2hhbmRsZSwgQ1VSTE9QVF9QUk9YWSwgbV9wcm94eS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAg Y3VybF9lYXN5X3NldG9wdChkLT5tX2hhbmRsZSwgQ1VSTE9QVF9QUk9YWVRZUEUsIG1fcHJveHlU eXBlKTsKICAgICB9CisjaWYgRU5BQkxFKFdFQl9USU1JTkcpCisgICAgY3VybF9lYXN5X3NldG9w dChkLT5tX2hhbmRsZSwgQ1VSTE9QVF9TT0NLT1BURlVOQ1RJT04sIHNvY2tvcHRmdW5jdGlvbik7 CisgICAgY3VybF9lYXN5X3NldG9wdChkLT5tX2hhbmRsZSwgQ1VSTE9QVF9TT0NLT1BUREFUQSwg am9iKTsKKyAgICBkLT5tX3Jlc3BvbnNlLnNldFJlc291cmNlTG9hZFRpbWluZyhSZXNvdXJjZUxv YWRUaW1pbmc6OmNyZWF0ZSgpKTsKKyNlbmRpZgogfQogCiB2b2lkIFJlc291cmNlSGFuZGxlTWFu YWdlcjo6aW5pdENvb2tpZVNlc3Npb24oKQo= 222106 2014-01-24 06:30:12 -0800 2014-04-16 12:54:30 -0700 proposed patch webtiming.patch text/plain 6600 sipka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3Yzk2OTRkLi5mMjdiOTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTQtMDEtMjQgIFJvYmVydCBTaXBrYSAgPHNpcGthQGluZi51LXN6ZWdlZC5odT4KKwor ICAgICAgICBbY3VybF0gQWRkIFdFQl9USU1JTkcgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NTU1CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWNjZXNzIHRpbWluZyBpbmZvcm1hdGlvbiBy ZWxhdGVkIHRvIG5hdmlnYXRpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv UmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1pbGlzZWNvbmRz U2luY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OmNhbGN1bGF0ZVdlYlRpbWluZ0luZm9y bWF0aW9ucyk6CisgICAgICAgIChXZWJDb3JlOjpzb2Nrb3B0ZnVuY3Rpb24pOgorICAgICAgICAo V2ViQ29yZTo6aGVhZGVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VIYW5k bGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VIYW5kbGVNYW5hZ2VyOjpkaXNwYXRjaFN5bmNocm9ub3VzSm9iKToKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlSGFuZGxlTWFuYWdlcjo6aW5pdGlhbGl6ZUhhbmRsZSk6CisKIDIwMTQt MDEtMjQgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFVu cmV2aWV3ZWQgR1RLIGJ1aWxkIGZpeCBhZnRlciByMTYyNjYzLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5h Z2VyLmNwcAppbmRleCAxMzI2ZGRmLi4zNzY5OGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2Vy LmNwcApAQCAtNTksNiArNTksOSBAQAogCiAjaW5jbHVkZSA8ZXJybm8uaD4KICNpbmNsdWRlIDxz dGRpby5oPgorI2lmIEVOQUJMRShXRUJfVElNSU5HKQorI2luY2x1ZGUgPHd0Zi9DdXJyZW50VGlt ZS5oPgorI2VuZGlmCiAjaWYgVVNFKENGKQogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNl bmRpZgpAQCAtMTQ1LDYgKzE0OCw1MyBAQCBzdGF0aWMgTXV0ZXgqIHNoYXJlZFJlc291cmNlTXV0 ZXgoY3VybF9sb2NrX2RhdGEgZGF0YSkgewogICAgIH0KIH0KIAorI2lmIEVOQUJMRShXRUJfVElN SU5HKQorc3RhdGljIGludCBtaWxpc2Vjb25kc1NpbmNlUmVxdWVzdChkb3VibGUgcmVxdWVzdFRp bWUpCit7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oKG1vbm90b25pY2FsbHlJbmNyZWFz aW5nVGltZSgpIC0gcmVxdWVzdFRpbWUpICogMTAwMC4wKTsKK30KKworc3RhdGljIHZvaWQgY2Fs Y3VsYXRlV2ViVGltaW5nSW5mb3JtYXRpb25zKFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQpCit7 CisgICAgZG91YmxlIHN0YXJ0VHJhbnNmZXJ0VGltZTsKKyAgICBkb3VibGUgcHJlVHJhbnNmZXJU aW1lOworICAgIGRvdWJsZSBkbnNsb29rdXBUaW1lOworICAgIGRvdWJsZSBjb25uZWN0VGltZTsK KyAgICBkb3VibGUgYXBwQ29ubmVjdFRpbWU7CisKKyAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhkLT5t X2hhbmRsZSwgQ1VSTElORk9fTkFNRUxPT0tVUF9USU1FLCAmZG5zbG9va3VwVGltZSk7CisgICAg Y3VybF9lYXN5X2dldGluZm8oZC0+bV9oYW5kbGUsIENVUkxJTkZPX0NPTk5FQ1RfVElNRSwgJmNv bm5lY3RUaW1lKTsKKyAgICBjdXJsX2Vhc3lfZ2V0aW5mbyhkLT5tX2hhbmRsZSwgQ1VSTElORk9f QVBQQ09OTkVDVF9USU1FLCAmYXBwQ29ubmVjdFRpbWUpOworICAgIGN1cmxfZWFzeV9nZXRpbmZv KGQtPm1faGFuZGxlLCBDVVJMSU5GT19TVEFSVFRSQU5TRkVSX1RJTUUsICZzdGFydFRyYW5zZmVy dFRpbWUpOworICAgIGN1cmxfZWFzeV9nZXRpbmZvKGQtPm1faGFuZGxlLCBDVVJMSU5GT19QUkVU UkFOU0ZFUl9USU1FLCAmcHJlVHJhbnNmZXJUaW1lKTsKKworICAgIGQtPm1fcmVzcG9uc2UucmVz b3VyY2VMb2FkVGltaW5nKCktPmRuc1N0YXJ0ID0gMDsKKyAgICBkLT5tX3Jlc3BvbnNlLnJlc291 cmNlTG9hZFRpbWluZygpLT5kbnNFbmQgPSBzdGF0aWNfY2FzdDxpbnQ+KGRuc2xvb2t1cFRpbWUg KiAxMDAwKTsKKworICAgIGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCktPmNvbm5l Y3RTdGFydCA9IHN0YXRpY19jYXN0PGludD4oZG5zbG9va3VwVGltZSAqIDEwMDApOworICAgIGQt Pm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCktPmNvbm5lY3RFbmQgPSBzdGF0aWNfY2Fz dDxpbnQ+KGNvbm5lY3RUaW1lICogMTAwMCk7CisKKyAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNl TG9hZFRpbWluZygpLT5zZW5kU3RhcnQgPSBzdGF0aWNfY2FzdDxpbnQ+KGNvbm5lY3RUaW1lICox MDAwKTsKKyAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5zZW5kRW5kID1z dGF0aWNfY2FzdDxpbnQ+KHByZVRyYW5zZmVyVGltZSAqIDEwMDApOworCisgICAgaWYgKGFwcENv bm5lY3RUaW1lKSB7CisgICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkt PnNzbFN0YXJ0ID0gc3RhdGljX2Nhc3Q8aW50Pihjb25uZWN0VGltZSAqIDEwMDApOworICAgICAg ICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5zc2xFbmQgPSBzdGF0aWNfY2Fz dDxpbnQ+KGFwcENvbm5lY3RUaW1lICoxMDAwKTsKKyAgICB9Cit9CisKK3N0YXRpYyBpbnQgc29j a29wdGZ1bmN0aW9uKHZvaWQqIGRhdGEsIGN1cmxfc29ja2V0X3QgLypjdXJsZmQqLywgY3VybHNv Y2t0eXBlIC8qcHVycG9zZSovKQoreworICAgIFJlc291cmNlSGFuZGxlKiBqb2IgPSBzdGF0aWNf Y2FzdDxSZXNvdXJjZUhhbmRsZSo+KGRhdGEpOworICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwq IGQgPSBqb2ItPmdldEludGVybmFsKCk7CisKKyAgICBpZiAoZC0+bV9yZXNwb25zZS5yZXNvdXJj ZUxvYWRUaW1pbmcoKSkKKyAgICAgICAgZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmco KS0+cmVxdWVzdFRpbWUgPSBtb25vdG9uaWNhbGx5SW5jcmVhc2luZ1RpbWUoKTsKKworICAgIHJl dHVybiAwOworfQorI2VuZGlmCisKIC8vIGxpYmN1cmwgZG9lcyBub3QgaW1wbGVtZW50IGl0cyBv d24gdGhyZWFkIHN5bmNocm9uaXphdGlvbiBwcmltaXRpdmVzLgogLy8gdGhlc2UgdHdvIGZ1bmN0 aW9ucyBwcm92aWRlIG11dGV4ZXMgZm9yIGNvb2tpZXMsIGFuZCBmb3IgdGhlIGdsb2JhbCBETlMK IC8vIGNhY2hlLgpAQCAtNDM3LDYgKzQ4NywxMSBAQCBzdGF0aWMgc2l6ZV90IGhlYWRlckNhbGxi YWNrKGNoYXIqIHB0ciwgc2l6ZV90IHNpemUsIHNpemVfdCBubWVtYiwgdm9pZCogZGF0YSkKICAg ICAgICAgICAgICAgICBkLT5tX211bHRpcGFydEhhbmRsZSA9IE11bHRpcGFydEhhbmRsZTo6Y3Jl YXRlKGpvYiwgYm91bmRhcnkpOwogICAgICAgICB9CiAKKyNpZiBFTkFCTEUoV0VCX1RJTUlORykK KyAgICAgICAgaWYgKGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkgJiYgZC0+bV9y ZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKS0+cmVxdWVzdFRpbWUpCisgICAgICAgICAgICBk LT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5yZWNlaXZlSGVhZGVyc0VuZCA9IG1p bGlzZWNvbmRzU2luY2VSZXF1ZXN0KGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkt PnJlcXVlc3RUaW1lKTsKKyNlbmRpZgorCiAgICAgICAgIC8vIEhUVFAgcmVkaXJlY3Rpb24KICAg ICAgICAgaWYgKGlzSHR0cFJlZGlyZWN0KGh0dHBDb2RlKSkgewogICAgICAgICAgICAgU3RyaW5n IGxvY2F0aW9uID0gZC0+bV9yZXNwb25zZS5odHRwSGVhZGVyRmllbGQoImxvY2F0aW9uIik7CkBA IC00NjQsMTAgKzUxOSw5IEBAIHN0YXRpYyBzaXplX3QgaGVhZGVyQ2FsbGJhY2soY2hhciogcHRy LCBzaXplX3Qgc2l6ZSwgc2l6ZV90IG5tZW1iLCB2b2lkKiBkYXRhKQogICAgICAgICAgICAgfQog ICAgICAgICB9CiAKLSAgICAgICAgaWYgKGNsaWVudCkgewotICAgICAgICAgICAgY2xpZW50LT5k aWRSZWNlaXZlUmVzcG9uc2Uoam9iLCBkLT5tX3Jlc3BvbnNlKTsKKyAgICAgICAgaWYgKGNsaWVu dCkKICAgICAgICAgICAgIEN1cmxDYWNoZU1hbmFnZXI6OmdldEluc3RhbmNlKCkuZGlkUmVjZWl2 ZVJlc3BvbnNlKGpvYiwgZC0+bV9yZXNwb25zZSk7Ci0gICAgICAgIH0KKwogICAgICAgICBkLT5t X3Jlc3BvbnNlLnNldFJlc3BvbnNlRmlyZWQodHJ1ZSk7CiAKICAgICB9IGVsc2UgewpAQCAtNjAw LDcgKzY1NCwxMiBAQCB2b2lkIFJlc291cmNlSGFuZGxlTWFuYWdlcjo6ZG93bmxvYWRUaW1lckNh bGxiYWNrKFRpbWVyPFJlc291cmNlSGFuZGxlTWFuYWdlcj4qCiAgICAgICAgIGlmIChDVVJMTVNH X0RPTkUgIT0gbXNnLT5tc2cpCiAgICAgICAgICAgICBjb250aW51ZTsKIAorCiAgICAgICAgIGlm IChDVVJMRV9PSyA9PSBtc2ctPmRhdGEucmVzdWx0KSB7CisKKyNpZiBFTkFCTEUoV0VCX1RJTUlO RykKKyAgICAgICAgICAgIGNhbGN1bGF0ZVdlYlRpbWluZ0luZm9ybWF0aW9ucyhkKTsKKyNlbmRp ZgogICAgICAgICAgICAgaWYgKCFkLT5tX3Jlc3BvbnNlLnJlc3BvbnNlRmlyZWQoKSkgewogICAg ICAgICAgICAgICAgIGhhbmRsZUxvY2FsUmVjZWl2ZVJlc3BvbnNlKGQtPm1faGFuZGxlLCBqb2Is IGQpOwogICAgICAgICAgICAgICAgIGlmIChkLT5tX2NhbmNlbGxlZCkgewpAQCAtNjEzLDYgKzY3 Miw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVNYW5hZ2VyOjpkb3dubG9hZFRpbWVyQ2FsbGJhY2so VGltZXI8UmVzb3VyY2VIYW5kbGVNYW5hZ2VyPioKICAgICAgICAgICAgICAgICBkLT5tX211bHRp cGFydEhhbmRsZS0+Y29udGVudEVuZGVkKCk7CiAKICAgICAgICAgICAgIGlmIChkLT5jbGllbnQo KSkgeworICAgICAgICAgICAgICAgIGQtPmNsaWVudCgpLT5kaWRSZWNlaXZlUmVzcG9uc2Uoam9i LCBkLT5tX3Jlc3BvbnNlKTsKICAgICAgICAgICAgICAgICBkLT5jbGllbnQoKS0+ZGlkRmluaXNo TG9hZGluZyhqb2IsIDApOwogICAgICAgICAgICAgICAgIEN1cmxDYWNoZU1hbmFnZXI6OmdldElu c3RhbmNlKCkuZGlkRmluaXNoTG9hZGluZyhqb2ItPmZpcnN0UmVxdWVzdCgpLnVybCgpLnN0cmlu ZygpKTsKICAgICAgICAgICAgIH0KQEAgLTg0Nyw4ICs5MDcsMTYgQEAgdm9pZCBSZXNvdXJjZUhh bmRsZU1hbmFnZXI6OmRpc3BhdGNoU3luY2hyb25vdXNKb2IoUmVzb3VyY2VIYW5kbGUqIGpvYikK ICAgICAgICAgUmVzb3VyY2VFcnJvciBlcnJvcihTdHJpbmcoaGFuZGxlLT5tX3VybCksIHJldCwg U3RyaW5nKGhhbmRsZS0+bV91cmwpLCBTdHJpbmcoY3VybF9lYXN5X3N0cmVycm9yKHJldCkpKTsK ICAgICAgICAgZXJyb3Iuc2V0U1NMRXJyb3JzKGhhbmRsZS0+bV9zc2xFcnJvcnMpOwogICAgICAg ICBoYW5kbGUtPmNsaWVudCgpLT5kaWRGYWlsKGpvYiwgZXJyb3IpOworICAgIH0gZWxzZSB7Cisg ICAgICAgIGlmIChoYW5kbGUtPmNsaWVudCgpKQorICAgICAgICAgICAgaGFuZGxlLT5jbGllbnQo KS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGpvYiwgaGFuZGxlLT5tX3Jlc3BvbnNlKTsKICAgICB9CiAK KworI2lmIEVOQUJMRShXRUJfVElNSU5HKQorICAgIGNhbGN1bGF0ZVdlYlRpbWluZ0luZm9ybWF0 aW9ucyhoYW5kbGUpOworI2VuZGlmCisKICAgICBjdXJsX2Vhc3lfY2xlYW51cChoYW5kbGUtPm1f aGFuZGxlKTsKIH0KIApAQCAtMTA0NCw2ICsxMTEyLDExIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVN YW5hZ2VyOjppbml0aWFsaXplSGFuZGxlKFJlc291cmNlSGFuZGxlKiBqb2IpCiAgICAgICAgIGN1 cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfUFJPWFksIG1fcHJveHkudXRmOCgp LmRhdGEoKSk7CiAgICAgICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRf UFJPWFlUWVBFLCBtX3Byb3h5VHlwZSk7CiAgICAgfQorI2lmIEVOQUJMRShXRUJfVElNSU5HKQor ICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENVUkxPUFRfU09DS09QVEZVTkNUSU9O LCBzb2Nrb3B0ZnVuY3Rpb24pOworICAgIGN1cmxfZWFzeV9zZXRvcHQoZC0+bV9oYW5kbGUsIENV UkxPUFRfU09DS09QVERBVEEsIGpvYik7CisgICAgZC0+bV9yZXNwb25zZS5zZXRSZXNvdXJjZUxv YWRUaW1pbmcoUmVzb3VyY2VMb2FkVGltaW5nOjpjcmVhdGUoKSk7CisjZW5kaWYKIH0KIAogdm9p ZCBSZXNvdXJjZUhhbmRsZU1hbmFnZXI6OmluaXRDb29raWVTZXNzaW9uKCkK