144014 2015-04-21 14:57:03 -0700 [WK2][NetworkCache] Better account of resource revalidations in efficacy logging 2015-04-21 16:21:42 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez barraclough cgarcia commit-queue koivisto oldest_to_newest 1087177 0 cdumez 2015-04-21 14:57:03 -0700 Better account of resource revalidations in efficacy logging. Currently, resources that are in the cache but needs revalidation are counted as retrieval successes, which is not entirely accurate. We should distinguish "is in the cache and is directly usable" from "is in the cache but needs revalidation". We should also log how many of these revalidations are successful. 1087182 1 251266 cdumez 2015-04-21 15:03:20 -0700 Created attachment 251266 Patch 1087213 2 251266 cdumez 2015-04-21 16:21:37 -0700 Comment on attachment 251266 Patch Clearing flags on attachment: 251266 Committed r183081: <http://trac.webkit.org/changeset/183081> 1087214 3 cdumez 2015-04-21 16:21:42 -0700 All reviewed patches have been landed. Closing bug. 251266 2015-04-21 15:03:20 -0700 2015-04-21 16:21:37 -0700 Patch bug-144014-20150421150218.patch text/plain 11091 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzMDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWI4MjM3NmZiMDg1YzFm ZWYzMjZlNTMyZTZkOGEwOTAxZTdmMDAzYS4uNWRmMjIyYTNhYTExOGUxODNmZWMxNTg1YTExZGZk MjEzYjc2NDlmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE1LTA0LTIxICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgW1dLMl1bTmV0d29ya0NhY2hl XSBCZXR0ZXIgYWNjb3VudCBvZiByZXNvdXJjZSByZXZhbGlkYXRpb25zIGluIGVmZmljYWN5IGxv Z2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NDAxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBhZGRpdGlvbmFsIGRpYWdub3N0aWMgbG9nZ2luZyBrZXkgZm9yIG5ldHdvcmsgY2FjaGUgZWZm aWNhY3kKKyAgICAgICAgbG9nZ2luZy4KKworICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dp bmdLZXlzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6bmVl ZHNSZXZhbGlkYXRpb25LZXkpOgorICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlz Lmg6CisKKzIwMTUtMDQtMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwogICAg ICAgICBNYWtlIFZlY3Rvcihjb25zdCBWZWN0b3I8VCwgb3RoZXJDYXBhY2l0eSwgb3RoZXJPdmVy Zmxvd0JlaGF2aW91cj4mKSBjb25zdHJ1Y3RvciBleHBsaWNpdAogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzOTcwCiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAzMWZi YjNiZTU3NDBlMzY4NTc1ZWJmMTRmZGE5ZjhmZjk4Yjg1NmQ4Li5kNDQyNzU0Yzg3MTUzMmRiN2Jk M2YwZmZhNTU3OGFmOGI5MDc3ZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTUt MDQtMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbV0syXVtO ZXR3b3JrQ2FjaGVdIEJldHRlciBhY2NvdW50IG9mIHJlc291cmNlIHJldmFsaWRhdGlvbnMgaW4g ZWZmaWNhY3kgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ0MDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQmV0dGVyIGFjY291bnQgb2YgcmVzb3VyY2UgcmV2YWxpZGF0aW9ucyBpbiBlZmZp Y2FjeSBsb2dnaW5nLgorICAgICAgICBQcmV2b3VzbHksIHJlc291cmNlcyB0aGF0IHdlcmUgaW4g dGhlIGNhY2hlIGJ1dCBuZWVkZWQgcmV2YWxpZGF0aW9uCisgICAgICAgIHdlcmUgY291bnRlZCBh cyByZXRyaWV2YWwgc3VjY2Vzc2VzLCB3aGljaCBpcyBub3QgZW50aXJlbHkgYWNjdXJhdGUuCisK KyAgICAgICAgV2Ugbm93IGRpc3Rpbmd1aXNoICJpcyBpbiB0aGUgY2FjaGUgYW5kIGlzIGRpcmVj dGx5IHVzYWJsZSIgZnJvbQorICAgICAgICAiaXMgaW4gdGhlIGNhY2hlIGJ1dCBuZWVkcyByZXZh bGlkYXRpb24iLiBXZSBhbHNvIGxvZyBob3cgbWFueSBvZiB0aGVzZQorICAgICAgICByZXZhbGlk YXRpb25zIGFyZSBzdWNjZXNzZnVsLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9h ZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2VBc3luYyk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpD YWNoZTo6dXBkYXRlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGUuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0 aWNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjpTdGF0aXN0aWNzOjpyZWNv cmRSZXRyaWV2ZWRDYWNoZWRFbnRyeSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6 U3RhdGlzdGljczo6cmVjb3JkUmV2YWxpZGF0aW9uU3VjY2Vzcyk6CisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5oOgorCiAyMDE1LTA0LTIxICBU aW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBQREZz IHN0aWxsIGRvbid0IHNuYXBzaG90IHByb3Blcmx5IGluIGlPUyBTYWZhcmkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcAppbmRleCAxOGM3OWJkZmVjOThm ZmJiZDIzODUzMGUxZmY3N2EwOTk2YTk5MjY1Li5mYTdhNDg2MDM5NzZhNGU3OGI4ZWI1YzliOWI5 MGEwZDA0YzM3ZjhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNM b2dnaW5nS2V5cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2lu Z0tleXMuY3BwCkBAIC0xMDMsNiArMTAzLDExIEBAIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tl eXM6Om5hdmlnYXRpb25LZXkoKQogICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIm5hdmlnYXRpb24i KTsKIH0KIAorU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bmVlZHNSZXZhbGlkYXRpb25L ZXkoKQoreworICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIm5lZWRzUmV2YWxpZGF0aW9uIik7Cit9 CisKIFN0cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6Om5ldHdvcmtDYWNoZUtleSgpCiB7CiAg ICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibmV0d29ya0NhY2hlIik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaAppbmRleCBmOWJjMWNjMTVjZDk0NjEyYjA1Mjg3 OGVmOWZkNzhjZDU4NTg2MDMyLi4wM2I4MjNiNThmZjJhZGU3YTAyMzI3ZDJhMjZkNDE4NmQzZTVk OWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5 cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmgKQEAg LTY2LDYgKzY2LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBTdHJpbmcgbWVkaWFMb2FkaW5nRmFp bGVkS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBtaXNzaW5nVmFsaWRh dG9yRmllbGRzS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBuYXZpZ2F0aW9uS2V5KCk7CisgICAg V0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBuZWVkc1JldmFsaWRhdGlvbktleSgpOwogICAg IFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJpbmcgbmV0d29ya0NhY2hlS2V5KCk7CiAgICAgc3Rh dGljIFN0cmluZyBuZXR3b3JrS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmlu ZyBuZXZlclNlZW5CZWZvcmVLZXkoKTsKQEAgLTEwMSw3ICsxMDIsNyBAQCBwdWJsaWM6CiAgICAg c3RhdGljIFN0cmluZyByZXNvdXJjZVJlc3BvbnNlS2V5KCk7CiAgICAgV0VCQ09SRV9FWFBPUlQg c3RhdGljIFN0cmluZyByZXRyaWV2YWxLZXkoKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMg U3RyaW5nIHJldHJpZXZhbFJlcXVlc3RLZXkoKTsKLSAgICBzdGF0aWMgU3RyaW5nIHJldmFsaWRh dGluZ0tleSgpOworICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBTdHJpbmcgcmV2YWxpZGF0aW5n S2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBzYW1lTG9hZEtleSgpOwogICAgIHN0YXRpYyBTdHJp bmcgc2NyaXB0S2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBzb3VyY2VLZXkoKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIu Y3BwCmluZGV4IDcyMzJjYzIzOTFjOWNmMjcwYzQ5ZGZiYzQwNmM1MjU1MmVlMDMxNjQuLjA0ZjA3 M2IzOTk4YzkyMDZlMzMzOWE3ZmQyMjEzMGQxODZlODkyNDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAt MjQ2LDcgKzI0Niw3IEBAIHZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVz cG9uc2VBc3luYyhSZXNvdXJjZUhhbmRsZSogaGFuZGxlLCBjb25zCiAgICAgaWYgKG1fY2FjaGVF bnRyeUZvclZhbGlkYXRpb24pIHsKICAgICAgICAgYm9vbCB2YWxpZGF0aW9uU3VjY2VlZGVkID0g bV9yZXNwb25zZS5odHRwU3RhdHVzQ29kZSgpID09IDMwNDsgLy8gMzA0IE5vdCBNb2RpZmllZAog ICAgICAgICBpZiAodmFsaWRhdGlvblN1Y2NlZWRlZCkKLSAgICAgICAgICAgIE5ldHdvcmtDYWNo ZTo6c2luZ2xldG9uKCkudXBkYXRlKG9yaWdpbmFsUmVxdWVzdCgpLCAqbV9jYWNoZUVudHJ5Rm9y VmFsaWRhdGlvbiwgbV9yZXNwb25zZSk7CisgICAgICAgICAgICBOZXR3b3JrQ2FjaGU6OnNpbmds ZXRvbigpLnVwZGF0ZShvcmlnaW5hbFJlcXVlc3QoKSwgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCwg Km1fY2FjaGVFbnRyeUZvclZhbGlkYXRpb24sIG1fcmVzcG9uc2UpOwogICAgICAgICBlbHNlCiAg ICAgICAgICAgICBtX2NhY2hlRW50cnlGb3JWYWxpZGF0aW9uID0gbnVsbHB0cjsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2Fj aGUuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl LmNwcAppbmRleCBmY2RlZjYwNTE1ZGYyZGQ0OTFhYjk4ODY5MGNhMTc5Y2NlYjNmMDZjLi5iMjky OGZmZjk5YTYwMGVjYzU1ZTM2NDBkOGIzZjM5OGUxZTBlZDFlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAKQEAgLTM4NSw3 ICszODUsNyBAQCB2b2lkIENhY2hlOjpzdG9yZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmIG9yaWdpbmFsUmVxdWVzdCwgY29uc3QgV2ViQ29yZQogICAgIH0pOwogfQogCi12b2lkIENh Y2hlOjp1cGRhdGUoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVl c3QsIGNvbnN0IEVudHJ5JiBleGlzdGluZ0VudHJ5LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJiB2YWxpZGF0aW5nUmVzcG9uc2UpCit2b2lkIENhY2hlOjp1cGRhdGUoY29uc3QgV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIHVpbnQ2NF90IHdlYlBhZ2VJ RCwgY29uc3QgRW50cnkmIGV4aXN0aW5nRW50cnksIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2UmIHZhbGlkYXRpbmdSZXNwb25zZSkKIHsKICAgICBMT0coTmV0d29ya0NhY2hlLCAiKE5l dHdvcmtQcm9jZXNzKSB1cGRhdGluZyAlcyIsIG9yaWdpbmFsUmVxdWVzdC51cmwoKS5zdHJpbmco KS5sYXRpbjEoKS5kYXRhKCkpOwogCkBAIC0zOTcsNiArMzk3LDkgQEAgdm9pZCBDYWNoZTo6dXBk YXRlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBjb25z dCBFbnRyeSYKICAgICBhdXRvIHVwZGF0ZVJlY29yZCA9IHVwZGF0ZUVudHJ5LmVuY29kZUFzU3Rv cmFnZVJlY29yZCgpOwogCiAgICAgbV9zdG9yYWdlLT5zdG9yZSh1cGRhdGVSZWNvcmQsIHsgfSk7 CisKKyAgICBpZiAobV9zdGF0aXN0aWNzKQorICAgICAgICBtX3N0YXRpc3RpY3MtPnJlY29yZFJl dmFsaWRhdGlvblN1Y2Nlc3Mod2ViUGFnZUlELCBleGlzdGluZ0VudHJ5LmtleSgpLCBvcmlnaW5h bFJlcXVlc3QpOwogfQogCiB2b2lkIENhY2hlOjpyZW1vdmUoY29uc3QgS2V5JiBrZXkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGUu aCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCmlu ZGV4IGU1MDk2OGYxNzg3YmQ2OTY1Y2Y5NTNiYWE0ZjFmYmRhZDU1MGYyN2MuLmZmMzdhNjhiNTlh NmM4YTFjZjQ4NzJhN2Q2NmE5YjliOGIyMTgwODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCkBAIC05NCw3ICs5NCw3IEBAIHB1 YmxpYzoKICAgICAvLyBDb21wbGV0aW9uIGhhbmRsZXIgbWF5IGdldCBjYWxsZWQgYmFjayBzeW5j aHJvbm91c2x5IG9uIGZhaWx1cmUuCiAgICAgdm9pZCByZXRyaWV2ZShjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmLCB1aW50NjRfdCB3ZWJQYWdlSUQsIHN0ZDo6ZnVuY3Rpb248dm9pZCAo c3RkOjp1bmlxdWVfcHRyPEVudHJ5Pik+KTsKICAgICB2b2lkIHN0b3JlKGNvbnN0IFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmLCBSZWZQ dHI8V2ViQ29yZTo6U2hhcmVkQnVmZmVyPiYmLCBzdGQ6OmZ1bmN0aW9uPHZvaWQgKE1hcHBlZEJv ZHkmKT4pOwotICAgIHZvaWQgdXBkYXRlKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYs IGNvbnN0IEVudHJ5JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYgdmFsaWRhdGlu Z1Jlc3BvbnNlKTsKKyAgICB2b2lkIHVwZGF0ZShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmLCB1aW50NjRfdCB3ZWJQYWdlSUQsIGNvbnN0IEVudHJ5JiwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSYgdmFsaWRhdGluZ1Jlc3BvbnNlKTsKIAogICAgIHZvaWQgdHJhdmVyc2Uo c3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBFbnRyeSopPiYmKTsKICAgICB2b2lkIHJlbW92ZShj b25zdCBLZXkmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKaW5kZXggZTAwZWUzNDZkNDdk YTc2OWNhMjM1NmVlNmVjMmNlMTc3ZjJjZTNkNC4uZjQzNjcxMzY0ZThhZDkxYWVlYzhkZTQxYzlk NTFhMzI5Y2Q0YmUzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3Mv Y2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlU3RhdGlzdGljcy5jcHAKQEAgLTI4NywxNyAr Mjg3LDMxIEBAIHN0YXRpYyBTdHJpbmcgY2FjaGVkRW50cnlSZXVzZUZhaWx1cmVUb0RpYWdub3N0 aWNLZXkoVXNlRGVjaXNpb24gZGVjaXNpb24pCiB2b2lkIFN0YXRpc3RpY3M6OnJlY29yZFJldHJp ZXZlZENhY2hlZEVudHJ5KHVpbnQ2NF90IHdlYlBhZ2VJRCwgY29uc3QgS2V5JiBrZXksIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgVXNlRGVjaXNpb24gZGVjaXNpb24p CiB7CiAgICAgV2ViQ29yZTo6VVJMIHJlcXVlc3RVUkwgPSByZXF1ZXN0LnVybCgpOwotICAgIGlm IChkZWNpc2lvbiA9PSBVc2VEZWNpc2lvbjo6VXNlIHx8IGRlY2lzaW9uID09IFVzZURlY2lzaW9u OjpWYWxpZGF0ZSkgeworICAgIGlmIChkZWNpc2lvbiA9PSBVc2VEZWNpc2lvbjo6VXNlKSB7CiAg ICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHdlYlBhZ2VJRCAlbGx1 OiAlcyBpcyBpbiB0aGUgY2FjaGUgYW5kIGlzIHVzZWQiLCB3ZWJQYWdlSUQsIHJlcXVlc3RVUkwu c3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOwogICAgICAgICBOZXR3b3JrUHJvY2Vzczo6c2luZ2xl dG9uKCkubG9nRGlhZ25vc3RpY01lc3NhZ2VXaXRoUmVzdWx0KHdlYlBhZ2VJRCwgV2ViQ29yZTo6 RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpuZXR3b3JrQ2FjaGVLZXkoKSwgV2ViQ29yZTo6RGlhZ25v c3RpY0xvZ2dpbmdLZXlzOjpyZXRyaWV2YWxLZXkoKSwgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dp bmdSZXN1bHRQYXNzLCBXZWJDb3JlOjpTaG91bGRTYW1wbGU6Olllcyk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKKyAgICBpZiAoZGVjaXNpb24gPT0gVXNlRGVjaXNpb246OlZhbGlkYXRlKSB7 CisgICAgICAgIExPRyhOZXR3b3JrQ2FjaGUsICIoTmV0d29ya1Byb2Nlc3MpIHdlYlBhZ2VJRCAl bGx1OiAlcyBpcyBpbiB0aGUgY2FjaGUgYnV0IG5lZWRzIHJldmFsaWRhdGlvbiIsIHdlYlBhZ2VJ RCwgcmVxdWVzdFVSTC5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7CisgICAgICAgIE5ldHdvcmtQ cm9jZXNzOjpzaW5nbGV0b24oKS5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZSh3ZWJQYWdl SUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6bmV0d29ya0NhY2hlS2V5KCksIFdl YkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6cmV0cmlldmFsS2V5KCksIFdlYkNvcmU6OkRp YWdub3N0aWNMb2dnaW5nS2V5czo6bmVlZHNSZXZhbGlkYXRpb25LZXkoKSwgV2ViQ29yZTo6U2hv dWxkU2FtcGxlOjpZZXMpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgU3RyaW5nIGRp YWdub3N0aWNLZXkgPSBjYWNoZWRFbnRyeVJldXNlRmFpbHVyZVRvRGlhZ25vc3RpY0tleShkZWNp c2lvbik7CiAgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJvY2Vzcykgd2ViUGFnZUlE ICVsbHU6ICVzIGlzIGluIHRoZSBjYWNoZSBidXQgd2Fzbid0IHVzZWQsIHJlYXNvbjogJXMiLCB3 ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCksIGRpYWdub3N0aWNL ZXkudXRmOCgpLmRhdGEoKSk7CiAgICAgTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmxvZ0Rp YWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKHdlYlBhZ2VJRCwgV2ViQ29yZTo6RGlhZ25vc3RpY0xv Z2dpbmdLZXlzOjpuZXR3b3JrQ2FjaGVLZXkoKSwgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdL ZXlzOjp1bnVzYWJsZUNhY2hlZEVudHJ5S2V5KCksIGRpYWdub3N0aWNLZXksIFdlYkNvcmU6OlNo b3VsZFNhbXBsZTo6WWVzKTsKIH0KIAordm9pZCBTdGF0aXN0aWNzOjpyZWNvcmRSZXZhbGlkYXRp b25TdWNjZXNzKHVpbnQ2NF90IHdlYlBhZ2VJRCwgY29uc3QgS2V5JiBrZXksIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKK3sKKyAgICBXZWJDb3JlOjpVUkwgcmVxdWVz dFVSTCA9IHJlcXVlc3QudXJsKCk7CisgICAgTE9HKE5ldHdvcmtDYWNoZSwgIihOZXR3b3JrUHJv Y2Vzcykgd2ViUGFnZUlEICVsbHU6ICVzIHdhcyBzdWNjZXNzZnVsbHkgcmV2YWxpZGF0ZWQiLCB3 ZWJQYWdlSUQsIHJlcXVlc3RVUkwuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOworCisgICAgTmV0 d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdCh3 ZWJQYWdlSUQsIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6bmV0d29ya0NhY2hlS2V5 KCksIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6cmV2YWxpZGF0aW5nS2V5KCksIFdl YkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nUmVzdWx0UGFzcywgV2ViQ29yZTo6U2hvdWxkU2FtcGxl OjpZZXMpOworfQorCiB2b2lkIFN0YXRpc3RpY3M6Om1hcmtBc1JlcXVlc3RlZChjb25zdCBTdHJp bmcmIGhhc2gpCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3Rp Y3MuaCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0 YXRpc3RpY3MuaAppbmRleCA0NTg2NTBkZjZjMzE1YjczMjEyOWIyNTI5MmRlNWZiYzQ2MGY4N2Mz Li45ZjA0OGU3MjJlYmM5NWVhODcxM2FhMTFjYzg0NTE4YTAwNDU5ZDUxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNz LmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hl U3RhdGlzdGljcy5oCkBAIC01Miw2ICs1Miw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlY29yZE5v dFVzaW5nQ2FjaGVGb3JSZXF1ZXN0KHVpbnQ2NF90IHdlYlBhZ2VJRCwgY29uc3QgS2V5JiwgY29u c3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgUmV0cmlldmVEZWNpc2lvbik7CiAgICAgdm9p ZCByZWNvcmRSZXRyaWV2YWxGYWlsdXJlKHVpbnQ2NF90IHdlYlBhZ2VJRCwgY29uc3QgS2V5Jiwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CiAgICAgdm9pZCByZWNvcmRSZXRyaWV2 ZWRDYWNoZWRFbnRyeSh1aW50NjRfdCB3ZWJQYWdlSUQsIGNvbnN0IEtleSYsIGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYsIFVzZURlY2lzaW9uKTsKKyAgICB2b2lkIHJlY29yZFJldmFs aWRhdGlvblN1Y2Nlc3ModWludDY0X3Qgd2ViUGFnZUlELCBjb25zdCBLZXkmLCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBTdGF0aXN0 aWNzKGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKTsK