222555 2021-03-01 08:44:45 -0800 Use PriorityQueue in NetworkCache::Storage 2021-03-02 07:33:43 -0800 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned beidson cdumez cgarcia ews-watchlist ggaren keith_miller webkit-bug-importer oldest_to_newest 1734434 0 koivisto 2021-03-01 08:44:45 -0800 Instead of Vector<Deque<>>. 1734442 1 421832 koivisto 2021-03-01 09:05:27 -0800 Created attachment 421832 patch 1734448 2 421832 keith_miller 2021-03-01 09:29:55 -0800 Comment on attachment 421832 patch View in context: https://bugs.webkit.org/attachment.cgi?id=421832&action=review Overall, looks good to me. Glad someone else is using the PriorityQueue! > Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp:797 > + size_t pendingCount = m_pendingReadOperations.size(); I think you need an UNUSED_PARAM here. 1734470 3 421840 koivisto 2021-03-01 09:53:49 -0800 Created attachment 421840 patch 1734475 4 421840 cdumez 2021-03-01 10:00:57 -0800 Comment on attachment 421840 patch View in context: https://bugs.webkit.org/attachment.cgi?id=421840&action=review r=me > Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp:61 > + static uint64_t ordinal; I had to look up ordinal in a dictionary but it holds up :) > Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h:187 > + PriorityQueue<std::unique_ptr<ReadOperation>, &isHigherPriority> m_pendingReadOperations; We may be able to use UniqueRef instead of unique_ptr? 1734479 5 koivisto 2021-03-01 10:16:19 -0800 > We may be able to use UniqueRef instead of unique_ptr? Probably better done in a separate cleanup that fixes other cases here too. 1734523 6 ews-feeder 2021-03-01 11:50:29 -0800 Committed r273670: <https://commits.webkit.org/r273670> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421840. 1734524 7 webkit-bug-importer 2021-03-01 11:51:15 -0800 <rdar://problem/74882108> 1734589 8 421840 ap 2021-03-01 13:41:18 -0800 Comment on attachment 421840 patch View in context: https://bugs.webkit.org/attachment.cgi?id=421840&action=review >> Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp:61 >> + static uint64_t ordinal; > > I had to look up ordinal in a dictionary but it holds up :) Maybe ASSERT(isMainThread()) or whatever thread this is supposed to be on here? Seems like no reason not to. 1734838 9 koivisto 2021-03-02 07:33:43 -0800 > Maybe ASSERT(isMainThread()) or whatever thread this is supposed to be on > here? Seems like no reason not to. Good idea! 421832 2021-03-01 09:05:27 -0800 2021-03-01 09:53:49 -0800 patch cache-storage-priority-queue.patch text/plain 6756 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzUxMTcyYjM4ZDUzLi5lNmU3NTJkYTQxNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjAgQEAKKzIwMjEtMDMtMDEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgor CisgICAgICAgIFVzZSBQcmlvcml0eVF1ZXVlIGluIE5ldHdvcmtDYWNoZTo6U3RvcmFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBWZWN0 b3I8RGVxdWU8Pj4gd2l0aCBhIG1vcmUgZmxleGlibGUsIHNpbXBsZXIgdG8gdXNlIGRhdGEgc3Ry dWN0dXJlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6UmVhZE9w ZXJhdGlvbjo6UmVhZE9wZXJhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RvcmFnZTo6aXNIaWdoZXJQcmlvcml0eSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6U3RvcmFnZTo6Y2FuY2VsQWxsUmVhZE9wZXJhdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1JlYWRPcGVyYXRpb25zKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpyZXRyaWV2ZSk6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oOgorCiAyMDIxLTAy LTI2ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dQRV1bR1RLXSBCb2d1cyBSZXNwb25zZS57c3RhdHVzLG9rfSBmb3Igc3VjY2Vzc2Z1bCBm ZXRjaCgpIHJlcXVlc3RzIHRvIGEgY3VzdG9tIFVSSSBzY2hlbWUgaGFuZGxlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5jcHAKaW5kZXggZDMxOTlkYjY3NThjLi40ZDc1NDZjOGU4ZGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9y YWdlLmNwcApAQCAtNTYsMTIgKzU2LDIwIEBAIHN0YXRpYyBpbmxpbmUgc2l6ZV90IG1heGltdW1J bmxpbmVCb2R5U2l6ZSgpCiAKIHN0YXRpYyBkb3VibGUgY29tcHV0ZVJlY29yZFdvcnRoKEZpbGVU aW1lcyk7CiAKK3N0YXRpYyB1aW50NjRfdCBuZXh0UmVhZE9wZXJhdGlvbk9yZGluYWwoKQorewor ICAgIHN0YXRpYyB1aW50NjRfdCBvcmRpbmFsOworICAgIHJldHVybiArK29yZGluYWw7Cit9CisK IHN0cnVjdCBTdG9yYWdlOjpSZWFkT3BlcmF0aW9uIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9D QVRFRDsKIHB1YmxpYzoKLSAgICBSZWFkT3BlcmF0aW9uKFN0b3JhZ2UmIHN0b3JhZ2UsIGNvbnN0 IEtleSYga2V5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIp CisgICAgUmVhZE9wZXJhdGlvbihTdG9yYWdlJiBzdG9yYWdlLCBjb25zdCBLZXkmIGtleSwgdW5z aWduZWQgcHJpb3JpdHksIFJldHJpZXZlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFu ZGxlcikKICAgICAgICAgOiBzdG9yYWdlKHN0b3JhZ2UpCiAgICAgICAgICwga2V5KGtleSkKKyAg ICAgICAgLCBvcmRpbmFsKG5leHRSZWFkT3BlcmF0aW9uT3JkaW5hbCgpKQorICAgICAgICAsIHBy aW9yaXR5KHByaW9yaXR5KQogICAgICAgICAsIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpKQogICAgIHsgfQogCkBAIC03MSw2ICs3OSw4IEBAIHB1YmxpYzoKICAg ICBSZWY8U3RvcmFnZT4gc3RvcmFnZTsKIAogICAgIGNvbnN0IEtleSBrZXk7CisgICAgY29uc3Qg dWludDY0X3Qgb3JkaW5hbDsKKyAgICB1bnNpZ25lZCBwcmlvcml0eTsKICAgICBSZXRyaWV2ZUNv bXBsZXRpb25IYW5kbGVyIGNvbXBsZXRpb25IYW5kbGVyOwogICAgIAogICAgIHN0ZDo6dW5pcXVl X3B0cjxSZWNvcmQ+IHJlc3VsdFJlY29yZDsKQEAgLTgxLDYgKzkxLDEzIEBAIHB1YmxpYzoKICAg ICBUaW1pbmdzIHRpbWluZ3M7CiB9OwogCitib29sIFN0b3JhZ2U6OmlzSGlnaGVyUHJpb3JpdHko Y29uc3Qgc3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+JiBhLCBjb25zdCBzdGQ6OnVuaXF1 ZV9wdHI8UmVhZE9wZXJhdGlvbj4mIGIpCit7CisgICAgaWYgKGEtPnByaW9yaXR5ID09IGItPnBy aW9yaXR5KQorICAgICAgICByZXR1cm4gYS0+b3JkaW5hbCA8IGItPm9yZGluYWw7CisgICAgcmV0 dXJuIGEtPnByaW9yaXR5ID4gYi0+cHJpb3JpdHk7Cit9CisKIHZvaWQgU3RvcmFnZTo6UmVhZE9w ZXJhdGlvbjo6Y2FuY2VsKCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAt Nzc3LDE0ICs3OTQsMTAgQEAgdm9pZCBTdG9yYWdlOjpjYW5jZWxBbGxSZWFkT3BlcmF0aW9ucygp CiAgICAgZm9yIChhdXRvJiByZWFkT3BlcmF0aW9uIDogbV9hY3RpdmVSZWFkT3BlcmF0aW9ucykK ICAgICAgICAgcmVhZE9wZXJhdGlvbi0+Y2FuY2VsKCk7CiAKLSAgICBzaXplX3QgcGVuZGluZ0Nv dW50ID0gMDsKLSAgICBmb3IgKGludCBwcmlvcml0eSA9IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5 OyBwcmlvcml0eSA+PSAwOyAtLXByaW9yaXR5KSB7Ci0gICAgICAgIGF1dG8mIHBlbmRpbmdSZXRy aWV2ZVF1ZXVlID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W3ByaW9yaXR5XTsK LSAgICAgICAgcGVuZGluZ0NvdW50ICs9IHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnNpemUoKTsKLSAg ICAgICAgZm9yIChhdXRvIGl0ID0gcGVuZGluZ1JldHJpZXZlUXVldWUucmJlZ2luKCksIGVuZCA9 IHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnJlbmQoKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAg ICAgKCppdCktPmNhbmNlbCgpOwotICAgICAgICBwZW5kaW5nUmV0cmlldmVRdWV1ZS5jbGVhcigp OwotICAgIH0KKyAgICBzaXplX3QgcGVuZGluZ0NvdW50ID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlv bnMuc2l6ZSgpOworCisgICAgd2hpbGUgKCFtX3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5pc0VtcHR5 KCkpCisgICAgICAgIG1fcGVuZGluZ1JlYWRPcGVyYXRpb25zLmRlcXVldWUoKS0+Y2FuY2VsKCk7 CiAKICAgICBMT0coTmV0d29ya0NhY2hlU3RvcmFnZSwgIihOZXR3b3JrUHJvY2VzcykgcmV0cmll dmUgdGltZW91dCwgY2FuY2VsZWQgJXUgYWN0aXZlIGFuZCAlenUgcGVuZGluZyIsIG1fYWN0aXZl UmVhZE9wZXJhdGlvbnMuc2l6ZSgpLCBwZW5kaW5nQ291bnQpOwogfQpAQCAtNzk1LDE1ICs4MDgs MTIgQEAgdm9pZCBTdG9yYWdlOjpkaXNwYXRjaFBlbmRpbmdSZWFkT3BlcmF0aW9ucygpCiAKICAg ICBjb25zdCBpbnQgbWF4aW11bUFjdGl2ZVJlYWRPcGVyYXRpb25Db3VudCA9IDU7CiAKLSAgICBm b3IgKGludCBwcmlvcml0eSA9IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5OyBwcmlvcml0eSA+PSAw OyAtLXByaW9yaXR5KSB7CisgICAgd2hpbGUgKCFtX3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5pc0Vt cHR5KCkpIHsKICAgICAgICAgaWYgKG1fYWN0aXZlUmVhZE9wZXJhdGlvbnMuc2l6ZSgpID4gbWF4 aW11bUFjdGl2ZVJlYWRPcGVyYXRpb25Db3VudCkgewogICAgICAgICAgICAgTE9HKE5ldHdvcmtD YWNoZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIGxpbWl0aW5nIHBhcmFsbGVsIHJldHJpZXZl cyIpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGF1dG8mIHBlbmRp bmdSZXRyaWV2ZVF1ZXVlID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W3ByaW9y aXR5XTsKLSAgICAgICAgaWYgKHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLmlzRW1wdHkoKSkKLSAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICBkaXNwYXRjaFJlYWRPcGVyYXRpb24ocGVuZGluZ1Jl dHJpZXZlUXVldWUudGFrZUxhc3QoKSk7CisgICAgICAgIGRpc3BhdGNoUmVhZE9wZXJhdGlvbiht X3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5kZXF1ZXVlKCkpOwogICAgIH0KIH0KIApAQCAtODk5LDcg KzkwOSw2IEBAIHZvaWQgU3RvcmFnZTo6ZmluaXNoV3JpdGVPcGVyYXRpb24oV3JpdGVPcGVyYXRp b24mIHdyaXRlT3BlcmF0aW9uLCBpbnQgZXJyb3IpCiB2b2lkIFN0b3JhZ2U6OnJldHJpZXZlKGNv bnN0IEtleSYga2V5LCB1bnNpZ25lZCBwcmlvcml0eSwgUmV0cmlldmVDb21wbGV0aW9uSGFuZGxl ciYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7 Ci0gICAgQVNTRVJUKHByaW9yaXR5IDw9IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5KTsKICAgICBB U1NFUlQoIWtleS5pc051bGwoKSk7CiAKICAgICBpZiAoIW1fY2FwYWNpdHkpIHsKQEAgLTkxNywx MiArOTI2LDEyIEBAIHZvaWQgU3RvcmFnZTo6cmV0cmlldmUoY29uc3QgS2V5JiBrZXksIHVuc2ln bmVkIHByaW9yaXR5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kCiAgICAgaWYgKHJldHJpZXZlRnJv bU1lbW9yeShtX2FjdGl2ZVdyaXRlT3BlcmF0aW9ucywga2V5LCBjb21wbGV0aW9uSGFuZGxlcikp CiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8gcmVhZE9wZXJhdGlvbiA9IG1ha2VVbmlxdWU8 UmVhZE9wZXJhdGlvbj4oKnRoaXMsIGtleSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwor ICAgIGF1dG8gcmVhZE9wZXJhdGlvbiA9IG1ha2VVbmlxdWU8UmVhZE9wZXJhdGlvbj4oKnRoaXMs IGtleSwgcHJpb3JpdHksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIAogICAgIHJlYWRP cGVyYXRpb24tPnRpbWluZ3Muc3RhcnRUaW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAgICAg cmVhZE9wZXJhdGlvbi0+dGltaW5ncy5kaXNwYXRjaENvdW50QXRTdGFydCA9IG1fcmVhZE9wZXJh dGlvbkRpc3BhdGNoQ291bnQ7CiAKLSAgICBtX3BlbmRpbmdSZWFkT3BlcmF0aW9uc0J5UHJpb3Jp dHlbcHJpb3JpdHldLnByZXBlbmQoV1RGTW92ZShyZWFkT3BlcmF0aW9uKSk7CisgICAgbV9wZW5k aW5nUmVhZE9wZXJhdGlvbnMuZW5xdWV1ZShXVEZNb3ZlKHJlYWRPcGVyYXRpb24pKTsKICAgICBk aXNwYXRjaFBlbmRpbmdSZWFkT3BlcmF0aW9ucygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCmluZGV4 IDY3MTAzOGZhNDhiMi4uZDJmMDA3ZTgyYmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaApAQCAtMzYsNiAr MzYsNyBAQAogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL01vbm90b25p Y1RpbWUuaD4KICNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4KKyNpbmNsdWRlIDx3dGYvUHJpb3Jp dHlRdWV1ZS5oPgogI2luY2x1ZGUgPHd0Zi9XYWxsVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9Xb3Jr UXVldWUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTE2MCw2ICsxNjEs OCBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkVG9SZWNvcmRGaWx0ZXIoY29uc3QgS2V5Jik7CiAg ICAgdm9pZCBkZWxldGVGaWxlcyhjb25zdCBLZXkmKTsKIAorICAgIHN0YXRpYyBib29sIGlzSGln aGVyUHJpb3JpdHkoY29uc3Qgc3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+JiwgY29uc3Qg c3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+Jik7CisKICAgICBjb25zdCBTdHJpbmcgbV9i YXNlUGF0aDsKICAgICBjb25zdCBTdHJpbmcgbV9yZWNvcmRzUGF0aDsKICAgICAKQEAgLTE4MSw4 ICsxODQsNyBAQCBwcml2YXRlOgogICAgIFZlY3RvcjxLZXk6Okhhc2hUeXBlPiBtX3JlY29yZEZp bHRlckhhc2hlc0FkZGVkRHVyaW5nU3luY2hyb25pemF0aW9uOwogICAgIFZlY3RvcjxLZXk6Okhh c2hUeXBlPiBtX2Jsb2JGaWx0ZXJIYXNoZXNBZGRlZER1cmluZ1N5bmNocm9uaXphdGlvbjsKIAot ICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4aW11bVJldHJpZXZlUHJpb3JpdHkgPSA0OwotICAgIERl cXVlPHN0ZDo6dW5pcXVlX3B0cjxSZWFkT3BlcmF0aW9uPj4gbV9wZW5kaW5nUmVhZE9wZXJhdGlv bnNCeVByaW9yaXR5W21heGltdW1SZXRyaWV2ZVByaW9yaXR5ICsgMV07CisgICAgUHJpb3JpdHlR dWV1ZTxzdGQ6OnVuaXF1ZV9wdHI8UmVhZE9wZXJhdGlvbj4sICZpc0hpZ2hlclByaW9yaXR5PiBt X3BlbmRpbmdSZWFkT3BlcmF0aW9uczsKICAgICBIYXNoU2V0PHN0ZDo6dW5pcXVlX3B0cjxSZWFk T3BlcmF0aW9uPj4gbV9hY3RpdmVSZWFkT3BlcmF0aW9uczsKICAgICBXZWJDb3JlOjpUaW1lciBt X3JlYWRPcGVyYXRpb25UaW1lb3V0VGltZXI7CiAK 421840 2021-03-01 09:53:49 -0800 2021-03-01 11:50:31 -0800 patch cache-storage-priority-queue-2.patch text/plain 6789 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggYzUxMTcyYjM4ZDUzLi5lNmU3NTJkYTQxNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjAgQEAKKzIwMjEtMDMtMDEgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgor CisgICAgICAgIFVzZSBQcmlvcml0eVF1ZXVlIGluIE5ldHdvcmtDYWNoZTo6U3RvcmFnZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIyNTU1CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBWZWN0 b3I8RGVxdWU8Pj4gd2l0aCBhIG1vcmUgZmxleGlibGUsIHNpbXBsZXIgdG8gdXNlIGRhdGEgc3Ry dWN0dXJlLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6U3RvcmFnZTo6UmVhZE9w ZXJhdGlvbjo6UmVhZE9wZXJhdGlvbik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RvcmFnZTo6aXNIaWdoZXJQcmlvcml0eSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNo ZTo6U3RvcmFnZTo6Y2FuY2VsQWxsUmVhZE9wZXJhdGlvbnMpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrQ2FjaGU6OlN0b3JhZ2U6OmRpc3BhdGNoUGVuZGluZ1JlYWRPcGVyYXRpb25zKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdG9yYWdlOjpyZXRyaWV2ZSk6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oOgorCiAyMDIxLTAy LTI2ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dQRV1bR1RLXSBCb2d1cyBSZXNwb25zZS57c3RhdHVzLG9rfSBmb3Igc3VjY2Vzc2Z1bCBm ZXRjaCgpIHJlcXVlc3RzIHRvIGEgY3VzdG9tIFVSSSBzY2hlbWUgaGFuZGxlcgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3Rv cmFnZS5jcHAKaW5kZXggZDMxOTlkYjY3NThjLi5mMDNiMGZmNWY1OTEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5jcHAK KysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9y YWdlLmNwcApAQCAtNTYsMTIgKzU2LDIwIEBAIHN0YXRpYyBpbmxpbmUgc2l6ZV90IG1heGltdW1J bmxpbmVCb2R5U2l6ZSgpCiAKIHN0YXRpYyBkb3VibGUgY29tcHV0ZVJlY29yZFdvcnRoKEZpbGVU aW1lcyk7CiAKK3N0YXRpYyB1aW50NjRfdCBuZXh0UmVhZE9wZXJhdGlvbk9yZGluYWwoKQorewor ICAgIHN0YXRpYyB1aW50NjRfdCBvcmRpbmFsOworICAgIHJldHVybiArK29yZGluYWw7Cit9CisK IHN0cnVjdCBTdG9yYWdlOjpSZWFkT3BlcmF0aW9uIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9D QVRFRDsKIHB1YmxpYzoKLSAgICBSZWFkT3BlcmF0aW9uKFN0b3JhZ2UmIHN0b3JhZ2UsIGNvbnN0 IEtleSYga2V5LCBSZXRyaWV2ZUNvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIp CisgICAgUmVhZE9wZXJhdGlvbihTdG9yYWdlJiBzdG9yYWdlLCBjb25zdCBLZXkmIGtleSwgdW5z aWduZWQgcHJpb3JpdHksIFJldHJpZXZlQ29tcGxldGlvbkhhbmRsZXImJiBjb21wbGV0aW9uSGFu ZGxlcikKICAgICAgICAgOiBzdG9yYWdlKHN0b3JhZ2UpCiAgICAgICAgICwga2V5KGtleSkKKyAg ICAgICAgLCBvcmRpbmFsKG5leHRSZWFkT3BlcmF0aW9uT3JkaW5hbCgpKQorICAgICAgICAsIHBy aW9yaXR5KHByaW9yaXR5KQogICAgICAgICAsIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUoY29t cGxldGlvbkhhbmRsZXIpKQogICAgIHsgfQogCkBAIC03MSw2ICs3OSw4IEBAIHB1YmxpYzoKICAg ICBSZWY8U3RvcmFnZT4gc3RvcmFnZTsKIAogICAgIGNvbnN0IEtleSBrZXk7CisgICAgY29uc3Qg dWludDY0X3Qgb3JkaW5hbDsKKyAgICB1bnNpZ25lZCBwcmlvcml0eTsKICAgICBSZXRyaWV2ZUNv bXBsZXRpb25IYW5kbGVyIGNvbXBsZXRpb25IYW5kbGVyOwogICAgIAogICAgIHN0ZDo6dW5pcXVl X3B0cjxSZWNvcmQ+IHJlc3VsdFJlY29yZDsKQEAgLTgxLDYgKzkxLDEzIEBAIHB1YmxpYzoKICAg ICBUaW1pbmdzIHRpbWluZ3M7CiB9OwogCitib29sIFN0b3JhZ2U6OmlzSGlnaGVyUHJpb3JpdHko Y29uc3Qgc3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+JiBhLCBjb25zdCBzdGQ6OnVuaXF1 ZV9wdHI8UmVhZE9wZXJhdGlvbj4mIGIpCit7CisgICAgaWYgKGEtPnByaW9yaXR5ID09IGItPnBy aW9yaXR5KQorICAgICAgICByZXR1cm4gYS0+b3JkaW5hbCA8IGItPm9yZGluYWw7CisgICAgcmV0 dXJuIGEtPnByaW9yaXR5ID4gYi0+cHJpb3JpdHk7Cit9CisKIHZvaWQgU3RvcmFnZTo6UmVhZE9w ZXJhdGlvbjo6Y2FuY2VsKCkKIHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwpAQCAt Nzc3LDE0ICs3OTQsMTEgQEAgdm9pZCBTdG9yYWdlOjpjYW5jZWxBbGxSZWFkT3BlcmF0aW9ucygp CiAgICAgZm9yIChhdXRvJiByZWFkT3BlcmF0aW9uIDogbV9hY3RpdmVSZWFkT3BlcmF0aW9ucykK ICAgICAgICAgcmVhZE9wZXJhdGlvbi0+Y2FuY2VsKCk7CiAKLSAgICBzaXplX3QgcGVuZGluZ0Nv dW50ID0gMDsKLSAgICBmb3IgKGludCBwcmlvcml0eSA9IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5 OyBwcmlvcml0eSA+PSAwOyAtLXByaW9yaXR5KSB7Ci0gICAgICAgIGF1dG8mIHBlbmRpbmdSZXRy aWV2ZVF1ZXVlID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W3ByaW9yaXR5XTsK LSAgICAgICAgcGVuZGluZ0NvdW50ICs9IHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnNpemUoKTsKLSAg ICAgICAgZm9yIChhdXRvIGl0ID0gcGVuZGluZ1JldHJpZXZlUXVldWUucmJlZ2luKCksIGVuZCA9 IHBlbmRpbmdSZXRyaWV2ZVF1ZXVlLnJlbmQoKTsgaXQgIT0gZW5kOyArK2l0KQotICAgICAgICAg ICAgKCppdCktPmNhbmNlbCgpOwotICAgICAgICBwZW5kaW5nUmV0cmlldmVRdWV1ZS5jbGVhcigp OwotICAgIH0KKyAgICBzaXplX3QgcGVuZGluZ0NvdW50ID0gbV9wZW5kaW5nUmVhZE9wZXJhdGlv bnMuc2l6ZSgpOworICAgIFVOVVNFRF9QQVJBTShwZW5kaW5nQ291bnQpOworCisgICAgd2hpbGUg KCFtX3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5pc0VtcHR5KCkpCisgICAgICAgIG1fcGVuZGluZ1Jl YWRPcGVyYXRpb25zLmRlcXVldWUoKS0+Y2FuY2VsKCk7CiAKICAgICBMT0coTmV0d29ya0NhY2hl U3RvcmFnZSwgIihOZXR3b3JrUHJvY2VzcykgcmV0cmlldmUgdGltZW91dCwgY2FuY2VsZWQgJXUg YWN0aXZlIGFuZCAlenUgcGVuZGluZyIsIG1fYWN0aXZlUmVhZE9wZXJhdGlvbnMuc2l6ZSgpLCBw ZW5kaW5nQ291bnQpOwogfQpAQCAtNzk1LDE1ICs4MDksMTIgQEAgdm9pZCBTdG9yYWdlOjpkaXNw YXRjaFBlbmRpbmdSZWFkT3BlcmF0aW9ucygpCiAKICAgICBjb25zdCBpbnQgbWF4aW11bUFjdGl2 ZVJlYWRPcGVyYXRpb25Db3VudCA9IDU7CiAKLSAgICBmb3IgKGludCBwcmlvcml0eSA9IG1heGlt dW1SZXRyaWV2ZVByaW9yaXR5OyBwcmlvcml0eSA+PSAwOyAtLXByaW9yaXR5KSB7CisgICAgd2hp bGUgKCFtX3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5pc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKG1f YWN0aXZlUmVhZE9wZXJhdGlvbnMuc2l6ZSgpID4gbWF4aW11bUFjdGl2ZVJlYWRPcGVyYXRpb25D b3VudCkgewogICAgICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2UsICIoTmV0d29ya1By b2Nlc3MpIGxpbWl0aW5nIHBhcmFsbGVsIHJldHJpZXZlcyIpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9Ci0gICAgICAgIGF1dG8mIHBlbmRpbmdSZXRyaWV2ZVF1ZXVlID0gbV9wZW5k aW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W3ByaW9yaXR5XTsKLSAgICAgICAgaWYgKHBlbmRp bmdSZXRyaWV2ZVF1ZXVlLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAg ICBkaXNwYXRjaFJlYWRPcGVyYXRpb24ocGVuZGluZ1JldHJpZXZlUXVldWUudGFrZUxhc3QoKSk7 CisgICAgICAgIGRpc3BhdGNoUmVhZE9wZXJhdGlvbihtX3BlbmRpbmdSZWFkT3BlcmF0aW9ucy5k ZXF1ZXVlKCkpOwogICAgIH0KIH0KIApAQCAtODk5LDcgKzkxMCw2IEBAIHZvaWQgU3RvcmFnZTo6 ZmluaXNoV3JpdGVPcGVyYXRpb24oV3JpdGVPcGVyYXRpb24mIHdyaXRlT3BlcmF0aW9uLCBpbnQg ZXJyb3IpCiB2b2lkIFN0b3JhZ2U6OnJldHJpZXZlKGNvbnN0IEtleSYga2V5LCB1bnNpZ25lZCBw cmlvcml0eSwgUmV0cmlldmVDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVyKQog ewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7Ci0gICAgQVNTRVJUKHByaW9yaXR5IDw9 IG1heGltdW1SZXRyaWV2ZVByaW9yaXR5KTsKICAgICBBU1NFUlQoIWtleS5pc051bGwoKSk7CiAK ICAgICBpZiAoIW1fY2FwYWNpdHkpIHsKQEAgLTkxNywxMiArOTI3LDEyIEBAIHZvaWQgU3RvcmFn ZTo6cmV0cmlldmUoY29uc3QgS2V5JiBrZXksIHVuc2lnbmVkIHByaW9yaXR5LCBSZXRyaWV2ZUNv bXBsZXRpb25IYW5kCiAgICAgaWYgKHJldHJpZXZlRnJvbU1lbW9yeShtX2FjdGl2ZVdyaXRlT3Bl cmF0aW9ucywga2V5LCBjb21wbGV0aW9uSGFuZGxlcikpCiAgICAgICAgIHJldHVybjsKIAotICAg IGF1dG8gcmVhZE9wZXJhdGlvbiA9IG1ha2VVbmlxdWU8UmVhZE9wZXJhdGlvbj4oKnRoaXMsIGtl eSwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOworICAgIGF1dG8gcmVhZE9wZXJhdGlvbiA9 IG1ha2VVbmlxdWU8UmVhZE9wZXJhdGlvbj4oKnRoaXMsIGtleSwgcHJpb3JpdHksIFdURk1vdmUo Y29tcGxldGlvbkhhbmRsZXIpKTsKIAogICAgIHJlYWRPcGVyYXRpb24tPnRpbWluZ3Muc3RhcnRU aW1lID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiAgICAgcmVhZE9wZXJhdGlvbi0+dGltaW5ncy5k aXNwYXRjaENvdW50QXRTdGFydCA9IG1fcmVhZE9wZXJhdGlvbkRpc3BhdGNoQ291bnQ7CiAKLSAg ICBtX3BlbmRpbmdSZWFkT3BlcmF0aW9uc0J5UHJpb3JpdHlbcHJpb3JpdHldLnByZXBlbmQoV1RG TW92ZShyZWFkT3BlcmF0aW9uKSk7CisgICAgbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnMuZW5xdWV1 ZShXVEZNb3ZlKHJlYWRPcGVyYXRpb24pKTsKICAgICBkaXNwYXRjaFBlbmRpbmdSZWFkT3BlcmF0 aW9ucygpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCmluZGV4IDY3MTAzOGZhNDhiMi4uZDJmMDA3ZTgy YmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdv cmtDYWNoZVN0b3JhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2NhY2hl L05ldHdvcmtDYWNoZVN0b3JhZ2UuaApAQCAtMzYsNiArMzYsNyBAQAogI2luY2x1ZGUgPHd0Zi9I YXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3RmL01vbm90b25pY1RpbWUuaD4KICNpbmNsdWRlIDx3dGYv T3B0aW9uYWwuaD4KKyNpbmNsdWRlIDx3dGYvUHJpb3JpdHlRdWV1ZS5oPgogI2luY2x1ZGUgPHd0 Zi9XYWxsVGltZS5oPgogI2luY2x1ZGUgPHd0Zi9Xb3JrUXVldWUuaD4KICNpbmNsdWRlIDx3dGYv dGV4dC9XVEZTdHJpbmcuaD4KQEAgLTE2MCw2ICsxNjEsOCBAQCBwcml2YXRlOgogICAgIHZvaWQg YWRkVG9SZWNvcmRGaWx0ZXIoY29uc3QgS2V5Jik7CiAgICAgdm9pZCBkZWxldGVGaWxlcyhjb25z dCBLZXkmKTsKIAorICAgIHN0YXRpYyBib29sIGlzSGlnaGVyUHJpb3JpdHkoY29uc3Qgc3RkOjp1 bmlxdWVfcHRyPFJlYWRPcGVyYXRpb24+JiwgY29uc3Qgc3RkOjp1bmlxdWVfcHRyPFJlYWRPcGVy YXRpb24+Jik7CisKICAgICBjb25zdCBTdHJpbmcgbV9iYXNlUGF0aDsKICAgICBjb25zdCBTdHJp bmcgbV9yZWNvcmRzUGF0aDsKICAgICAKQEAgLTE4MSw4ICsxODQsNyBAQCBwcml2YXRlOgogICAg IFZlY3RvcjxLZXk6Okhhc2hUeXBlPiBtX3JlY29yZEZpbHRlckhhc2hlc0FkZGVkRHVyaW5nU3lu Y2hyb25pemF0aW9uOwogICAgIFZlY3RvcjxLZXk6Okhhc2hUeXBlPiBtX2Jsb2JGaWx0ZXJIYXNo ZXNBZGRlZER1cmluZ1N5bmNocm9uaXphdGlvbjsKIAotICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4 aW11bVJldHJpZXZlUHJpb3JpdHkgPSA0OwotICAgIERlcXVlPHN0ZDo6dW5pcXVlX3B0cjxSZWFk T3BlcmF0aW9uPj4gbV9wZW5kaW5nUmVhZE9wZXJhdGlvbnNCeVByaW9yaXR5W21heGltdW1SZXRy aWV2ZVByaW9yaXR5ICsgMV07CisgICAgUHJpb3JpdHlRdWV1ZTxzdGQ6OnVuaXF1ZV9wdHI8UmVh ZE9wZXJhdGlvbj4sICZpc0hpZ2hlclByaW9yaXR5PiBtX3BlbmRpbmdSZWFkT3BlcmF0aW9uczsK ICAgICBIYXNoU2V0PHN0ZDo6dW5pcXVlX3B0cjxSZWFkT3BlcmF0aW9uPj4gbV9hY3RpdmVSZWFk T3BlcmF0aW9uczsKICAgICBXZWJDb3JlOjpUaW1lciBtX3JlYWRPcGVyYXRpb25UaW1lb3V0VGlt ZXI7CiAK