144568 2015-05-04 06:06:08 -0700 Network Cache: Support time based cache clearing 2015-05-04 11:53:28 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned andersca cgarcia commit-queue oldest_to_newest 1091361 0 koivisto 2015-05-04 06:06:08 -0700 <rdar://problem/19769820> 1091386 1 252311 koivisto 2015-05-04 08:39:40 -0700 Created attachment 252311 patch 1091388 2 commit-queue 2015-05-04 08:41:27 -0700 Attachment 252311 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:718: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h:65: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp:537: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCache.h:104: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm:158: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm:176: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 6 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1091440 3 252311 kling 2015-05-04 11:03:59 -0700 Comment on attachment 252311 patch View in context: https://bugs.webkit.org/attachment.cgi?id=252311&action=review r=me > Source/WebKit2/ChangeLog:25 > + (WebKit::clearNSURCache): Should be called clearNSURLCache. :) 1091459 4 koivisto 2015-05-04 11:53:28 -0700 https://trac.webkit.org/r183755 252311 2015-05-04 08:39:40 -0700 2015-05-04 11:03:59 -0700 patch disk-cache-clear-recent-3.patch text/plain 10865 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Mzc0NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA1LTA0ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBOZXR3b3JrIENhY2hlOiBTdXBw b3J0IHRpbWUgYmFzZWQgY2FjaGUgY2xlYXJpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDU2OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN1cHBvcnQgY2xlYXJpbmcgY2FjaGUgZW50cmllcyBuZXdl ciB0aGFuIGdpdmVuIHRpbWUgb25seS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6 OmRlbGV0ZUR1bXBGaWxlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdl Ojp0cmF2ZXJzZSk6CisKKyAgICAgICAgICAgIEFsc28gZml4IHRocmVhZCBzYWZldHkgb2YgdHJh dmVyc2UgaGFuZGxlciBmdW5jdGlvbi4KKworICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGU6 OkNhY2hlOjpjbGVhcik6CisKKyAgICAgICAgICAgIEFsc28gYWRkIGNvbXBsZXRpb24gaGFuZGxl ciB0byBzdXBwb3J0IHRoZSBBUEkgcHJvcGVybHkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9jYWNoZS9OZXR3b3JrQ2FjaGUuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpT dG9yYWdlOjpjbGVhcik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlU3RvcmFnZS5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtQcm9j ZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OmNsZWFyTlNVUkNhY2hlKToKKworICAgICAg ICAgICAgRmFjdG9yIHRvIGEgZnVuY3Rpb24uCisKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1By b2Nlc3M6OmNsZWFyRGlza0NhY2hlKToKKwogMjAxNS0wNS0wNCAgQ3NhYmEgT3N6dHJvZ29uw6Fj ICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFtBUk1dIERvbid0IGNvbXBhcmUgdW5zaWdu ZWQgY2hhcnMgdG8gRU9GICgtMSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkocmV2aXNpb24gMTgzNzI4KQorKysg U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VS ZXNwb25zZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2hhcmVkQnVmZmVyLmg+CiAjaW5jbHVkZSA8 d3RmL05ldmVyRGVzdHJveWVkLmg+CisjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CiAKICNpZiBQTEFURk9STShDT0NPQSkKQEAgLTUx NywyMCArNTE4LDMzIEBAIHZvaWQgQ2FjaGU6OmR1bXBDb250ZW50c1RvRmlsZSgpCiAgICAgfSk7 CiB9CiAKLXZvaWQgQ2FjaGU6OmNsZWFyKCkKK3ZvaWQgQ2FjaGU6OmRlbGV0ZUR1bXBGaWxlKCkK K3sKKyAgICBhdXRvIHF1ZXVlID0gV29ya1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQu Q2FjaGUuZGVsZXRlIik7CisgICAgU3RyaW5nQ2FwdHVyZSBkdW1wRmlsZVBhdGhDYXB0dXJlKGR1 bXBGaWxlUGF0aCgpKTsKKyAgICBxdWV1ZS0+ZGlzcGF0Y2goW2R1bXBGaWxlUGF0aENhcHR1cmVd IHsKKyAgICAgICAgV2ViQ29yZTo6ZGVsZXRlRmlsZShkdW1wRmlsZVBhdGhDYXB0dXJlLnN0cmlu ZygpKTsKKyAgICB9KTsKK30KKwordm9pZCBDYWNoZTo6Y2xlYXIoc3RkOjpjaHJvbm86OnN5c3Rl bV9jbG9jazo6dGltZV9wb2ludCBtb2RpZmllZFNpbmNlLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3Jr UHJvY2VzcykgY2xlYXJpbmcgY2FjaGUiKTsKLSAgICBpZiAobV9zdG9yYWdlKSB7Ci0gICAgICAg IG1fc3RvcmFnZS0+Y2xlYXIoKTsKKyAgICBkZWxldGVEdW1wRmlsZSgpOwogCi0gICAgICAgIGF1 dG8gcXVldWUgPSBXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldlYktpdC5DYWNoZS5kZWxl dGUiKTsKLSAgICAgICAgU3RyaW5nQ2FwdHVyZSBkdW1wRmlsZVBhdGhDYXB0dXJlKGR1bXBGaWxl UGF0aCgpKTsKLSAgICAgICAgcXVldWUtPmRpc3BhdGNoKFtkdW1wRmlsZVBhdGhDYXB0dXJlXSB7 Ci0gICAgICAgICAgICBXZWJDb3JlOjpkZWxldGVGaWxlKGR1bXBGaWxlUGF0aENhcHR1cmUuc3Ry aW5nKCkpOwotICAgICAgICB9KTsKLSAgICB9CiAgICAgaWYgKG1fc3RhdGlzdGljcykKICAgICAg ICAgbV9zdGF0aXN0aWNzLT5jbGVhcigpOworCisgICAgaWYgKCFtX3N0b3JhZ2UpIHsKKyAgICAg ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKGNvbXBsZXRpb25IYW5kbGVyKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKyAgICBtX3N0b3JhZ2UtPmNsZWFyKG1vZGlmaWVkU2luY2UsIFdURjo6 bW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworfQorCit2b2lkIENhY2hlOjpjbGVhcigpCit7Cisg ICAgY2xlYXIoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2ludDo6bWluKCksIG51 bGxwdHIpOwogfQogCiBTdHJpbmcgQ2FjaGU6OnJlY29yZHNQYXRoKCkgY29uc3QKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5o CShyZXZpc2lvbiAxODM3MjgpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDYgKzEwMSw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIHJlbW92ZShjb25zdCBLZXkmKTsKIAogICAgIHZvaWQgY2xlYXIoKTsKKyAg ICB2b2lkIGNsZWFyKHN0ZDo6Y2hyb25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZp ZWRTaW5jZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKTsKIAog ICAgIHZvaWQgZHVtcENvbnRlbnRzVG9GaWxlKCk7CiAKQEAgLTExMSw2ICsxMTIsNyBAQCBwcml2 YXRlOgogICAgIH5DYWNoZSgpID0gZGVsZXRlOwogCiAgICAgU3RyaW5nIGR1bXBGaWxlUGF0aCgp IGNvbnN0OworICAgIHZvaWQgZGVsZXRlRHVtcEZpbGUoKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxTdG9yYWdlPiBtX3N0b3JhZ2U7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFN0YXRpc3RpY3M+IG1f c3RhdGlzdGljczsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05l dHdvcmtDYWNoZVN0b3JhZ2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3BwCShyZXZpc2lvbiAxODM3Mjgp CisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9y YWdlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjU3LDkgKzY1NywxNSBAQCB2b2lkIFN0b3JhZ2U6 OnN0b3JlKGNvbnN0IFJlY29yZCYgcmVjb3JkCiAgICAgZGlzcGF0Y2hQZW5kaW5nV3JpdGVPcGVy YXRpb25zKCk7CiB9CiAKLXZvaWQgU3RvcmFnZTo6dHJhdmVyc2UoVHJhdmVyc2VGbGFncyBmbGFn cywgc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBSZWNvcmQqLCBjb25zdCBSZWNvcmRJbmZvJik+ JiYgdHJhdmVyc2VIYW5kbGVyKQordm9pZCBTdG9yYWdlOjp0cmF2ZXJzZShUcmF2ZXJzZUZsYWdz IGZsYWdzLCBUcmF2ZXJzZUhhbmRsZXImJiB0cmF2ZXJzZUhhbmRsZXIpCiB7Ci0gICAgaW9RdWV1 ZSgpLmRpc3BhdGNoKFt0aGlzLCBmbGFncywgdHJhdmVyc2VIYW5kbGVyXSB7CisgICAgQVNTRVJU KFJ1bkxvb3A6OmlzTWFpbigpKTsKKyAgICBBU1NFUlQodHJhdmVyc2VIYW5kbGVyKTsKKyAgICAv LyBBdm9pZCBub24tdGhyZWFkIHNhZmUgc3RkOjpmdW5jdGlvbiBjb3BpZXMuCisgICAgYXV0byog dHJhdmVyc2VIYW5kbGVyUHRyID0gbmV3IFRyYXZlcnNlSGFuZGxlcihXVEY6Om1vdmUodHJhdmVy c2VIYW5kbGVyKSk7CisgICAgCisgICAgaW9RdWV1ZSgpLmRpc3BhdGNoKFt0aGlzLCBmbGFncywg dHJhdmVyc2VIYW5kbGVyUHRyXSB7CisgICAgICAgIGF1dG8mIHRyYXZlcnNlSGFuZGxlciA9ICp0 cmF2ZXJzZUhhbmRsZXJQdHI7CiAgICAgICAgIHRyYXZlcnNlQ2FjaGVGaWxlcyhyZWNvcmRzUGF0 aCgpLCBbdGhpcywgZmxhZ3MsICZ0cmF2ZXJzZUhhbmRsZXJdKGNvbnN0IFN0cmluZyYgZmlsZU5h bWUsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uUGF0aCkgewogICAgICAgICAgICAgaWYgKGZpbGVO YW1lLmxlbmd0aCgpICE9IEtleTo6aGFzaFN0cmluZ0xlbmd0aCgpKQogICAgICAgICAgICAgICAg IHJldHVybjsKQEAgLTY4NCw4ICs2OTAsOSBAQCB2b2lkIFN0b3JhZ2U6OnRyYXZlcnNlKFRyYXZl cnNlRmxhZ3MgZmxhCiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSk7CiAgICAgICAg IH0pOwotICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHRyYXZlcnNlSGFu ZGxlcl0gewotICAgICAgICAgICAgdHJhdmVyc2VIYW5kbGVyKG51bGxwdHIsIHsgfSk7CisgICAg ICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgdHJhdmVyc2VIYW5kbGVyUHRyXSB7 CisgICAgICAgICAgICAoKnRyYXZlcnNlSGFuZGxlclB0cikobnVsbHB0ciwgeyB9KTsKKyAgICAg ICAgICAgIGRlbGV0ZSB0cmF2ZXJzZUhhbmRsZXJQdHI7CiAgICAgICAgIH0pOwogICAgIH0pOwog fQpAQCAtNzA4LDcgKzcxNSw3IEBAIHZvaWQgU3RvcmFnZTo6c2V0Q2FwYWNpdHkoc2l6ZV90IGNh cGFjaXQKICAgICBzaHJpbmtJZk5lZWRlZCgpOwogfQogCi12b2lkIFN0b3JhZ2U6OmNsZWFyKCkK K3ZvaWQgU3RvcmFnZTo6Y2xlYXIoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2lu dCBtb2RpZmllZFNpbmNlVGltZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiYmIGNvbXBsZXRpb25I YW5kbGVyKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CiAgICAgTE9HKE5ldHdv cmtDYWNoZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIGNsZWFyaW5nIGNhY2hlIik7CkBAIC03 MTksMTggKzcyNiwzNCBAQCB2b2lkIFN0b3JhZ2U6OmNsZWFyKCkKICAgICAgICAgbV9ib2R5Rmls dGVyLT5jbGVhcigpOwogICAgIG1fYXBwcm94aW1hdGVSZWNvcmRzU2l6ZSA9IDA7CiAKLSAgICBp b1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXNdIHsKKyAgICAvLyBBdm9pZCBub24tdGhyZWFkIHNhZmUg c3RkOjpmdW5jdGlvbiBjb3BpZXMuCisgICAgYXV0byogY29tcGxldGlvbkhhbmRsZXJQdHIgPSBj b21wbGV0aW9uSGFuZGxlciA/IG5ldyBzdGQ6OmZ1bmN0aW9uPHZvaWQgKCk+KFdURjo6bW92ZShj b21wbGV0aW9uSGFuZGxlcikpIDogbnVsbHB0cjsKKworICAgIGlvUXVldWUoKS5kaXNwYXRjaChb dGhpcywgbW9kaWZpZWRTaW5jZVRpbWUsIGNvbXBsZXRpb25IYW5kbGVyUHRyXSB7CiAgICAgICAg IGF1dG8gcmVjb3Jkc1BhdGggPSB0aGlzLT5yZWNvcmRzUGF0aCgpOwotICAgICAgICB0cmF2ZXJz ZURpcmVjdG9yeShyZWNvcmRzUGF0aCwgRFRfRElSLCBbJnJlY29yZHNQYXRoXShjb25zdCBTdHJp bmcmIHN1YmRpck5hbWUpIHsKKyAgICAgICAgdHJhdmVyc2VEaXJlY3RvcnkocmVjb3Jkc1BhdGgs IERUX0RJUiwgWyZyZWNvcmRzUGF0aCwgbW9kaWZpZWRTaW5jZVRpbWVdKGNvbnN0IFN0cmluZyYg c3ViZGlyTmFtZSkgewogICAgICAgICAgICAgU3RyaW5nIHN1YmRpclBhdGggPSBXZWJDb3JlOjpw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQocmVjb3Jkc1BhdGgsIHN1YmRpck5hbWUpOwotICAgICAg ICAgICAgdHJhdmVyc2VEaXJlY3Rvcnkoc3ViZGlyUGF0aCwgRFRfUkVHLCBbJnN1YmRpclBhdGhd KGNvbnN0IFN0cmluZyYgZmlsZU5hbWUpIHsKLSAgICAgICAgICAgICAgICBXZWJDb3JlOjpkZWxl dGVGaWxlKFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChzdWJkaXJQYXRoLCBmaWxl TmFtZSkpOworICAgICAgICAgICAgdHJhdmVyc2VEaXJlY3Rvcnkoc3ViZGlyUGF0aCwgRFRfUkVH LCBbJnN1YmRpclBhdGgsIG1vZGlmaWVkU2luY2VUaW1lXShjb25zdCBTdHJpbmcmIGZpbGVOYW1l KSB7CisgICAgICAgICAgICAgICAgYXV0byBmaWxlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFwcGVu ZGluZ0NvbXBvbmVudChzdWJkaXJQYXRoLCBmaWxlTmFtZSk7CisgICAgICAgICAgICAgICAgaWYg KG1vZGlmaWVkU2luY2VUaW1lID4gc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGltZV9wb2lu dDo6bWluKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgYXV0byB0aW1lcyA9IGZpbGVUaW1lcyhm aWxlUGF0aCk7CisgICAgICAgICAgICAgICAgICAgIGlmICh0aW1lcy5tb2RpZmljYXRpb24gPCBt b2RpZmllZFNpbmNlVGltZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgV2ViQ29yZTo6ZGVsZXRlRmlsZShmaWxlUGF0 aCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIFdlYkNvcmU6OmRlbGV0ZUVtcHR5RGly ZWN0b3J5KHN1YmRpclBhdGgpOwogICAgICAgICB9KTsKIAogICAgICAgICAvLyBUaGlzIGNsZWFu cyB1bnJlZmVyZW5jZXMgYmxvYnMuCiAgICAgICAgIG1fYmxvYlN0b3JhZ2Uuc3luY2hyb25pemUo KTsKKworICAgICAgICBpZiAoY29tcGxldGlvbkhhbmRsZXJQdHIpIHsKKyAgICAgICAgICAgIFJ1 bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbY29tcGxldGlvbkhhbmRsZXJQdHJdIHsKKyAgICAgICAg ICAgICAgICAoKmNvbXBsZXRpb25IYW5kbGVyUHRyKSgpOworICAgICAgICAgICAgICAgIGRlbGV0 ZSBjb21wbGV0aW9uSGFuZGxlclB0cjsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAg fSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgJKHJldmlzaW9uIDE4MzcyOCkKKysrIFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAko d29ya2luZyBjb3B5KQpAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzdG9yZShj b25zdCBSZWNvcmQmLCBNYXBwZWRCb2R5SGFuZGxlciYmKTsKIAogICAgIHZvaWQgcmVtb3ZlKGNv bnN0IEtleSYpOworICAgIHZvaWQgY2xlYXIoc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGlt ZV9wb2ludCBtb2RpZmllZFNpbmNlVGltZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiYmIGNvbXBs ZXRpb25IYW5kbGVyKTsKIAogICAgIHN0cnVjdCBSZWNvcmRJbmZvIHsKICAgICAgICAgc2l6ZV90 IGJvZHlTaXplIHsgMCB9OwpAQCAtNzQsMTIgKzc1LDEyIEBAIHB1YmxpYzoKICAgICAgICAgU2hh cmVDb3VudCA9IDEgPDwgMSwKICAgICB9OwogICAgIHR5cGVkZWYgdW5zaWduZWQgVHJhdmVyc2VG bGFnczsKKyAgICB0eXBlZGVmIHN0ZDo6ZnVuY3Rpb248dm9pZCAoY29uc3QgUmVjb3JkKiwgY29u c3QgUmVjb3JkSW5mbyYpPiBUcmF2ZXJzZUhhbmRsZXI7CiAgICAgLy8gTnVsbCByZWNvcmQgc2ln bmFscyBlbmQuCi0gICAgdm9pZCB0cmF2ZXJzZShUcmF2ZXJzZUZsYWdzLCBzdGQ6OmZ1bmN0aW9u PHZvaWQgKGNvbnN0IFJlY29yZCosIGNvbnN0IFJlY29yZEluZm8mKT4mJik7CisgICAgdm9pZCB0 cmF2ZXJzZShUcmF2ZXJzZUZsYWdzLCBUcmF2ZXJzZUhhbmRsZXImJik7CiAKICAgICB2b2lkIHNl dENhcGFjaXR5KHNpemVfdCk7CiAgICAgc2l6ZV90IGFwcHJveGltYXRlU2l6ZSgpIGNvbnN0Owot ICAgIHZvaWQgY2xlYXIoKTsKIAogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCB2ZXJzaW9uID0g MzsKIApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1By b2Nlc3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCShyZXZpc2lvbiAxODM3MjgpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0xMzQsMTYgKzEzNCw5IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBs YXRmb3JtU2V0Q2FjaGVNb2QKICAgICAgICAgW25zdXJsQ2FjaGUgc2V0RGlza0NhcGFjaXR5OnN0 ZDo6bWF4PHVuc2lnbmVkIGxvbmc+KHVybENhY2hlRGlza0NhcGFjaXR5LCBbbnN1cmxDYWNoZSBk aXNrQ2FwYWNpdHldKV07IC8vIERvbid0IHNocmluayBhIGJpZyBkaXNrIGNhY2hlLCBzaW5jZSB0 aGF0IHdvdWxkIGNhdXNlIGNodXJuLgogfQogCi12b2lkIE5ldHdvcmtQcm9jZXNzOjpjbGVhckRp c2tDYWNoZShzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2lu Y2UsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoKT4gY29tcGxldGlvbkhhbmRsZXIpCitzdGF0aWMgdm9p ZCBjbGVhck5TVVJDYWNoZShkaXNwYXRjaF9ncm91cF90IGdyb3VwLCBzdGQ6OmNocm9ubzo6c3lz dGVtX2Nsb2NrOjp0aW1lX3BvaW50IG1vZGlmaWVkU2luY2UsIGNvbnN0IHN0ZDo6ZnVuY3Rpb248 dm9pZCAoKT4mIGNvbXBsZXRpb25IYW5kbGVyKQogewotI2lmIEVOQUJMRShORVRXT1JLX0NBQ0hF KQotICAgIE5ldHdvcmtDYWNoZTo6c2luZ2xldG9uKCkuY2xlYXIoKTsKLSNlbmRpZgotCi0gICAg aWYgKCFtX2NsZWFyQ2FjaGVEaXNwYXRjaEdyb3VwKQotICAgICAgICBtX2NsZWFyQ2FjaGVEaXNw YXRjaEdyb3VwID0gZGlzcGF0Y2hfZ3JvdXBfY3JlYXRlKCk7Ci0KLSAgICBkaXNwYXRjaF9ncm91 cF9hc3luYyhtX2NsZWFyQ2FjaGVEaXNwYXRjaEdyb3VwLCBkaXNwYXRjaF9nZXRfZ2xvYmFsX3F1 ZXVlKERJU1BBVENIX1FVRVVFX1BSSU9SSVRZX0RFRkFVTFQsIDApLCBbbW9kaWZpZWRTaW5jZSwg Y29tcGxldGlvbkhhbmRsZXJdIHsKKyAgICBkaXNwYXRjaF9ncm91cF9hc3luYyhncm91cCwgZGlz cGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9RVUVVRV9QUklPUklUWV9ERUZBVUxULCAw KSwgW21vZGlmaWVkU2luY2UsIGNvbXBsZXRpb25IYW5kbGVyXSB7CiAgICAgICAgIE5TVVJMQ2Fj aGUgKmNhY2hlID0gW05TVVJMQ2FjaGUgc2hhcmVkVVJMQ2FjaGVdOwogCiAjaWYgUExBVEZPUk0o SU9TKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMApAQCAtMTU5 LDYgKzE1MiwyMyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzOjpjbGVhckRpc2tDYWNoZShzdGQ6CiAg ICAgfSk7CiB9CiAKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OmNsZWFyRGlza0NhY2hlKHN0ZDo6Y2hy b25vOjpzeXN0ZW1fY2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpmdW5jdGlv bjx2b2lkICgpPiBjb21wbGV0aW9uSGFuZGxlcikKK3sKKyAgICBpZiAoIW1fY2xlYXJDYWNoZURp c3BhdGNoR3JvdXApCisgICAgICAgIG1fY2xlYXJDYWNoZURpc3BhdGNoR3JvdXAgPSBkaXNwYXRj aF9ncm91cF9jcmVhdGUoKTsKKyNpZiBFTkFCTEUoTkVUV09SS19DQUNIRSkKKyAgICBhdXRvIGdy b3VwID0gbV9jbGVhckNhY2hlRGlzcGF0Y2hHcm91cDsKKyAgICBkaXNwYXRjaF9ncm91cF9hc3lu Yyhncm91cCwgZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgW2dyb3VwLCBtb2RpZmllZFNpbmNl LCBjb21wbGV0aW9uSGFuZGxlcl0geworICAgICAgICBOZXR3b3JrQ2FjaGU6OnNpbmdsZXRvbigp LmNsZWFyKG1vZGlmaWVkU2luY2UsIFtncm91cCwgbW9kaWZpZWRTaW5jZSwgY29tcGxldGlvbkhh bmRsZXJdIHsKKyAgICAgICAgICAgIC8vIEZJWE1FOiBQcm9iYWJseSBub3QgbmVjZXNzYXJ5Lgor ICAgICAgICAgICAgY2xlYXJOU1VSQ2FjaGUoZ3JvdXAsIG1vZGlmaWVkU2luY2UsIGNvbXBsZXRp b25IYW5kbGVyKTsKKyAgICAgICAgfSk7CisgICAgfSk7CisjZWxzZQorICAgIGNsZWFyTlNVUkNh Y2hlKG1fY2xlYXJDYWNoZURpc3BhdGNoR3JvdXAsIG1vZGlmaWVkU2luY2UsIGNvbXBsZXRpb25I YW5kbGVyKTsKKyNlbmRpZgorfQorCiB9CiAKICNlbmRpZgo=