143202 2015-03-29 17:00:59 -0700 Include cache entry worth to json dump 2015-03-29 17:14:06 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified NEW P2 Normal --- 1 koivisto webkit-unassigned commit-queue oldest_to_newest 1081064 0 koivisto 2015-03-29 17:00:59 -0700 Useful for analyzing cache performance. 1081066 1 249703 koivisto 2015-03-29 17:11:23 -0700 Created attachment 249703 patch 1081068 2 commit-queue 2015-03-29 17:13:42 -0700 Attachment 249703 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp:430: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h:75: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1081069 3 249703 darin 2015-03-29 17:14:06 -0700 Comment on attachment 249703 patch View in context: https://bugs.webkit.org/attachment.cgi?id=249703&action=review > Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp:154 > + json.append(String::format("\"bodySize\": %zu,\n", info.bodySize)); > + json.append(String::format("\"worth\": %f,\n", info.worth)); I think it’s better to use appendNumber than String::format for putting numbers into a StringBuilder. 249703 2015-03-29 17:11:23 -0700 2015-03-29 17:14:06 -0700 patch disk-cache-info.patch text/plain 10527 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MjEyNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE1LTAzLTI5ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBJbmNsdWRlIGNhY2hlIGVudHJ5 IHdvcnRoIHRvIGpzb24gZHVtcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTQzMjAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyB1c2VmdWwgZm9yIGFuYWx5emluZyBjYWNoZSBwZXJmb3JtYW5j ZS4KKyAgICAgICAgQWxzbyBpbmN1ZGUgdGhlIGJvZHkgc2l6ZSwgdG90YWwgaXRlbSBjb3VudCBh bmQgYXZlcmFnZSB3b3J0aC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6Q2FjaGU6OnRyYXZl cnNlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpDYWNoZTo6ZHVtcENvbnRlbnRz VG9GaWxlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVFbnRy eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6RW50cnk6OmFzSlNPTik6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuaDoKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjp0cmF2ZXJzZSk6CisKKyAgICAgICAg ICAgIEFkZCBmbGFncyBmb3Igc3BlY2lmaWN5aW5nIHdoYXQgc29ydCBvZiBpbmZvcm1hdGlvbiBp cyBuZWVkZWQuCisKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpjb21wdXRlUmVjb3Jk V29ydGgpOgorCisgICAgICAgICAgICBGYWN0b3IgdG8gYSBmdW5jdGlvbi4KKworICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OmRlbGV0aW9uUHJvYmFiaWxpdHkpOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaDoKKwogMjAxNS0wMy0yOSAg QW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgVXNlIHN0X210aW1l IGluc3RlYWQgb2Ygc3RfYXRpbWUgdG8gdHJhY2sgZmlsZSBhY2Nlc3MgdGltZQpJbmRleDogU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu Y3BwCShyZXZpc2lvbiAxODIxMTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MTAsNyArNDEwLDcgQEAg dm9pZCBDYWNoZTo6dHJhdmVyc2Uoc3RkOjpmdW5jdGlvbjx2b2lkIAogewogICAgIEFTU0VSVChp c0VuYWJsZWQoKSk7CiAKLSAgICBtX3N0b3JhZ2UtPnRyYXZlcnNlKFt0cmF2ZXJzZUhhbmRsZXJd KGNvbnN0IFN0b3JhZ2U6OlJlY29yZCogcmVjb3JkKSB7CisgICAgbV9zdG9yYWdlLT50cmF2ZXJz ZSgwLCBbdHJhdmVyc2VIYW5kbGVyXShjb25zdCBTdG9yYWdlOjpSZWNvcmQqIHJlY29yZCwgY29u c3QgU3RvcmFnZTo6UmVjb3JkSW5mbyYpIHsKICAgICAgICAgaWYgKCFyZWNvcmQpIHsKICAgICAg ICAgICAgIHRyYXZlcnNlSGFuZGxlcihudWxscHRyKTsKICAgICAgICAgICAgIHJldHVybjsKQEAg LTQzMywyNSArNDMzLDM2IEBAIHZvaWQgQ2FjaGU6OmR1bXBDb250ZW50c1RvRmlsZSgpCiB7CiAg ICAgaWYgKCFtX3N0b3JhZ2UpCiAgICAgICAgIHJldHVybjsKLSAgICBhdXRvIGR1bXBGaWxlSGFu ZGxlID0gV2ViQ29yZTo6b3BlbkZpbGUoZHVtcEZpbGVQYXRoKCksIFdlYkNvcmU6Ok9wZW5Gb3JX cml0ZSk7Ci0gICAgaWYgKCFkdW1wRmlsZUhhbmRsZSkKKyAgICBhdXRvIGZkID0gV2ViQ29yZTo6 b3BlbkZpbGUoZHVtcEZpbGVQYXRoKCksIFdlYkNvcmU6Ok9wZW5Gb3JXcml0ZSk7CisgICAgaWYg KCFmZCkKICAgICAgICAgcmV0dXJuOwotICAgIFdlYkNvcmU6OndyaXRlVG9GaWxlKGR1bXBGaWxl SGFuZGxlLCAiW1xuIiwgMik7Ci0gICAgbV9zdG9yYWdlLT50cmF2ZXJzZShbZHVtcEZpbGVIYW5k bGVdKGNvbnN0IFN0b3JhZ2U6OlJlY29yZCogcmVjb3JkKSB7CisgICAgYXV0byBwcm9sb2d1ZSA9 IFN0cmluZygie1xuXCJlbnRyaWVzXCI6IFtcbiIpLnV0ZjgoKTsKKyAgICBXZWJDb3JlOjp3cml0 ZVRvRmlsZShmZCwgcHJvbG9ndWUuZGF0YSgpLCBwcm9sb2d1ZS5sZW5ndGgoKSk7CisgICAgdW5z aWduZWQgY291bnQgPSAwOworICAgIGRvdWJsZSB0b3RhbFdvcnRoID0gMDsKKyAgICBtX3N0b3Jh Z2UtPnRyYXZlcnNlKFN0b3JhZ2U6OlRyYXZlcnNlRmxhZzo6Q29tcHV0ZVdvcnRoLCBbZmQsIGNv dW50LCB0b3RhbFdvcnRoXShjb25zdCBTdG9yYWdlOjpSZWNvcmQqIHJlY29yZCwgY29uc3QgU3Rv cmFnZTo6UmVjb3JkSW5mbyYgaW5mbykgbXV0YWJsZSB7CiAgICAgICAgIGlmICghcmVjb3JkKSB7 Ci0gICAgICAgICAgICBXZWJDb3JlOjp3cml0ZVRvRmlsZShkdW1wRmlsZUhhbmRsZSwgInt9XG5d XG4iLCA1KTsKLSAgICAgICAgICAgIGF1dG8gaGFuZGxlID0gZHVtcEZpbGVIYW5kbGU7Ci0gICAg ICAgICAgICBXZWJDb3JlOjpjbG9zZUZpbGUoaGFuZGxlKTsKKyAgICAgICAgICAgIFN0cmluZ0J1 aWxkZXIgZXBpbG9ndWU7CisgICAgICAgICAgICBlcGlsb2d1ZS5hcHBlbmRMaXRlcmFsKCJ7fVxu XSxcbiIpOworICAgICAgICAgICAgZXBpbG9ndWUuYXBwZW5kTGl0ZXJhbCgiXCJ0b3RhbHNcIjog e1xuIik7CisgICAgICAgICAgICBlcGlsb2d1ZS5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIlwiY291 bnRcIjogJWQsXG4iLCBjb3VudCkpOworICAgICAgICAgICAgZXBpbG9ndWUuYXBwZW5kKFN0cmlu Zzo6Zm9ybWF0KCJcImF2ZXJhZ2VXb3J0aFwiOiAlZlxuIiwgY291bnQgPyB0b3RhbFdvcnRoIC8g Y291bnQgOiAwKSk7CisgICAgICAgICAgICBlcGlsb2d1ZS5hcHBlbmRMaXRlcmFsKCJ9XG59XG4i KTsKKyAgICAgICAgICAgIGF1dG8gd3JpdGVEYXRhID0gZXBpbG9ndWUudG9TdHJpbmcoKS51dGY4 KCk7CisgICAgICAgICAgICBXZWJDb3JlOjp3cml0ZVRvRmlsZShmZCwgd3JpdGVEYXRhLmRhdGEo KSwgd3JpdGVEYXRhLmxlbmd0aCgpKTsKKyAgICAgICAgICAgIFdlYkNvcmU6OmNsb3NlRmlsZShm ZCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgYXV0byBlbnRyeSA9 IEVudHJ5OjpkZWNvZGVTdG9yYWdlUmVjb3JkKCpyZWNvcmQpOwogICAgICAgICBpZiAoIWVudHJ5 KQogICAgICAgICAgICAgcmV0dXJuOworICAgICAgICArK2NvdW50OworICAgICAgICB0b3RhbFdv cnRoICs9IGluZm8ud29ydGg7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIganNvbjsKLSAgICAgICAg ZW50cnktPmFzSlNPTihqc29uKTsKLSAgICAgICAganNvbi5hcHBlbmQoIixcbiIpOworICAgICAg ICBlbnRyeS0+YXNKU09OKGpzb24sIGluZm8pOworICAgICAgICBqc29uLmFwcGVuZExpdGVyYWwo IixcbiIpOwogICAgICAgICBhdXRvIHdyaXRlRGF0YSA9IGpzb24udG9TdHJpbmcoKS51dGY4KCk7 Ci0gICAgICAgIFdlYkNvcmU6OndyaXRlVG9GaWxlKGR1bXBGaWxlSGFuZGxlLCB3cml0ZURhdGEu ZGF0YSgpLCB3cml0ZURhdGEubGVuZ3RoKCkpOworICAgICAgICBXZWJDb3JlOjp3cml0ZVRvRmls ZShmZCwgd3JpdGVEYXRhLmRhdGEoKSwgd3JpdGVEYXRhLmxlbmd0aCgpKTsKICAgICB9KTsKIH0K IApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl RW50cnkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZUVudHJ5LmNwcAkocmV2aXNpb24gMTgyMTE0KQorKysgU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlRW50cnkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNDQsMTIgKzE0NCwxNCBAQCB2b2lkIEVudHJ5OjpzZXROZWVkc1ZhbGlkYXRp b24oKQogICAgIG1fcmVzcG9uc2Uuc2V0U291cmNlKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6 OlNvdXJjZTo6RGlza0NhY2hlQWZ0ZXJWYWxpZGF0aW9uKTsKIH0KIAotdm9pZCBFbnRyeTo6YXNK U09OKFN0cmluZ0J1aWxkZXImIGpzb24pIGNvbnN0Cit2b2lkIEVudHJ5Ojphc0pTT04oU3RyaW5n QnVpbGRlciYganNvbiwgY29uc3QgU3RvcmFnZTo6UmVjb3JkSW5mbyYgaW5mbykgY29uc3QKIHsK ICAgICBqc29uLmFwcGVuZExpdGVyYWwoIntcbiIpOwogICAgIGpzb24uYXBwZW5kTGl0ZXJhbCgi XCJoYXNoXCI6ICIpOwogICAgIEpTQzo6YXBwZW5kUXVvdGVkSlNPTlN0cmluZ1RvQnVpbGRlcihq c29uLCBtX2tleS5oYXNoQXNTdHJpbmcoKSk7CiAgICAganNvbi5hcHBlbmRMaXRlcmFsKCIsXG4i KTsKKyAgICBqc29uLmFwcGVuZChTdHJpbmc6OmZvcm1hdCgiXCJib2R5U2l6ZVwiOiAlenUsXG4i LCBpbmZvLmJvZHlTaXplKSk7CisgICAganNvbi5hcHBlbmQoU3RyaW5nOjpmb3JtYXQoIlwid29y dGhcIjogJWYsXG4iLCBpbmZvLndvcnRoKSk7CiAgICAganNvbi5hcHBlbmRMaXRlcmFsKCJcInBh cnRpdGlvblwiOiAiKTsKICAgICBKU0M6OmFwcGVuZFF1b3RlZEpTT05TdHJpbmdUb0J1aWxkZXIo anNvbiwgbV9rZXkucGFydGl0aW9uKCkpOwogICAgIGpzb24uYXBwZW5kTGl0ZXJhbCgiLFxuIik7 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVF bnRyeS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZUVudHJ5LmgJKHJldmlzaW9uIDE4MjExNCkKKysrIFNvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZUVudHJ5LmgJKHdvcmtpbmcgY29weSkK QEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogCiAgICAgY29uc3QgU3RvcmFnZTo6UmVjb3JkJiBz b3VyY2VTdG9yYWdlUmVjb3JkKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VTdG9yYWdlUmVjb3Jk OyB9CiAKLSAgICB2b2lkIGFzSlNPTihTdHJpbmdCdWlsZGVyJikgY29uc3Q7CisgICAgdm9pZCBh c0pTT04oU3RyaW5nQnVpbGRlciYsIGNvbnN0IFN0b3JhZ2U6OlJlY29yZEluZm8mKSBjb25zdDsK IAogcHJpdmF0ZToKICAgICBFbnRyeShjb25zdCBTdG9yYWdlOjpSZWNvcmQmKTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2UuY3BwCShyZXZpc2lvbiAxODIxMjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNDQsNiArNDQsOCBAQCBuYW1lc3BhY2UgTmV0d29ya0NhY2hlIHsKIHN0YXRpYyBjb25z dCBjaGFyIG5ldHdvcmtDYWNoZVN1YmRpcmVjdG9yeVtdID0gIldlYktpdENhY2hlIjsKIHN0YXRp YyBjb25zdCBjaGFyIHZlcnNpb25EaXJlY3RvcnlQcmVmaXhbXSA9ICJWZXJzaW9uICI7CiAKK3N0 YXRpYyBkb3VibGUgY29tcHV0ZVJlY29yZFdvcnRoKEZpbGVUaW1lcyk7CisKIHN0ZDo6dW5pcXVl X3B0cjxTdG9yYWdlPiBTdG9yYWdlOjpvcGVuKGNvbnN0IFN0cmluZyYgY2FjaGVQYXRoKQogewog ICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CkBAIC00MjUsMjcgKzQyNywzMyBAQCB2b2lk IFN0b3JhZ2U6OnVwZGF0ZShjb25zdCBSZWNvcmQmIHVwZGF0CiAgICAgZGlzcGF0Y2hQZW5kaW5n V3JpdGVPcGVyYXRpb25zKCk7CiB9CiAKLXZvaWQgU3RvcmFnZTo6dHJhdmVyc2Uoc3RkOjpmdW5j dGlvbjx2b2lkIChjb25zdCBSZWNvcmQqKT4mJiB0cmF2ZXJzZUhhbmRsZXIpCit2b2lkIFN0b3Jh Z2U6OnRyYXZlcnNlKFRyYXZlcnNlRmxhZ3MgZmxhZ3MsIHN0ZDo6ZnVuY3Rpb248dm9pZCAoY29u c3QgUmVjb3JkKiwgY29uc3QgUmVjb3JkSW5mbyYpPiYmIHRyYXZlcnNlSGFuZGxlcikKIHsKICAg ICBTdHJpbmdDYXB0dXJlIGNhY2hlUGF0aENhcHR1cmUobV9kaXJlY3RvcnlQYXRoKTsKLSAgICBp b1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMsIGNhY2hlUGF0aENhcHR1cmUsIHRyYXZlcnNlSGFuZGxl cl0geworICAgIGlvUXVldWUoKS5kaXNwYXRjaChbdGhpcywgZmxhZ3MsIGNhY2hlUGF0aENhcHR1 cmUsIHRyYXZlcnNlSGFuZGxlcl0gewogICAgICAgICBTdHJpbmcgY2FjaGVQYXRoID0gY2FjaGVQ YXRoQ2FwdHVyZS5zdHJpbmcoKTsKLSAgICAgICAgdHJhdmVyc2VDYWNoZUZpbGVzKGNhY2hlUGF0 aCwgW3RoaXMsICZ0cmF2ZXJzZUhhbmRsZXJdKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0 IFN0cmluZyYgcGFydGl0aW9uUGF0aCkgeworICAgICAgICB0cmF2ZXJzZUNhY2hlRmlsZXMoY2Fj aGVQYXRoLCBbdGhpcywgZmxhZ3MsICZ0cmF2ZXJzZUhhbmRsZXJdKGNvbnN0IFN0cmluZyYgZmls ZU5hbWUsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uUGF0aCkgewogICAgICAgICAgICAgYXV0byBm aWxlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChwYXJ0aXRpb25QYXRo LCBmaWxlTmFtZSk7CisKKyAgICAgICAgICAgIFJlY29yZEluZm8gaW5mbzsKKyAgICAgICAgICAg IGlmIChmbGFncyAmIFRyYXZlcnNlRmxhZzo6Q29tcHV0ZVdvcnRoKQorICAgICAgICAgICAgICAg IGluZm8ud29ydGggPSBjb21wdXRlUmVjb3JkV29ydGgoZmlsZVRpbWVzKGZpbGVQYXRoKSk7CisK ICAgICAgICAgICAgIGF1dG8gY2hhbm5lbCA9IElPQ2hhbm5lbDo6b3BlbihmaWxlUGF0aCwgSU9D aGFubmVsOjpUeXBlOjpSZWFkKTsKICAgICAgICAgICAgIGNvbnN0IHNpemVfdCBoZWFkZXJSZWFk U2l6ZSA9IDE2IDw8IDEwOwogICAgICAgICAgICAgLy8gRklYTUU6IFRyYXZlcnNhbCBpcyBzbG93 ZXIgdGhhbiBpdCBzaG91bGQgYmUgZHVlIHRvIGxhY2sgb2YgcGFyYWxsZWxpc20uCi0gICAgICAg ICAgICBjaGFubmVsLT5yZWFkU3luYygwLCBoZWFkZXJSZWFkU2l6ZSwgW3RoaXMsICZ0cmF2ZXJz ZUhhbmRsZXJdKERhdGEmIGZpbGVEYXRhLCBpbnQpIHsKKyAgICAgICAgICAgIGNoYW5uZWwtPnJl YWRTeW5jKDAsIGhlYWRlclJlYWRTaXplLCBbdGhpcywgJnRyYXZlcnNlSGFuZGxlciwgJmluZm9d KERhdGEmIGZpbGVEYXRhLCBpbnQpIHsKICAgICAgICAgICAgICAgICBSZWNvcmRNZXRhRGF0YSBt ZXRhRGF0YTsKICAgICAgICAgICAgICAgICBEYXRhIGhlYWRlckRhdGE7CiAgICAgICAgICAgICAg ICAgaWYgKGRlY29kZVJlY29yZEhlYWRlcihmaWxlRGF0YSwgbWV0YURhdGEsIGhlYWRlckRhdGEp KSB7CiAgICAgICAgICAgICAgICAgICAgIFJlY29yZCByZWNvcmQgeyBtZXRhRGF0YS5rZXksIG1l dGFEYXRhLnRpbWVTdGFtcCwgaGVhZGVyRGF0YSwgeyB9IH07Ci0gICAgICAgICAgICAgICAgICAg IHRyYXZlcnNlSGFuZGxlcigmcmVjb3JkKTsKKyAgICAgICAgICAgICAgICAgICAgaW5mby5ib2R5 U2l6ZSA9IG1ldGFEYXRhLmJvZHlTaXplOworICAgICAgICAgICAgICAgICAgICB0cmF2ZXJzZUhh bmRsZXIoJnJlY29yZCwgaW5mbyk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfSk7 CiAgICAgICAgIH0pOwogICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3RoaXMsIHRy YXZlcnNlSGFuZGxlcl0gewotICAgICAgICAgICAgdHJhdmVyc2VIYW5kbGVyKG51bGxwdHIpOwor ICAgICAgICAgICAgdHJhdmVyc2VIYW5kbGVyKG51bGxwdHIsIHsgfSk7CiAgICAgICAgIH0pOwog ICAgIH0pOwogfQpAQCAtNTgzLDEwICs1OTEsOCBAQCB2b2lkIFN0b3JhZ2U6OmNsZWFyKCkKICAg ICB9KTsKIH0KIAotc3RhdGljIGRvdWJsZSBkZWxldGlvblByb2JhYmlsaXR5KEZpbGVUaW1lcyB0 aW1lcykKK3N0YXRpYyBkb3VibGUgY29tcHV0ZVJlY29yZFdvcnRoKEZpbGVUaW1lcyB0aW1lcykK IHsKLSAgICBzdGF0aWMgY29uc3QgZG91YmxlIG1heGltdW1Qcm9iYWJpbGl0eSB7IDAuMzMgfTsK LQogICAgIHVzaW5nIG5hbWVzcGFjZSBzdGQ6OmNocm9ubzsKICAgICBhdXRvIGFnZSA9IHN5c3Rl bV9jbG9jazo6bm93KCkgLSB0aW1lcy5jcmVhdGlvbjsKICAgICAvLyBGaWxlIG1vZGlmaWNhdGlv biB0aW1lIGlzIHVwZGF0ZWQgbWFudWFsbHkgb24gY2FjaGUgcmVhZC4gV2UgZG9uJ3QgdXNlIGFj Y2VzcyB0aW1lIHNpbmNlIE9TIG1heSB1cGRhdGUgaXQgYXV0b21hdGljYWxseS4KQEAgLTU5NCwx NSArNjAwLDIzIEBAIHN0YXRpYyBkb3VibGUgZGVsZXRpb25Qcm9iYWJpbGl0eShGaWxlVGkKIAog ICAgIC8vIEZvciBzYW5pdHkuCiAgICAgaWYgKGFnZSA8PSBzZWNvbmRzOjp6ZXJvKCkgfHwgYWNj ZXNzQWdlIDwgc2Vjb25kczo6emVybygpIHx8IGFjY2Vzc0FnZSA+IGFnZSkKLSAgICAgICAgcmV0 dXJuIG1heGltdW1Qcm9iYWJpbGl0eTsKKyAgICAgICAgcmV0dXJuIDE7CiAKICAgICAvLyBXZSBs aWtlIG9sZCBlbnRyaWVzIHRoYXQgaGF2ZSBiZWVuIGFjY2Vzc2VkIHJlY2VudGx5LgotICAgIGF1 dG8gcmVsYXRpdmVWYWx1ZSA9IGR1cmF0aW9uPGRvdWJsZT4oYWNjZXNzQWdlKSAvIGFnZTsKKyAg ICByZXR1cm4gZHVyYXRpb248ZG91YmxlPihhY2Nlc3NBZ2UpIC8gYWdlOworfQorCisKK3N0YXRp YyBkb3VibGUgZGVsZXRpb25Qcm9iYWJpbGl0eShGaWxlVGltZXMgdGltZXMpCit7CisgICAgc3Rh dGljIGNvbnN0IGRvdWJsZSBtYXhpbXVtUHJvYmFiaWxpdHkgeyAwLjMzIH07CisKKyAgICBhdXRv IHdvcnRoID0gY29tcHV0ZVJlY29yZFdvcnRoKHRpbWVzKTsKIAogICAgIC8vIEFkanVzdCBhIGJp dCBzbyB0aGUgbW9zdCB2YWx1YWJsZSBlbnRyaWVzIGRvbid0IGdldCBkZWxldGVkIGF0IGFsbC4K LSAgICBhdXRvIGVmZmVjdGl2ZVZhbHVlID0gc3RkOjptaW4oMS4xICogcmVsYXRpdmVWYWx1ZSwg MS4pOworICAgIGF1dG8gZWZmZWN0aXZlV29ydGggPSBzdGQ6Om1pbigxLjEgKiB3b3J0aCwgMS4p OwogCi0gICAgcmV0dXJuICgxIC0gZWZmZWN0aXZlVmFsdWUpICogbWF4aW11bVByb2JhYmlsaXR5 OworICAgIHJldHVybiAoMSAtIGVmZmVjdGl2ZVdvcnRoKSAqIG1heGltdW1Qcm9iYWJpbGl0eTsK IH0KIAogdm9pZCBTdG9yYWdlOjpzaHJpbmtJZk5lZWRlZCgpCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFn ZS5oCShyZXZpc2lvbiAxODIxMjQpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9j YWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDggKzYzLDE2 IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVtb3ZlKGNvbnN0IEtleSYpOwogCi0gICAgLy8gTnVs bCBlbnRyeSBzaWduYWxzIGVuZC4KLSAgICB2b2lkIHRyYXZlcnNlKHN0ZDo6ZnVuY3Rpb248dm9p ZCAoY29uc3QgUmVjb3JkKik+JiYpOworICAgIHN0cnVjdCBSZWNvcmRJbmZvIHsKKyAgICAgICAg c2l6ZV90IGJvZHlTaXplIHsgMCB9OworICAgICAgICBkb3VibGUgd29ydGggeyAtMSB9OyAvLyAw LTEgd2hlcmUgMSBpcyB0aGUgbW9zdCB2YWx1YWJsZS4KKyAgICB9OworICAgIGVudW0gVHJhdmVy c2VGbGFnIHsKKyAgICAgICAgQ29tcHV0ZVdvcnRoID0gMSA8PCAwLAorICAgIH07CisgICAgdHlw ZWRlZiB1bnNpZ25lZCBUcmF2ZXJzZUZsYWdzOworICAgIC8vIE51bGwgcmVjb3JkIHNpZ25hbHMg ZW5kLgorICAgIHZvaWQgdHJhdmVyc2UoVHJhdmVyc2VGbGFncywgc3RkOjpmdW5jdGlvbjx2b2lk IChjb25zdCBSZWNvcmQqLCBjb25zdCBSZWNvcmRJbmZvJik+JiYpOwogCiAgICAgdm9pZCBzZXRN YXhpbXVtU2l6ZShzaXplX3QpOwogICAgIHZvaWQgY2xlYXIoKTsK