147631 2015-08-04 09:54:10 -0700 Network cache fetches should have timeout 2015-08-05 03:28:27 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned barraclough cdumez cgarcia commit-queue kling rniwa oldest_to_newest 1114623 0 koivisto 2015-08-04 09:54:10 -0700 System might be under heavy I/O pressure. If it takes long time to get data from disk we should load from network instead. 1114634 1 cdumez 2015-08-04 10:15:01 -0700 I am a little bit skeptical about this. Fetching from the network in general is very slow (outside simulated tests) and bad for battery life. 1114674 2 258192 koivisto 2015-08-04 11:43:59 -0700 Created attachment 258192 patch 1114677 3 koivisto 2015-08-04 11:47:50 -0700 (In reply to comment #1) > I am a little bit skeptical about this. Fetching from the network in general > is very slow (outside simulated tests) and bad for battery life. We have spintraces where system is crawling because heavy I/O load (generally systems with spinning disks). It is better to keep the browser functional. The timeout is very long (1s) should not get hit under any normal circumstances. 1114983 4 258192 kling 2015-08-04 23:03:47 -0700 Comment on attachment 258192 patch View in context: https://bugs.webkit.org/attachment.cgi?id=258192&action=review r=me At first I was skeptical. But 1 second timeout on disk read -- okay, we're pretty damn hosed. > Source/WebKit2/ChangeLog:10 > + This patch introduces 1s second timeout for disk reads. If the last dispatched cache read takes longer than that we cancel all "1s second timeout" 1115003 5 koivisto 2015-08-05 03:28:08 -0700 http://trac.webkit.org/changeset/187958 (with 1.5s timeout) 258192 2015-08-04 11:43:59 -0700 2015-08-04 23:03:47 -0700 patch retrieve-timeout.patch text/plain 9533 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Nzg2NykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDE1LTA4LTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBOZXR3b3JrIGNhY2hlIGZldGNo ZXMgc2hvdWxkIGhhdmUgdGltZW91dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQ3NjMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU3lzdGVtIG1pZ2h0IGJlIHVuZGVyIGhlYXZ5IEkvTyBwcmVzc3VyZS4g SWYgaXQgdGFrZXMgbG9uZyB0aW1lIHRvIGdldCBkYXRhIGZyb20gZGlzayB3ZSBzaG91bGQgbG9h ZCBmcm9tIG5ldHdvcmsgaW5zdGVhZC4KKworICAgICAgICBUaGlzIHBhdGNoIGludHJvZHVjZXMg MXMgc2Vjb25kIHRpbWVvdXQgZm9yIGRpc2sgcmVhZHMuIElmIHRoZSBsYXN0IGRpc3BhdGNoZWQg Y2FjaGUgcmVhZCB0YWtlcyBsb25nZXIgdGhhbiB0aGF0IHdlIGNhbmNlbCBhbGwKKyAgICAgICAg YWN0aXZlIGFuZCBwZW5kaW5nIHJlYWRzIGFuZCBqdXN0IGxvYWQgdGhvc2UgcmVzb3VyY2VzIGZy b20gbmV0d29yay4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNo ZVN0b3JhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OlJl YWRPcGVyYXRpb246OlJlYWRPcGVyYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2Fj aGU6OlN0b3JhZ2U6OlJlYWRPcGVyYXRpb246OmNhbmNlbCk6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDYWNoZTo6U3RvcmFnZTo6UmVhZE9wZXJhdGlvbjo6ZmluaXNoKToKKworICAgICAgICAg ICAgRmFjdG9yIHRvIGZ1bmN0aW9ucy4KKworICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OlN0b3JhZ2U6OlN0b3JhZ2UpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3Jh Z2U6OnVwZGF0ZUZpbGVNb2RpZmljYXRpb25UaW1lKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a0NhY2hlOjpTdG9yYWdlOjpkaXNwYXRjaFJlYWRPcGVyYXRpb24pOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmZpbmlzaFJlYWRPcGVyYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmNhbmNlbEFsbFJlYWRPcGVyYXRpb25zKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpkaXNwYXRjaFBlbmRpbmdS ZWFkT3BlcmF0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6 ZGlzcGF0Y2hQZW5kaW5nV3JpdGVPcGVyYXRpb25zKToKKworICAgICAgICAgICAgQWxzbyBtYWtl IGRpc3BhdGNoIGZ1bmN0aW9ucyB0cmFuc2ZlciB0aGUgb3BlcmF0aW9uIG93bmVyc2hpcC4KKwor ICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6OnNob3VsZFN0b3JlQm9keUFzQmxvYik6Cisg ICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6ZGlzcGF0Y2hXcml0ZU9wZXJh dGlvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFn ZS5oOgorCiAyMDE1LTA4LTA0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE4NzgxMi4KSW5kZXg6IFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0 b3JhZ2UuY3BwCShyZXZpc2lvbiAxODc3MzMpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTYs NiArNTYsOSBAQCBwdWJsaWM6CiAgICAgICAgICwgY29tcGxldGlvbkhhbmRsZXIoY29tcGxldGlv bkhhbmRsZXIpCiAgICAgeyB9CiAKKyAgICB2b2lkIGNhbmNlbCgpOworICAgIGJvb2wgZmluaXNo KCk7CisKICAgICBjb25zdCBLZXkga2V5OwogICAgIGNvbnN0IFJldHJpZXZlQ29tcGxldGlvbkhh bmRsZXIgY29tcGxldGlvbkhhbmRsZXI7CiAgICAgCkBAIC02Myw4ICs2NiwzNCBAQCBwdWJsaWM6 CiAgICAgU0hBMTo6RGlnZXN0IGV4cGVjdGVkQm9keUhhc2g7CiAgICAgQmxvYlN0b3JhZ2U6OkJs b2IgcmVzdWx0Qm9keUJsb2I7CiAgICAgc3RkOjphdG9taWM8dW5zaWduZWQ+IGFjdGl2ZUNvdW50 IHsgMCB9OworICAgIGJvb2wgaXNDYW5jZWxlZCB7IGZhbHNlIH07CiB9OwogCit2b2lkIFN0b3Jh Z2U6OlJlYWRPcGVyYXRpb246OmNhbmNlbCgpCit7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFp bigpKTsKKworICAgIGlmIChpc0NhbmNlbGVkKQorICAgICAgICByZXR1cm47CisgICAgaXNDYW5j ZWxlZCA9IHRydWU7CisgICAgY29tcGxldGlvbkhhbmRsZXIobnVsbHB0cik7Cit9CisKK2Jvb2wg U3RvcmFnZTo6UmVhZE9wZXJhdGlvbjo6ZmluaXNoKCkKK3sKKyAgICBBU1NFUlQoUnVuTG9vcDo6 aXNNYWluKCkpOworCisgICAgaWYgKGlzQ2FuY2VsZWQpCisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBpZiAocmVzdWx0UmVjb3JkICYmIHJlc3VsdFJlY29yZC0+Ym9keS5pc051bGwoKSkgewor ICAgICAgICBpZiAocmVzdWx0Qm9keUJsb2IuaGFzaCA9PSBleHBlY3RlZEJvZHlIYXNoKQorICAg ICAgICAgICAgcmVzdWx0UmVjb3JkLT5ib2R5ID0gcmVzdWx0Qm9keUJsb2IuZGF0YTsKKyAgICAg ICAgZWxzZQorICAgICAgICAgICAgcmVzdWx0UmVjb3JkID0gbnVsbHB0cjsKKyAgICB9CisgICAg cmV0dXJuIGNvbXBsZXRpb25IYW5kbGVyKFdURjo6bW92ZShyZXN1bHRSZWNvcmQpKTsKK30KKwog c3RydWN0IFN0b3JhZ2U6OldyaXRlT3BlcmF0aW9uIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9D QVRFRDsKIHB1YmxpYzoKQEAgLTE0Nyw2ICsxNzYsNyBAQCBzdGF0aWMgdm9pZCBkZWxldGVFbXB0 eVJlY29yZHNEaXJlY3RvcmllCiBTdG9yYWdlOjpTdG9yYWdlKGNvbnN0IFN0cmluZyYgYmFzZURp cmVjdG9yeVBhdGgpCiAgICAgOiBtX2Jhc2VQYXRoKGJhc2VEaXJlY3RvcnlQYXRoKQogICAgICwg bV9yZWNvcmRzUGF0aChtYWtlUmVjb3Jkc0RpcmVjdG9yeVBhdGgoYmFzZURpcmVjdG9yeVBhdGgp KQorICAgICwgbV9yZWFkT3BlcmF0aW9uVGltZW91dFRpbWVyKCp0aGlzLCAmU3RvcmFnZTo6Y2Fu Y2VsQWxsUmVhZE9wZXJhdGlvbnMpCiAgICAgLCBtX3dyaXRlT3BlcmF0aW9uRGlzcGF0Y2hUaW1l cigqdGhpcywgJlN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1dyaXRlT3BlcmF0aW9ucykKICAgICAs IG1faW9RdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldlYktpdC5DYWNoZS5TdG9y YWdlIiwgV29ya1F1ZXVlOjpUeXBlOjpDb25jdXJyZW50KSkKICAgICAsIG1fYmFja2dyb3VuZElP UXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQuQ2FjaGUuU3RvcmFnZS5i YWNrZ3JvdW5kIiwgV29ya1F1ZXVlOjpUeXBlOjpDb25jdXJyZW50LCBXb3JrUXVldWU6OlFPUzo6 QmFja2dyb3VuZCkpCkBAIC00ODYsMTAgKzUxNiwxNiBAQCB2b2lkIFN0b3JhZ2U6OnVwZGF0ZUZp bGVNb2RpZmljYXRpb25UaW1lCiAgICAgfSk7CiB9CiAKLXZvaWQgU3RvcmFnZTo6ZGlzcGF0Y2hS ZWFkT3BlcmF0aW9uKFJlYWRPcGVyYXRpb24mIHJlYWRPcGVyYXRpb24pCit2b2lkIFN0b3JhZ2U6 OmRpc3BhdGNoUmVhZE9wZXJhdGlvbihzdGQ6OnVuaXF1ZV9wdHI8UmVhZE9wZXJhdGlvbj4gcmVh ZE9wZXJhdGlvblB0cikKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwotICAgIEFT U0VSVChtX2FjdGl2ZVJlYWRPcGVyYXRpb25zLmNvbnRhaW5zKCZyZWFkT3BlcmF0aW9uKSk7CisK KyAgICBhdXRvJiByZWFkT3BlcmF0aW9uID0gKnJlYWRPcGVyYXRpb25QdHI7CisgICAgbV9hY3Rp dmVSZWFkT3BlcmF0aW9ucy5hZGQoV1RGOjptb3ZlKHJlYWRPcGVyYXRpb25QdHIpKTsKKworICAg IC8vIEkvTyBwcmVzc3VyZSBtYXkgbWFrZSBkaXNrIG9wZXJhdGlvbnMgc2xvdy4gSWYgdGhleSBz dGFydCB0YWtpbmcgdmVyeSBsb25nIHRpbWUgd2UgcmF0aGVyIGdvIHRvIG5ldHdvcmsuCisgICAg Y29uc3QgYXV0byByZWFkVGltZW91dCA9IDEwMDBfbXM7CisgICAgbV9yZWFkT3BlcmF0aW9uVGlt ZW91dFRpbWVyLnN0YXJ0T25lU2hvdChyZWFkVGltZW91dCk7CiAKICAgICBib29sIHNob3VsZEdl dEJvZHlCbG9iID0gIW1fYm9keUZpbHRlciB8fCBtX2JvZHlGaWx0ZXItPm1heUNvbnRhaW4ocmVh ZE9wZXJhdGlvbi5rZXkuaGFzaCgpKTsKIApAQCAtNTI0LDI2ICs1NjAsNDMgQEAgdm9pZCBTdG9y YWdlOjpmaW5pc2hSZWFkT3BlcmF0aW9uKFJlYWRPcAogICAgICAgICByZXR1cm47CiAKICAgICBS dW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsICZyZWFkT3BlcmF0aW9uXSB7Ci0gICAgICAg IGlmIChyZWFkT3BlcmF0aW9uLnJlc3VsdFJlY29yZCAmJiByZWFkT3BlcmF0aW9uLnJlc3VsdFJl Y29yZC0+Ym9keS5pc051bGwoKSkgewotICAgICAgICAgICAgaWYgKHJlYWRPcGVyYXRpb24ucmVz dWx0Qm9keUJsb2IuaGFzaCA9PSByZWFkT3BlcmF0aW9uLmV4cGVjdGVkQm9keUhhc2gpCi0gICAg ICAgICAgICAgICAgcmVhZE9wZXJhdGlvbi5yZXN1bHRSZWNvcmQtPmJvZHkgPSByZWFkT3BlcmF0 aW9uLnJlc3VsdEJvZHlCbG9iLmRhdGE7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgcmVhZE9wZXJhdGlvbi5yZXN1bHRSZWNvcmQgPSBudWxscHRyOwotICAgICAgICB9Ci0KLSAg ICAgICAgYm9vbCBzdWNjZXNzID0gcmVhZE9wZXJhdGlvbi5jb21wbGV0aW9uSGFuZGxlcihXVEY6 Om1vdmUocmVhZE9wZXJhdGlvbi5yZXN1bHRSZWNvcmQpKTsKKyAgICAgICAgYm9vbCBzdWNjZXNz ID0gcmVhZE9wZXJhdGlvbi5maW5pc2goKTsKICAgICAgICAgaWYgKHN1Y2Nlc3MpCiAgICAgICAg ICAgICB1cGRhdGVGaWxlTW9kaWZpY2F0aW9uVGltZShyZWNvcmRQYXRoRm9yS2V5KHJlYWRPcGVy YXRpb24ua2V5KSk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgZWxzZSBpZiAoIXJlYWRPcGVyYXRp b24uaXNDYW5jZWxlZCkKICAgICAgICAgICAgIHJlbW92ZShyZWFkT3BlcmF0aW9uLmtleSk7CisK ICAgICAgICAgQVNTRVJUKG1fYWN0aXZlUmVhZE9wZXJhdGlvbnMuY29udGFpbnMoJnJlYWRPcGVy YXRpb24pKTsKICAgICAgICAgbV9hY3RpdmVSZWFkT3BlcmF0aW9ucy5yZW1vdmUoJnJlYWRPcGVy YXRpb24pOworCisgICAgICAgIGlmIChtX2FjdGl2ZVJlYWRPcGVyYXRpb25zLmlzRW1wdHkoKSkK KyAgICAgICAgICAgIG1fcmVhZE9wZXJhdGlvblRpbWVvdXRUaW1lci5zdG9wKCk7CisgICAgICAg IAogICAgICAgICBkaXNwYXRjaFBlbmRpbmdSZWFkT3BlcmF0aW9ucygpOwogCiAgICAgICAgIExP RyhOZXR3b3JrQ2FjaGVTdG9yYWdlLCAiKE5ldHdvcmtQcm9jZXNzKSByZWFkIGNvbXBsZXRlIHN1 Y2Nlc3M9JWQiLCBzdWNjZXNzKTsKICAgICB9KTsKIH0KIAordm9pZCBTdG9yYWdlOjpjYW5jZWxB bGxSZWFkT3BlcmF0aW9ucygpCit7CisgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKwor ICAgIGZvciAoYXV0byYgcmVhZE9wZXJhdGlvbiA6IG1fYWN0aXZlUmVhZE9wZXJhdGlvbnMpCisg ICAgICAgIHJlYWRPcGVyYXRpb24tPmNhbmNlbCgpOworCisgICAgc2l6ZV90IHBlbmRpbmdDb3Vu dCA9IDA7CisgICAgZm9yIChpbnQgcHJpb3JpdHkgPSBtYXhpbXVtUmV0cmlldmVQcmlvcml0eTsg cHJpb3JpdHkgPj0gMDsgLS1wcmlvcml0eSkgeworICAgICAgICBhdXRvJiBwZW5kaW5nUmV0cmll dmVRdWV1ZSA9IG1fcGVuZGluZ1JlYWRPcGVyYXRpb25zQnlQcmlvcml0eVtwcmlvcml0eV07Cisg ICAgICAgIHBlbmRpbmdDb3VudCArPSBwZW5kaW5nUmV0cmlldmVRdWV1ZS5zaXplKCk7CisgICAg ICAgIGZvciAoYXV0byBpdCA9IHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnJiZWdpbigpLCBlbmQgPSBw ZW5kaW5nUmV0cmlldmVRdWV1ZS5yZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAgICAg ICgqaXQpLT5jYW5jZWwoKTsKKyAgICAgICAgcGVuZGluZ1JldHJpZXZlUXVldWUuY2xlYXIoKTsK KyAgICB9CisKKyAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3b3JrUHJvY2Vzcykg cmV0cmlldmUgdGltZW91dCwgY2FuY2VsZWQgJXUgYWN0aXZlIGFuZCAlenUgcGVuZGluZyIsIG1f YWN0aXZlUmVhZE9wZXJhdGlvbnMuc2l6ZSgpLCBwZW5kaW5nQ291bnQpOworfQorCiB2b2lkIFN0 b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1JlYWRPcGVyYXRpb25zKCkKIHsKICAgICBBU1NFUlQoUnVu TG9vcDo6aXNNYWluKCkpOwpAQCAtNTU4LDEwICs2MTEsNyBAQCB2b2lkIFN0b3JhZ2U6OmRpc3Bh dGNoUGVuZGluZ1JlYWRPcGVyYXRpCiAgICAgICAgIGF1dG8mIHBlbmRpbmdSZXRyaWV2ZVF1ZXVl ID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W3ByaW9yaXR5XTsKICAgICAgICAg aWYgKHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICBhdXRvIHJlYWRPcGVyYXRpb24gPSBwZW5kaW5nUmV0cmlldmVRdWV1ZS50YWtl TGFzdCgpOwotICAgICAgICBhdXRvJiByZWFkID0gKnJlYWRPcGVyYXRpb247Ci0gICAgICAgIG1f YWN0aXZlUmVhZE9wZXJhdGlvbnMuYWRkKFdURjo6bW92ZShyZWFkT3BlcmF0aW9uKSk7Ci0gICAg ICAgIGRpc3BhdGNoUmVhZE9wZXJhdGlvbihyZWFkKTsKKyAgICAgICAgZGlzcGF0Y2hSZWFkT3Bl cmF0aW9uKHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnRha2VMYXN0KCkpOwogICAgIH0KIH0KIApAQCAt NTkxLDExICs2NDEsNyBAQCB2b2lkIFN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1dyaXRlT3BlcmF0 CiAgICAgICAgICAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3b3JrUHJvY2Vzcykg bGltaXRpbmcgcGFyYWxsZWwgd3JpdGVzIik7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KLSAgICAgICAgYXV0byB3cml0ZU9wZXJhdGlvbiA9IG1fcGVuZGluZ1dyaXRlT3BlcmF0aW9u cy50YWtlTGFzdCgpOwotICAgICAgICBhdXRvJiB3cml0ZSA9ICp3cml0ZU9wZXJhdGlvbjsKLSAg ICAgICAgbV9hY3RpdmVXcml0ZU9wZXJhdGlvbnMuYWRkKFdURjo6bW92ZSh3cml0ZU9wZXJhdGlv bikpOwotCi0gICAgICAgIGRpc3BhdGNoV3JpdGVPcGVyYXRpb24od3JpdGUpOworICAgICAgICBk aXNwYXRjaFdyaXRlT3BlcmF0aW9uKG1fcGVuZGluZ1dyaXRlT3BlcmF0aW9ucy50YWtlTGFzdCgp KTsKICAgICB9CiB9CiAKQEAgLTYwNSwxMCArNjUxLDEyIEBAIHN0YXRpYyBib29sIHNob3VsZFN0 b3JlQm9keUFzQmxvYihjb25zdCAKICAgICByZXR1cm4gYm9keURhdGEuc2l6ZSgpID4gbWF4aW11 bUlubGluZUJvZHlTaXplOwogfQogCi12b2lkIFN0b3JhZ2U6OmRpc3BhdGNoV3JpdGVPcGVyYXRp b24oV3JpdGVPcGVyYXRpb24mIHdyaXRlT3BlcmF0aW9uKQordm9pZCBTdG9yYWdlOjpkaXNwYXRj aFdyaXRlT3BlcmF0aW9uKHN0ZDo6dW5pcXVlX3B0cjxXcml0ZU9wZXJhdGlvbj4gd3JpdGVPcGVy YXRpb25QdHIpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKLSAgICBBU1NFUlQo bV9hY3RpdmVXcml0ZU9wZXJhdGlvbnMuY29udGFpbnMoJndyaXRlT3BlcmF0aW9uKSk7CisKKyAg ICBhdXRvJiB3cml0ZU9wZXJhdGlvbiA9ICp3cml0ZU9wZXJhdGlvblB0cjsKKyAgICBtX2FjdGl2 ZVdyaXRlT3BlcmF0aW9ucy5hZGQoV1RGOjptb3ZlKHdyaXRlT3BlcmF0aW9uUHRyKSk7CiAKICAg ICAvLyBUaGlzIHdhcyBhZGRlZCBhbHJlYWR5IHdoZW4gc3RhcnRpbmcgdGhlIHN0b3JlIGJ1dCBm aWx0ZXIgbWlnaHQgaGF2ZSBiZWVuIHdpcGVkLgogICAgIGFkZFRvUmVjb3JkRmlsdGVyKHdyaXRl T3BlcmF0aW9uLnJlY29yZC5rZXkpOwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAkocmV2aXNpb24g MTg3NzMzKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlU3RvcmFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsMTIgKzEwNywxMyBAQCBwcml2YXRl OgogICAgIHZvaWQgc2hyaW5rKCk7CiAKICAgICBzdHJ1Y3QgUmVhZE9wZXJhdGlvbjsKLSAgICB2 b2lkIGRpc3BhdGNoUmVhZE9wZXJhdGlvbihSZWFkT3BlcmF0aW9uJik7CisgICAgdm9pZCBkaXNw YXRjaFJlYWRPcGVyYXRpb24oc3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+KTsKICAgICB2 b2lkIGRpc3BhdGNoUGVuZGluZ1JlYWRPcGVyYXRpb25zKCk7CiAgICAgdm9pZCBmaW5pc2hSZWFk T3BlcmF0aW9uKFJlYWRPcGVyYXRpb24mKTsKKyAgICB2b2lkIGNhbmNlbEFsbFJlYWRPcGVyYXRp b25zKCk7CiAKICAgICBzdHJ1Y3QgV3JpdGVPcGVyYXRpb247Ci0gICAgdm9pZCBkaXNwYXRjaFdy aXRlT3BlcmF0aW9uKFdyaXRlT3BlcmF0aW9uJik7CisgICAgdm9pZCBkaXNwYXRjaFdyaXRlT3Bl cmF0aW9uKHN0ZDo6dW5pcXVlX3B0cjxXcml0ZU9wZXJhdGlvbj4pOwogICAgIHZvaWQgZGlzcGF0 Y2hQZW5kaW5nV3JpdGVPcGVyYXRpb25zKCk7CiAgICAgdm9pZCBmaW5pc2hXcml0ZU9wZXJhdGlv bihXcml0ZU9wZXJhdGlvbiYpOwogCkBAIC0xNTAsNiArMTUxLDcgQEAgcHJpdmF0ZToKICAgICBz dGF0aWMgY29uc3QgaW50IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5ID0gNDsKICAgICBEZXF1ZTxz dGQ6OnVuaXF1ZV9wdHI8UmVhZE9wZXJhdGlvbj4+IG1fcGVuZGluZ1JlYWRPcGVyYXRpb25zQnlQ cmlvcml0eVttYXhpbXVtUmV0cmlldmVQcmlvcml0eSArIDFdOwogICAgIEhhc2hTZXQ8c3RkOjp1 bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+PiBtX2FjdGl2ZVJlYWRPcGVyYXRpb25zOworICAgIFdl YkNvcmU6OlRpbWVyIG1fcmVhZE9wZXJhdGlvblRpbWVvdXRUaW1lcjsKIAogICAgIERlcXVlPHN0 ZDo6dW5pcXVlX3B0cjxXcml0ZU9wZXJhdGlvbj4+IG1fcGVuZGluZ1dyaXRlT3BlcmF0aW9uczsK ICAgICBIYXNoU2V0PHN0ZDo6dW5pcXVlX3B0cjxXcml0ZU9wZXJhdGlvbj4+IG1fYWN0aXZlV3Jp dGVPcGVyYXRpb25zOwo=