167469 2017-01-26 15:14:42 -0800 Fix CPU / Memory diagnostic logging in PerformanceMonitor 2017-01-26 15:34:35 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen commit-queue kling rniwa webkit-bug-importer oldest_to_newest 1270371 0 cdumez 2017-01-26 15:14:42 -0800 Fix CPU / Memory diagnostic logging in PerformanceMonitor to use logDiagnosticMessage() instead of logDiagnosticMessageWithValue(). logDiagnosticMessageWithValue() should only be used with numeric values. 1270373 1 299863 cdumez 2017-01-26 15:18:21 -0800 Created attachment 299863 Patch 1270376 2 cdumez 2017-01-26 15:20:30 -0800 <rdar://problem/30220959> 1270377 3 299863 achristensen 2017-01-26 15:21:23 -0800 Comment on attachment 299863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299863&action=review > Source/WebCore/page/DiagnosticLoggingClient.h:42 > + // FIXME: rename this to logDiagnosticMessageWithNumericValue(). Should its parameter be a String, then? 1270380 4 cdumez 2017-01-26 15:24:11 -0800 (In reply to comment #3) > Comment on attachment 299863 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=299863&action=review > > > Source/WebCore/page/DiagnosticLoggingClient.h:42 > > + // FIXME: rename this to logDiagnosticMessageWithNumericValue(). > > Should its parameter be a String, then? We end up passing a string to the underlying framework so this is not a big issue (although it may be clearer indeed). However, the string definitely needs to contain a numeric value. 1270383 5 cdumez 2017-01-26 15:34:35 -0800 Committed r211233: <http://trac.webkit.org/changeset/211233> 299863 2017-01-26 15:18:21 -0800 2017-01-26 15:21:11 -0800 Patch bug-167469-20170126151618.patch text/plain 10254 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY4YTNlMjg2ZjdjOTJi YmI4YzE2NzIxNzRiN2ViOTQ5YmRlNmQ4MC4uMWU5MWJlNDJkMmFmMTE2ZWZjM2I1ODI4YTExNGZj NmQ2YTA0ZjUyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE3LTAxLTI2ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IENQVSAvIE1lbW9yeSBk aWFnbm9zdGljIGxvZ2dpbmcgaW4gUGVyZm9ybWFuY2VNb25pdG9yCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc0NjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggQ1BVIC8gTWVtb3J5IGRpYWdub3N0 aWMgbG9nZ2luZyBpbiBQZXJmb3JtYW5jZU1vbml0b3IgdG8gdXNlIGxvZ0RpYWdub3N0aWNNZXNz YWdlKCkKKyAgICAgICAgaW5zdGVhZCBvZiBsb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZSgp LiBsb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZSgpIHNob3VsZCBvbmx5CisgICAgICAgIGJl IHVzZWQgd2l0aCBudW1lcmljIHZhbHVlcyBidXQgd2UgYWxyZWFkeSB0YWtlIGNhcmUgb2YgdGhl IGJ1Y2tldGluZyBvbiBvdXIgc2lkZS4KKworICAgICAgICAqIHBhZ2UvRGlhZ25vc3RpY0xvZ2dp bmdDbGllbnQuaDoKKyAgICAgICAgKiBwYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlQmFja2dyb3Vu ZGluZ0NQVVVzYWdlS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5 czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VLZXkpOgorICAgICAgICAoV2ViQ29y ZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwb3N0UGFnZUxvYWRDUFVVc2FnZUtleSk6CisgICAg ICAgIChXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlTG9hZE1lbW9yeVVz YWdlS2V5KToKKyAgICAgICAgKFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nS2V5czo6Zm9yZWdy b3VuZENQVVVzYWdlVG9EaWFnbm9zdGljTG9nZ2luZ0tleSk6CisgICAgICAgIChXZWJDb3JlOjpE aWFnbm9zdGljTG9nZ2luZ0tleXM6OmJhY2tncm91bmRDUFVVc2FnZVRvRGlhZ25vc3RpY0xvZ2dp bmdLZXkpOgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwb3N0UGFn ZUJhY2tncm91bmRpbmdLZXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjpwb3N0UGFnZUxvYWRLZXkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZW1vcnlVc2FnZUtleSk6IERlbGV0ZWQuCisgICAg ICAgICogcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaDoKKyAgICAgICAgKiBwYWdlL1BlcmZv cm1hbmNlTW9uaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU1vbml0b3I6 Om1lYXN1cmVQb3N0TG9hZENQVVVzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlBlcmZvcm1hbmNl TW9uaXRvcjo6bWVhc3VyZVBvc3RMb2FkTWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6 UGVyZm9ybWFuY2VNb25pdG9yOjptZWFzdXJlUG9zdEJhY2tncm91bmRpbmdNZW1vcnlVc2FnZSk6 CisgICAgICAgIChXZWJDb3JlOjpQZXJmb3JtYW5jZU1vbml0b3I6Om1lYXN1cmVQb3N0QmFja2dy b3VuZGluZ0NQVVVzYWdlKToKKworMjAxNy0wMS0yNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCiAgICAgICAgIEZpeCBXZWJHTCBkaWFnbm9zdGljIGxvZ2dpbmcKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NzQ2MwogICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzAyMTY5ODE+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0RpYWdub3N0aWNMb2dnaW5nQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdub3N0 aWNMb2dnaW5nQ2xpZW50LmgKaW5kZXggNTRjY2EyZGNiMTdmMjZkZDhmYWVlZWE3MWNmNzAyMDAw NTQ3MzEwYS4uNzg2NzcyMmJmN2U0OWU2ZDg1MTU2YWU3NzEwODAwOTE3YjQ0ZDY1YiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0NsaWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQuaApAQCAtMzksNiAr MzksNyBAQCBjbGFzcyBEaWFnbm9zdGljTG9nZ2luZ0NsaWVudCB7CiBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29u c3QgU3RyaW5nJiBkZXNjcmlwdGlvbiwgU2hvdWxkU2FtcGxlKSA9IDA7CiAgICAgdmlydHVhbCB2 b2lkIGxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFJlc3VsdChjb25zdCBTdHJpbmcmIG1lc3NhZ2Us IGNvbnN0IFN0cmluZyYgZGVzY3JpcHRpb24sIERpYWdub3N0aWNMb2dnaW5nUmVzdWx0VHlwZSwg U2hvdWxkU2FtcGxlKSA9IDA7CisgICAgLy8gRklYTUU6IHJlbmFtZSB0aGlzIHRvIGxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aE51bWVyaWNWYWx1ZSgpLgogICAgIHZpcnR1YWwgdm9pZCBsb2dEaWFn bm9zdGljTWVzc2FnZVdpdGhWYWx1ZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmlu ZyYgZGVzY3JpcHRpb24sIGNvbnN0IFN0cmluZyYgdmFsdWUsIFNob3VsZFNhbXBsZSkgPSAwOwog CiAgICAgc3RhdGljIGJvb2wgc2hvdWxkTG9nQWZ0ZXJTYW1wbGluZyhTaG91bGRTYW1wbGUpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuY3BwCmluZGV4IDY2 NzJjNjg5ZmJlNDM5OWM4YWFkNWE1MjY3MWJlZDg5MWQyNmE0MGQuLjdiYWE3YTJkMGZlZmJmMGFl Y2EyYjliN2JhNjkxMTRkZjUzZjYzODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RpYWdu b3N0aWNMb2dnaW5nS2V5cy5jcHAKQEAgLTUzLDkgKzUzLDE0IEBAIFN0cmluZyBEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OnBsdWdpbkxvYWRpbmdGYWlsZWRLZXkoKQogICAgIHJldHVybiBBU0NJSUxp dGVyYWwoInBsdWdpbkZhaWxlZExvYWRpbmciKTsKIH0KIAotU3RyaW5nIERpYWdub3N0aWNMb2dn aW5nS2V5czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nS2V5KCkKK1N0cmluZyBEaWFnbm9zdGljTG9n Z2luZ0tleXM6OnBvc3RQYWdlQmFja2dyb3VuZGluZ0NQVVVzYWdlS2V5KCkKIHsKLSAgICByZXR1 cm4gQVNDSUlMaXRlcmFsKCJwb3N0UGFnZUJhY2tncm91bmRpbmciKTsKKyAgICByZXR1cm4gQVND SUlMaXRlcmFsKCJwb3N0UGFnZUJhY2tncm91bmRpbmdDUFVVc2FnZSIpOworfQorCitTdHJpbmcg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwb3N0UGFnZUJhY2tncm91bmRpbmdNZW1vcnlVc2FnZUtl eSgpCit7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgicG9zdFBhZ2VCYWNrZ3JvdW5kaW5nTWVt b3J5VXNhZ2UiKTsKIH0KIAogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6cGFnZUhhbmRs ZXNXZWJHTENvbnRleHRMb3NzS2V5KCkKQEAgLTYzLDkgKzY4LDE0IEBAIFN0cmluZyBEaWFnbm9z dGljTG9nZ2luZ0tleXM6OnBhZ2VIYW5kbGVzV2ViR0xDb250ZXh0TG9zc0tleSgpCiAgICAgcmV0 dXJuIEFTQ0lJTGl0ZXJhbCgicGFnZUhhbmRsZXNXZWJHTENvbnRleHRMb3NzIik7CiB9CiAKLVN0 cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnBvc3RQYWdlTG9hZEtleSgpCitTdHJpbmcgRGlh Z25vc3RpY0xvZ2dpbmdLZXlzOjpwb3N0UGFnZUxvYWRDUFVVc2FnZUtleSgpCiB7Ci0gICAgcmV0 dXJuIEFTQ0lJTGl0ZXJhbCgicG9zdFBhZ2VMb2FkIik7CisgICAgcmV0dXJuIEFTQ0lJTGl0ZXJh bCgicG9zdFBhZ2VMb2FkQ1BVVXNhZ2UiKTsKK30KKworU3RyaW5nIERpYWdub3N0aWNMb2dnaW5n S2V5czo6cG9zdFBhZ2VMb2FkTWVtb3J5VXNhZ2VLZXkoKQoreworICAgIHJldHVybiBBU0NJSUxp dGVyYWwoInBvc3RQYWdlTG9hZE1lbW9yeVVzYWdlIik7CiB9CiAKIFN0cmluZyBEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OnByb3Zpc2lvbmFsTG9hZEtleSgpCkBAIC0zMzgsMTEgKzM0OCw2IEBAIFN0 cmluZyBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmNwdVVzYWdlS2V5KCkKICAgICByZXR1cm4gQVND SUlMaXRlcmFsKCJjcHVVc2FnZSIpOwogfQogCi1TdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlz OjptZW1vcnlVc2FnZUtleSgpCi17Ci0gICAgcmV0dXJuIEFTQ0lJTGl0ZXJhbCgibWVtb3J5VXNh Z2UiKTsKLX0KLQogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6Y3JlYXRlU2hhcmVkQnVm ZmVyRmFpbGVkS2V5KCkKIHsKICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCJjcmVhdGVTaGFyZWRC dWZmZXJGYWlsZWQiKTsKQEAgLTcxOCw3ICs3MjMsNyBAQCBTdHJpbmcgRGlhZ25vc3RpY0xvZ2dp bmdLZXlzOjptZW1vcnlVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbmdLZXkodWludDY0X3QgbWVtb3J5 VQogU3RyaW5nIERpYWdub3N0aWNMb2dnaW5nS2V5czo6Zm9yZWdyb3VuZENQVVVzYWdlVG9EaWFn bm9zdGljTG9nZ2luZ0tleShkb3VibGUgY3B1VXNhZ2UpCiB7CiAgICAgaWYgKGNwdVVzYWdlIDwg MTApCi0gICAgICAgIHJldHVybiBBU0NJSUxpdGVyYWwoIkJlbG93MTAiKTsKKyAgICAgICAgcmV0 dXJuIEFTQ0lJTGl0ZXJhbCgiYmVsb3cxMCIpOwogICAgIGlmIChjcHVVc2FnZSA8IDIwKQogICAg ICAgICByZXR1cm4gQVNDSUlMaXRlcmFsKCIxMHRvMjAiKTsKICAgICBpZiAoY3B1VXNhZ2UgPCA0 MCkKQEAgLTczMyw3ICs3MzgsNyBAQCBTdHJpbmcgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpmb3Jl Z3JvdW5kQ1BVVXNhZ2VUb0RpYWdub3N0aWNMb2dnaW5nS2V5KGRvdWJsZSBjcAogU3RyaW5nIERp YWdub3N0aWNMb2dnaW5nS2V5czo6YmFja2dyb3VuZENQVVVzYWdlVG9EaWFnbm9zdGljTG9nZ2lu Z0tleShkb3VibGUgY3B1VXNhZ2UpCiB7CiAgICAgaWYgKGNwdVVzYWdlIDwgMSkKLSAgICAgICAg cmV0dXJuIEFTQ0lJTGl0ZXJhbCgiQmVsb3cxIik7CisgICAgICAgIHJldHVybiBBU0NJSUxpdGVy YWwoImJlbG93MSIpOwogICAgIGlmIChjcHVVc2FnZSA8IDUpCiAgICAgICAgIHJldHVybiBBU0NJ SUxpdGVyYWwoIjF0bzUiKTsKICAgICBpZiAoY3B1VXNhZ2UgPCAxMCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdLZXlzLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RpYWdub3N0aWNMb2dnaW5nS2V5cy5oCmluZGV4IGJkNmIxMzYxM2FjMzczYjNlOThi YzFiNTkzZTBjZGU4NjYwMDY3YWEuLmNiZDA4ZmMxNzVjNjY4MTJkNjMxZTFjNTg3MDgxZGJhZTU2 YTk4ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRGlhZ25vc3RpY0xvZ2dpbmdL ZXlzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9EaWFnbm9zdGljTG9nZ2luZ0tleXMuaApA QCAtNDEsNyArNDEsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBjYW5DYWNoZUtleSgp OwogICAgIHN0YXRpYyBTdHJpbmcgY2Fubm90U3VzcGVuZEFjdGl2ZURPTU9iamVjdHNLZXkoKTsK ICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgU3RyaW5nIGNwdVVzYWdlS2V5KCk7Ci0gICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBtZW1vcnlVc2FnZUtleSgpOwogICAgIFdFQkNPUkVf RVhQT1JUIHN0YXRpYyBTdHJpbmcgY3JlYXRlU2hhcmVkQnVmZmVyRmFpbGVkS2V5KCk7CiAgICAg V0VCQ09SRV9FWFBPUlQgc3RhdGljIFN0cmluZyBkZWx0YUtleSgpOwogICAgIHN0YXRpYyBTdHJp bmcgZGVuaWVkQnlDbGllbnRLZXkoKTsKQEAgLTEwNSw4ICsxMDQsMTAgQEAgcHVibGljOgogICAg IHN0YXRpYyBTdHJpbmcgcGxheWVkS2V5KCk7CiAgICAgc3RhdGljIFN0cmluZyBwbHVnaW5Mb2Fk ZWRLZXkoKTsKICAgICBzdGF0aWMgU3RyaW5nIHBsdWdpbkxvYWRpbmdGYWlsZWRLZXkoKTsKLSAg ICBzdGF0aWMgU3RyaW5nIHBvc3RQYWdlQmFja2dyb3VuZGluZ0tleSgpOwotICAgIHN0YXRpYyBT dHJpbmcgcG9zdFBhZ2VMb2FkS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBwb3N0UGFnZUJhY2tn cm91bmRpbmdDUFVVc2FnZUtleSgpOworICAgIHN0YXRpYyBTdHJpbmcgcG9zdFBhZ2VCYWNrZ3Jv dW5kaW5nTWVtb3J5VXNhZ2VLZXkoKTsKKyAgICBzdGF0aWMgU3RyaW5nIHBvc3RQYWdlTG9hZENQ VVVzYWdlS2V5KCk7CisgICAgc3RhdGljIFN0cmluZyBwb3N0UGFnZUxvYWRNZW1vcnlVc2FnZUtl eSgpOwogICAgIHN0YXRpYyBTdHJpbmcgcHJvdmlzaW9uYWxMb2FkS2V5KCk7CiAgICAgc3RhdGlj IFN0cmluZyBwcnVuZWREdWVUb01heFNpemVSZWFjaGVkKCk7CiAgICAgc3RhdGljIFN0cmluZyBw cnVuZWREdWVUb01lbW9yeVByZXNzdXJlS2V5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1BlcmZvcm1hbmNlTW9uaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BlcmZv cm1hbmNlTW9uaXRvci5jcHAKaW5kZXggNGU4NjU0NGRmMDlkNGNiMDEyZDc2NGZkZGJhNGY0YTg1 MzkwZTgxZC4uM2JmZTQ1NzFjYTcxYWJjZTFhNTU0OGU4MTg1ZjJkYThkNDkwNTU5NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9QZXJmb3JtYW5jZU1vbml0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUGVyZm9ybWFuY2VNb25pdG9yLmNwcApAQCAtMTQxLDcgKzE0MSw3 IEBAIHZvaWQgUGVyZm9ybWFuY2VNb25pdG9yOjptZWFzdXJlUG9zdExvYWRDUFVVc2FnZSgpCiAK ICAgICBkb3VibGUgY3B1VXNhZ2UgPSBjcHVUaW1lLnZhbHVlKCkucGVyY2VudGFnZUNQVVVzYWdl U2luY2UoKm1fcG9zdExvYWRDUFVUaW1lKTsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFBl cmZvcm1hbmNlTG9nZ2luZywgIm1lYXN1cmVQb3N0TG9hZENQVVVzYWdlOiBQcm9jZXNzIHdhcyB1 c2luZyAlLjFmJSUgQ1BVIGFmdGVyIHRoZSBwYWdlIGxvYWQuIiwgY3B1VXNhZ2UpOwotICAgIG1f cGFnZS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZh bHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VMb2FkS2V5KCksIERpYWdub3N0aWNM b2dnaW5nS2V5czo6Y3B1VXNhZ2VLZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpmb3JlZ3Jv dW5kQ1BVVXNhZ2VUb0RpYWdub3N0aWNMb2dnaW5nS2V5KGNwdVVzYWdlKSwgU2hvdWxkU2FtcGxl OjpObyk7CisgICAgbV9wYWdlLmRpYWdub3N0aWNMb2dnaW5nQ2xpZW50KCkubG9nRGlhZ25vc3Rp Y01lc3NhZ2UoRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpwb3N0UGFnZUxvYWRDUFVVc2FnZUtleSgp LCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OmZvcmVncm91bmRDUFVVc2FnZVRvRGlhZ25vc3RpY0xv Z2dpbmdLZXkoY3B1VXNhZ2UpLCBTaG91bGRTYW1wbGU6Ok5vKTsKIH0KIAogdm9pZCBQZXJmb3Jt YW5jZU1vbml0b3I6Om1lYXN1cmVQb3N0TG9hZE1lbW9yeVVzYWdlKCkKQEAgLTE1NCw3ICsxNTQs NyBAQCB2b2lkIFBlcmZvcm1hbmNlTW9uaXRvcjo6bWVhc3VyZVBvc3RMb2FkTWVtb3J5VXNhZ2Uo KQogICAgICAgICByZXR1cm47CiAKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFBlcmZvcm1h bmNlTG9nZ2luZywgIm1lYXN1cmVQb3N0TG9hZE1lbW9yeVVzYWdlOiBQcm9jZXNzIHdhcyB1c2lu ZyAlbGx1IGJ5dGVzIG9mIG1lbW9yeSBhZnRlciB0aGUgcGFnZSBsb2FkLiIsIG1lbW9yeVVzYWdl LnZhbHVlKCkpOwotICAgIG1fcGFnZS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VMb2Fk S2V5KCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWVtb3J5VXNhZ2VLZXkoKSwgRGlhZ25vc3Rp Y0xvZ2dpbmdLZXlzOjptZW1vcnlVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbmdLZXkobWVtb3J5VXNh Z2UudmFsdWUoKSksIFNob3VsZFNhbXBsZTo6Tm8pOworICAgIG1fcGFnZS5kaWFnbm9zdGljTG9n Z2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6 cG9zdFBhZ2VMb2FkTWVtb3J5VXNhZ2VLZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZW1v cnlVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbmdLZXkobWVtb3J5VXNhZ2UudmFsdWUoKSksIFNob3Vs ZFNhbXBsZTo6Tm8pOwogfQogCiB2b2lkIFBlcmZvcm1hbmNlTW9uaXRvcjo6bWVhc3VyZVBvc3RC YWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2UoKQpAQCAtMTY3LDcgKzE2Nyw3IEBAIHZvaWQgUGVyZm9y bWFuY2VNb25pdG9yOjptZWFzdXJlUG9zdEJhY2tncm91bmRpbmdNZW1vcnlVc2FnZSgpCiAgICAg ICAgIHJldHVybjsKIAogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoUGVyZm9ybWFuY2VMb2dn aW5nLCAibWVhc3VyZVBvc3RCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2U6IFByb2Nlc3Mgd2FzIHVz aW5nICVsbHUgYnl0ZXMgb2YgbWVtb3J5IGFmdGVyIGJlY29taW5nIG5vbiB2aXNpYmxlLiIsIG1l bW9yeVVzYWdlLnZhbHVlKCkpOwotICAgIG1fcGFnZS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgp LmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cG9z dFBhZ2VCYWNrZ3JvdW5kaW5nS2V5KCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6bWVtb3J5VXNh Z2VLZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZW1vcnlVc2FnZVRvRGlhZ25vc3RpY0xv Z2dpbmdLZXkobWVtb3J5VXNhZ2UudmFsdWUoKSksIFNob3VsZFNhbXBsZTo6Tm8pOworICAgIG1f cGFnZS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNzYWdlKERpYWdu b3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nTWVtb3J5VXNhZ2VLZXkoKSwg RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjptZW1vcnlVc2FnZVRvRGlhZ25vc3RpY0xvZ2dpbmdLZXko bWVtb3J5VXNhZ2UudmFsdWUoKSksIFNob3VsZFNhbXBsZTo6Tm8pOwogfQogCiB2b2lkIFBlcmZv cm1hbmNlTW9uaXRvcjo6bWVhc3VyZVBvc3RCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2UoKQpAQCAtMTg5 LDcgKzE4OSw3IEBAIHZvaWQgUGVyZm9ybWFuY2VNb25pdG9yOjptZWFzdXJlUG9zdEJhY2tncm91 bmRpbmdDUFVVc2FnZSgpCiAKICAgICBkb3VibGUgY3B1VXNhZ2UgPSBjcHVUaW1lLnZhbHVlKCku cGVyY2VudGFnZUNQVVVzYWdlU2luY2UoKm1fcG9zdEJhY2tncm91bmRpbmdDUFVUaW1lKTsKICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFBlcmZvcm1hbmNlTG9nZ2luZywgIm1lYXN1cmVQb3N0 QmFja2dyb3VuZGluZ0NQVVVzYWdlOiBQcm9jZXNzIHdhcyB1c2luZyAlLjFmJSUgQ1BVIGFmdGVy IGJlY29taW5nIG5vbiB2aXNpYmxlLiIsIGNwdVVzYWdlKTsKLSAgICBtX3BhZ2UuZGlhZ25vc3Rp Y0xvZ2dpbmdDbGllbnQoKS5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZShEaWFnbm9zdGlj TG9nZ2luZ0tleXM6OnBvc3RQYWdlQmFja2dyb3VuZGluZ0tleSgpLCBEaWFnbm9zdGljTG9nZ2lu Z0tleXM6OmNwdVVzYWdlS2V5KCksIERpYWdub3N0aWNMb2dnaW5nS2V5czo6YmFja2dyb3VuZENQ VVVzYWdlVG9EaWFnbm9zdGljTG9nZ2luZ0tleShjcHVVc2FnZSksIFNob3VsZFNhbXBsZTo6Tm8p OworICAgIG1fcGFnZS5kaWFnbm9zdGljTG9nZ2luZ0NsaWVudCgpLmxvZ0RpYWdub3N0aWNNZXNz YWdlKERpYWdub3N0aWNMb2dnaW5nS2V5czo6cG9zdFBhZ2VCYWNrZ3JvdW5kaW5nQ1BVVXNhZ2VL ZXkoKSwgRGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjpiYWNrZ3JvdW5kQ1BVVXNhZ2VUb0RpYWdub3N0 aWNMb2dnaW5nS2V5KGNwdVVzYWdlKSwgU2hvdWxkU2FtcGxlOjpObyk7CiB9CiAKIHZvaWQgUGVy Zm9ybWFuY2VNb25pdG9yOjptZWFzdXJlUGVyQWN0aXZpdHlTdGF0ZUNQVVVzYWdlKCkK