206623 2020-01-22 15:53:01 -0800 Add an option for logging total phase times 2020-01-22 18:28:13 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1609813 0 saam 2020-01-22 15:53:01 -0800 ... 1609865 1 388490 saam 2020-01-22 17:08:11 -0800 Created attachment 388490 patch 1609867 2 388490 rmorisset 2020-01-22 17:13:22 -0800 Comment on attachment 388490 patch r=me 1609870 3 388490 keith_miller 2020-01-22 17:15:17 -0800 Comment on attachment 388490 patch View in context: https://bugs.webkit.org/attachment.cgi?id=388490&action=review r=me too with comment. > Source/JavaScriptCore/runtime/OptionsList.h:167 > + v(Bool, reportTotalPhaseTimes, false, Normal, nullptr) \ Plox add a string here that explains the difference between this only prints at the end. 1609872 4 388492 saam 2020-01-22 17:18:34 -0800 Created attachment 388492 patch for landing 1609909 5 388492 commit-queue 2020-01-22 18:27:31 -0800 Comment on attachment 388492 patch for landing Clearing flags on attachment: 388492 Committed r254957: <https://trac.webkit.org/changeset/254957> 1609910 6 commit-queue 2020-01-22 18:27:32 -0800 All reviewed patches have been landed. Closing bug. 1609911 7 webkit-bug-importer 2020-01-22 18:28:13 -0800 <rdar://problem/58820257> 388490 2020-01-22 17:08:11 -0800 2020-01-22 17:18:34 -0800 patch b-backup.diff text/plain 7320 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU0OTUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDIwLTAxLTIyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEFkZCBhbiBvcHRpb24gZm9yIGxvZ2dpbmcgdG90YWwgcGhhc2UgdGltZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjYyMworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZGZnL0RGR1BsYW4uY3BwOgor ICAgICAgICAoSlNDOjpERkc6OlBsYW46OmNvbXBpbGVJblRocmVhZEltcGwpOgorICAgICAgICAq IGpzYy5jcHA6CisgICAgICAgIChydW5KU0MpOgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9uc0xp c3QuaDoKKyAgICAgICAgKiB0b29scy9Db21waWxlclRpbWluZ1Njb3BlLmNwcDoKKyAgICAgICAg KEpTQzo6Q29tcGlsZXJUaW1pbmdTY29wZTo6Q29tcGlsZXJUaW1pbmdTY29wZSk6CisgICAgICAg IChKU0M6OkNvbXBpbGVyVGltaW5nU2NvcGU6On5Db21waWxlclRpbWluZ1Njb3BlKToKKyAgICAg ICAgKEpTQzo6bG9nVG90YWxQaGFzZVRpbWVzKToKKyAgICAgICAgKiB0b29scy9Db21waWxlclRp bWluZ1Njb3BlLmg6CisKIDIwMjAtMDEtMjIgIENhaW8gTGltYSAgPHRpY2Fpb2xpbWFAZ21haWwu Y29tPgogCiAgICAgICAgIFszMi1iaXRzXVtKSVRdIEZpeCBidWlsZCBpc3N1ZXMuCkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvanNjLmNwcAkocmV2aXNpb24gMjU0ODMxKQorKysgU291cmNlL0phdmFTY3JpcHRD b3JlL2pzYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRlICJD b2RlQmxvY2suaCIKICNpbmNsdWRlICJDb2RlQ2FjaGUuaCIKICNpbmNsdWRlICJDb21wbGV0aW9u LmgiCisjaW5jbHVkZSAiQ29tcGlsZXJUaW1pbmdTY29wZS5oIgogI2luY2x1ZGUgIkNvbmZpZ0Zp bGUuaCIKICNpbmNsdWRlICJEaXNhc3NlbWJsZXIuaCIKICNpbmNsdWRlICJFeGNlcHRpb24uaCIK QEAgLTMwODksNiArMzA5MCw5IEBAIGludCBydW5KU0MoY29uc3QgQ29tbWFuZExpbmUmIG9wdGlv bnMsIGIKICAgICAgICAgc3RkOjpzb3J0KGNvbXBpbGVUaW1lS2V5cy5iZWdpbigpLCBjb21waWxl VGltZUtleXMuZW5kKCkpOwogICAgICAgICBmb3IgKGNvbnN0IENTdHJpbmcmIGtleSA6IGNvbXBp bGVUaW1lS2V5cykKICAgICAgICAgICAgIHByaW50ZigiJTQwczogJS4zbGYgbXNcbiIsIGtleS5k YXRhKCksIGNvbXBpbGVUaW1lU3RhdHMuZ2V0KGtleSkubWlsbGlzZWNvbmRzKCkpOworCisgICAg ICAgIGlmIChPcHRpb25zOjpyZXBvcnRUb3RhbFBoYXNlVGltZXMoKSkKKyAgICAgICAgICAgIGxv Z1RvdGFsUGhhc2VUaW1lcygpOwogICAgIH0KICNlbmRpZgogCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR1BsYW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHUGxhbi5jcHAJKHJldmlzaW9uIDI1NDgzMSkKKysrIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzOCw3ICsyMzgsMTAg QEAgdm9pZCBQbGFuOjpjb21waWxlSW5UaHJlYWQoVGhyZWFkRGF0YSogdAogCiBQbGFuOjpDb21w aWxhdGlvblBhdGggUGxhbjo6Y29tcGlsZUluVGhyZWFkSW1wbCgpCiB7Ci0gICAgY2xlYW5NdXN0 SGFuZGxlVmFsdWVzSWZOZWNlc3NhcnkoKTsKKyAgICB7CisgICAgICAgIENvbXBpbGVyVGltaW5n U2NvcGUgdGltaW5nU2NvcGUoIkRGRyIsICJjbGVhbiBtdXN0IGhhbmRsZSB2YWx1ZXMiKTsKKyAg ICAgICAgY2xlYW5NdXN0SGFuZGxlVmFsdWVzSWZOZWNlc3NhcnkoKTsKKyAgICB9CiAKICAgICBp ZiAodmVyYm9zZUNvbXBpbGF0aW9uRW5hYmxlZChtX21vZGUpICYmIG1fb3NyRW50cnlCeXRlY29k ZUluZGV4KSB7CiAgICAgICAgIGRhdGFMb2coIlxuIik7CkBAIC0yNDcsNyArMjUwLDExIEBAIFBs YW46OkNvbXBpbGF0aW9uUGF0aCBQbGFuOjpjb21waWxlSW5UaHIKICAgICB9CiAKICAgICBHcmFw aCBkZmcoKm1fdm0sICp0aGlzKTsKLSAgICBwYXJzZShkZmcpOworCisgICAgeworICAgICAgICBD b21waWxlclRpbWluZ1Njb3BlIHRpbWluZ1Njb3BlKCJERkciLCAiYnl0ZWNvZGUgcGFyc2VyIik7 CisgICAgICAgIHBhcnNlKGRmZyk7CisgICAgfQogCiAgICAgbV9jb2RlQmxvY2stPnNldENhbGxl ZVNhdmVSZWdpc3RlcnMoUmVnaXN0ZXJTZXQ6OmRmZ0NhbGxlZVNhdmVSZWdpc3RlcnMoKSk7CiAK QEAgLTM4MSwxMSArMzg4LDE1IEBAIFBsYW46OkNvbXBpbGF0aW9uUGF0aCBQbGFuOjpjb21waWxl SW5UaHIKICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1XYXRjaHBvaW50Q29sbGVjdGlvbik7CiAg ICAgICAgIGR1bXBBbmRWZXJpZnlHcmFwaChkZmcsICJHcmFwaCBhZnRlciBvcHRpbWl6YXRpb246 Iik7CiAgICAgICAgIAotICAgICAgICBKSVRDb21waWxlciBkYXRhRmxvd0pJVChkZmcpOwotICAg ICAgICBpZiAobV9jb2RlQmxvY2stPmNvZGVUeXBlKCkgPT0gRnVuY3Rpb25Db2RlKQotICAgICAg ICAgICAgZGF0YUZsb3dKSVQuY29tcGlsZUZ1bmN0aW9uKCk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIGRhdGFGbG93SklULmNvbXBpbGUoKTsKKyAgICAgICAgeworICAgICAgICAgICAgQ29t cGlsZXJUaW1pbmdTY29wZSB0aW1pbmdTY29wZSgiREZHIiwgIm1hY2hpbmUgY29kZSBnZW5lcmF0 aW9uIik7CisKKyAgICAgICAgICAgIEpJVENvbXBpbGVyIGRhdGFGbG93SklUKGRmZyk7CisgICAg ICAgICAgICBpZiAobV9jb2RlQmxvY2stPmNvZGVUeXBlKCkgPT0gRnVuY3Rpb25Db2RlKQorICAg ICAgICAgICAgICAgIGRhdGFGbG93SklULmNvbXBpbGVGdW5jdGlvbigpOworICAgICAgICAgICAg ZWxzZQorICAgICAgICAgICAgICAgIGRhdGFGbG93SklULmNvbXBpbGUoKTsKKyAgICAgICAgfQog ICAgICAgICAKICAgICAgICAgcmV0dXJuIERGR1BhdGg7CiAgICAgfQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9uc0xpc3QuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zTGlzdC5oCShyZXZpc2lvbiAyNTQ4MzEpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zTGlzdC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNjQsNiArMTY0LDcgQEAgY29uc3RleHByIGJvb2wgZW5hYmxlV2ViQXNzZW1ibHlT dHJlYW1pbgogICAgIHYoQm9vbCwgcmVwb3J0REZHQ29tcGlsZVRpbWVzLCBmYWxzZSwgTm9ybWFs LCAiZHVtcHMgSlMgZnVuY3Rpb24gc2lnbmF0dXJlIGFuZCB0aGUgdGltZSBpdCB0b29rIHRvIERG RyBhbmQgRlRMIGNvbXBpbGUiKSBcCiAgICAgdihCb29sLCByZXBvcnRGVExDb21waWxlVGltZXMs IGZhbHNlLCBOb3JtYWwsICJkdW1wcyBKUyBmdW5jdGlvbiBzaWduYXR1cmUgYW5kIHRoZSB0aW1l IGl0IHRvb2sgdG8gRlRMIGNvbXBpbGUiKSBcCiAgICAgdihCb29sLCByZXBvcnRUb3RhbENvbXBp bGVUaW1lcywgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAorICAgIHYoQm9vbCwgcmVwb3J0VG90 YWxQaGFzZVRpbWVzLCBmYWxzZSwgTm9ybWFsLCBudWxscHRyKSBcCiAgICAgdihCb29sLCByZXBv cnRQYXJzZVRpbWVzLCBmYWxzZSwgTm9ybWFsLCAiZHVtcHMgSlMgZnVuY3Rpb24gc2lnbmF0dXJl IGFuZCB0aGUgdGltZSBpdCB0b29rIHRvIHBhcnNlIikgXAogICAgIHYoQm9vbCwgcmVwb3J0Qnl0 ZWNvZGVDb21waWxlVGltZXMsIGZhbHNlLCBOb3JtYWwsICJkdW1wcyBKUyBmdW5jdGlvbiBzaWdu YXR1cmUgYW5kIHRoZSB0aW1lIGl0IHRvb2sgdG8gYnl0ZWNvZGUgY29tcGlsZSIpIFwKICAgICB2 KEJvb2wsIGNvdW50UGFyc2VUaW1lcywgZmFsc2UsIE5vcm1hbCwgImNvdW50cyBwYXJzZSB0aW1l cyIpIFwKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9Db21waWxlclRpbWluZ1Nj b3BlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvQ29tcGls ZXJUaW1pbmdTY29wZS5jcHAJKHJldmlzaW9uIDI1NDgzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS90b29scy9Db21waWxlclRpbWluZ1Njb3BlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQs MTEgKzQ0LDI4IEBAIHB1YmxpYzoKICAgICBTZWNvbmRzIGFkZFRvVG90YWwoY29uc3QgY2hhciog Y29tcGlsZXJOYW1lLCBjb25zdCBjaGFyKiBuYW1lLCBTZWNvbmRzIGR1cmF0aW9uKQogICAgIHsK ICAgICAgICAgYXV0byBsb2NrZXIgPSBob2xkTG9jayhsb2NrKTsKLSAgICAgICAgcmV0dXJuIHRv dGFscy5hZGQoc3RkOjptYWtlX3BhaXIoY29tcGlsZXJOYW1lLCBuYW1lKSwgU2Vjb25kcygwKSku aXRlcmF0b3ItPnZhbHVlICs9IGR1cmF0aW9uOworCisgICAgICAgIGZvciAoYXV0byYgdHVwbGUg OiB0b3RhbHMpIHsKKyAgICAgICAgICAgIGlmIChTdHJpbmcoc3RkOjpnZXQ8MD4odHVwbGUpKSA9 PSBTdHJpbmcoY29tcGlsZXJOYW1lKSAmJiBTdHJpbmcoc3RkOjpnZXQ8MT4odHVwbGUpKSA9PSBT dHJpbmcobmFtZSkpIHsKKyAgICAgICAgICAgICAgICBzdGQ6OmdldDwyPih0dXBsZSkgKz0gZHVy YXRpb247CisgICAgICAgICAgICAgICAgcmV0dXJuIHN0ZDo6Z2V0PDI+KHR1cGxlKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIHRvdGFscy5hcHBlbmQoeyBjb21waWxlck5h bWUsIG5hbWUsIGR1cmF0aW9uIH0pOworICAgICAgICByZXR1cm4gZHVyYXRpb247CisgICAgfQor CisgICAgdm9pZCBsb2dUb3RhbHMoKQorICAgIHsKKyAgICAgICAgZm9yIChhdXRvJiB0dXBsZSA6 IHRvdGFscykgeworICAgICAgICAgICAgZGF0YUxvZ0xuKAorICAgICAgICAgICAgICAgICJbIiwg c3RkOjpnZXQ8MD4odHVwbGUpLCAiXSAiLCBzdGQ6OmdldDwxPih0dXBsZSksICIgdG90YWwgbXM6 ICIsIHN0ZDo6Z2V0PDI+KHR1cGxlKS5taWxsaXNlY29uZHMoKSk7CisgICAgICAgIH0KICAgICB9 CiAgICAgCiBwcml2YXRlOgotICAgIEhhc2hNYXA8c3RkOjpwYWlyPGNvbnN0IGNoYXIqLCBjb25z dCBjaGFyKj4sIFNlY29uZHM+IHRvdGFsczsKKyAgICBWZWN0b3I8c3RkOjp0dXBsZTxjb25zdCBj aGFyKiwgY29uc3QgY2hhciosIFNlY29uZHM+PiB0b3RhbHM7CiAgICAgTG9jayBsb2NrOwogfTsK IApAQCAtNjQsMjEgKzgxLDI3IEBAIENvbXBpbGVyVGltaW5nU2NvcGU6OkNvbXBpbGVyVGltaW5n U2NvcGUKICAgICA6IG1fY29tcGlsZXJOYW1lKGNvbXBpbGVyTmFtZSkKICAgICAsIG1fbmFtZShu YW1lKQogewotICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpsb2dQaGFzZVRpbWVzKCkpKQorICAg IGlmIChVTkxJS0VMWShPcHRpb25zOjpsb2dQaGFzZVRpbWVzKCkgfHwgT3B0aW9uczo6cmVwb3J0 VG90YWxQaGFzZVRpbWVzKCkpKQogICAgICAgICBtX2JlZm9yZSA9IE1vbm90b25pY1RpbWU6Om5v dygpOwogfQogCiBDb21waWxlclRpbWluZ1Njb3BlOjp+Q29tcGlsZXJUaW1pbmdTY29wZSgpCiB7 Ci0gICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OmxvZ1BoYXNlVGltZXMoKSkpIHsKKyAgICBpZiAo VU5MSUtFTFkoT3B0aW9uczo6bG9nUGhhc2VUaW1lcygpIHx8IE9wdGlvbnM6OnJlcG9ydFRvdGFs UGhhc2VUaW1lcygpKSkgewogICAgICAgICBTZWNvbmRzIGR1cmF0aW9uID0gTW9ub3RvbmljVGlt ZTo6bm93KCkgLSBtX2JlZm9yZTsKLSAgICAgICAgZGF0YUxvZygKLSAgICAgICAgICAgICJbIiwg bV9jb21waWxlck5hbWUsICJdICIsIG1fbmFtZSwgIiB0b29rOiAiLCBkdXJhdGlvbi5taWxsaXNl Y29uZHMoKSwgIiBtcyAiLAotICAgICAgICAgICAgIih0b3RhbDogIiwgY29tcGlsZXJUaW1pbmdT Y29wZVN0YXRlKCkuYWRkVG9Ub3RhbChtX2NvbXBpbGVyTmFtZSwgbV9uYW1lLCBkdXJhdGlvbiku bWlsbGlzZWNvbmRzKCksCi0gICAgICAgICAgICAiIG1zKS5cbiIpOworICAgICAgICBhdXRvIHRv dGFsID0gY29tcGlsZXJUaW1pbmdTY29wZVN0YXRlKCkuYWRkVG9Ub3RhbChtX2NvbXBpbGVyTmFt ZSwgbV9uYW1lLCBkdXJhdGlvbik7CisgICAgICAgIGlmIChPcHRpb25zOjpsb2dQaGFzZVRpbWVz KCkpIHsKKyAgICAgICAgICAgIGRhdGFMb2coCisgICAgICAgICAgICAgICAgIlsiLCBtX2NvbXBp bGVyTmFtZSwgIl0gIiwgbV9uYW1lLCAiIHRvb2s6ICIsIGR1cmF0aW9uLm1pbGxpc2Vjb25kcygp LCAiIG1zICIsCisgICAgICAgICAgICAgICAgIih0b3RhbDogIiwgdG90YWwubWlsbGlzZWNvbmRz KCksCisgICAgICAgICAgICAgICAgIiBtcykuXG4iKTsKKyAgICAgICAgfQogICAgIH0KIH0KIAot fSAvLyBuYW1lc3BhY2UgSlNDCi0KK3ZvaWQgbG9nVG90YWxQaGFzZVRpbWVzKCkKK3sKKyAgICBj b21waWxlclRpbWluZ1Njb3BlU3RhdGUoKS5sb2dUb3RhbHMoKTsKK30KIAorfSAvLyBuYW1lc3Bh Y2UgSlNDCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdG9vbHMvQ29tcGlsZXJUaW1pbmdT Y29wZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90b29scy9Db21waWxl clRpbWluZ1Njb3BlLmgJKHJldmlzaW9uIDI1NDgzMSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS90b29scy9Db21waWxlclRpbWluZ1Njb3BlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDUgKzQ3 LDYgQEAgcHJpdmF0ZToKICAgICBNb25vdG9uaWNUaW1lIG1fYmVmb3JlOwogfTsKIAotfSAvLyBu YW1lc3BhY2UgSlNDCitKU19FWFBPUlRfUFJJVkFURSB2b2lkIGxvZ1RvdGFsUGhhc2VUaW1lcygp OwogCit9IC8vIG5hbWVzcGFjZSBKU0MK 388492 2020-01-22 17:18:34 -0800 2020-01-22 18:27:31 -0800 patch for landing b-backup.diff text/plain 7400 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjU0OTUzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBA CisyMDIwLTAxLTIyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEFkZCBhbiBvcHRpb24gZm9yIGxvZ2dpbmcgdG90YWwgcGhhc2UgdGltZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjYyMworCisgICAgICAgIFJl dmlld2VkIGJ5IFJvYmluIE1vcmlzc2V0IGFuZCBLZWl0aCBNaWxsZXIuCisKKyAgICAgICAgKiBk ZmcvREZHUGxhbi5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6UGxhbjo6Y29tcGlsZUluVGhyZWFk SW1wbCk6CisgICAgICAgICoganNjLmNwcDoKKyAgICAgICAgKHJ1bkpTQyk6CisgICAgICAgICog cnVudGltZS9PcHRpb25zTGlzdC5oOgorICAgICAgICAqIHRvb2xzL0NvbXBpbGVyVGltaW5nU2Nv cGUuY3BwOgorICAgICAgICAoSlNDOjpDb21waWxlclRpbWluZ1Njb3BlOjpDb21waWxlclRpbWlu Z1Njb3BlKToKKyAgICAgICAgKEpTQzo6Q29tcGlsZXJUaW1pbmdTY29wZTo6fkNvbXBpbGVyVGlt aW5nU2NvcGUpOgorICAgICAgICAoSlNDOjpsb2dUb3RhbFBoYXNlVGltZXMpOgorICAgICAgICAq IHRvb2xzL0NvbXBpbGVyVGltaW5nU2NvcGUuaDoKKwogMjAyMC0wMS0yMiAgQ2FpbyBMaW1hICA8 dGljYWlvbGltYUBnbWFpbC5jb20+CiAKICAgICAgICAgWzMyLWJpdHNdW0pJVF0gRml4IGJ1aWxk IGlzc3Vlcy4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCShyZXZpc2lvbiAyNTQ4MzEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzEsNiArMzEs NyBAQAogI2luY2x1ZGUgIkNhdGNoU2NvcGUuaCIKICNpbmNsdWRlICJDb2RlQmxvY2suaCIKICNp bmNsdWRlICJDb2RlQ2FjaGUuaCIKKyNpbmNsdWRlICJDb21waWxlclRpbWluZ1Njb3BlLmgiCiAj aW5jbHVkZSAiQ29tcGxldGlvbi5oIgogI2luY2x1ZGUgIkNvbmZpZ0ZpbGUuaCIKICNpbmNsdWRl ICJEaXNhc3NlbWJsZXIuaCIKQEAgLTMwODksNiArMzA5MCw5IEBAIGludCBydW5KU0MoY29uc3Qg Q29tbWFuZExpbmUmIG9wdGlvbnMsIGIKICAgICAgICAgc3RkOjpzb3J0KGNvbXBpbGVUaW1lS2V5 cy5iZWdpbigpLCBjb21waWxlVGltZUtleXMuZW5kKCkpOwogICAgICAgICBmb3IgKGNvbnN0IENT dHJpbmcmIGtleSA6IGNvbXBpbGVUaW1lS2V5cykKICAgICAgICAgICAgIHByaW50ZigiJTQwczog JS4zbGYgbXNcbiIsIGtleS5kYXRhKCksIGNvbXBpbGVUaW1lU3RhdHMuZ2V0KGtleSkubWlsbGlz ZWNvbmRzKCkpOworCisgICAgICAgIGlmIChPcHRpb25zOjpyZXBvcnRUb3RhbFBoYXNlVGltZXMo KSkKKyAgICAgICAgICAgIGxvZ1RvdGFsUGhhc2VUaW1lcygpOwogICAgIH0KICNlbmRpZgogCklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1BsYW4uY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHJldmlzaW9uIDI1NDgzMSkK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUGxhbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTIzOCw3ICsyMzgsMTAgQEAgdm9pZCBQbGFuOjpjb21waWxlSW5UaHJlYWQoVGhyZWFkRGF0 YSogdAogCiBQbGFuOjpDb21waWxhdGlvblBhdGggUGxhbjo6Y29tcGlsZUluVGhyZWFkSW1wbCgp CiB7Ci0gICAgY2xlYW5NdXN0SGFuZGxlVmFsdWVzSWZOZWNlc3NhcnkoKTsKKyAgICB7CisgICAg ICAgIENvbXBpbGVyVGltaW5nU2NvcGUgdGltaW5nU2NvcGUoIkRGRyIsICJjbGVhbiBtdXN0IGhh bmRsZSB2YWx1ZXMiKTsKKyAgICAgICAgY2xlYW5NdXN0SGFuZGxlVmFsdWVzSWZOZWNlc3Nhcnko KTsKKyAgICB9CiAKICAgICBpZiAodmVyYm9zZUNvbXBpbGF0aW9uRW5hYmxlZChtX21vZGUpICYm IG1fb3NyRW50cnlCeXRlY29kZUluZGV4KSB7CiAgICAgICAgIGRhdGFMb2coIlxuIik7CkBAIC0y NDcsNyArMjUwLDExIEBAIFBsYW46OkNvbXBpbGF0aW9uUGF0aCBQbGFuOjpjb21waWxlSW5UaHIK ICAgICB9CiAKICAgICBHcmFwaCBkZmcoKm1fdm0sICp0aGlzKTsKLSAgICBwYXJzZShkZmcpOwor CisgICAgeworICAgICAgICBDb21waWxlclRpbWluZ1Njb3BlIHRpbWluZ1Njb3BlKCJERkciLCAi Ynl0ZWNvZGUgcGFyc2VyIik7CisgICAgICAgIHBhcnNlKGRmZyk7CisgICAgfQogCiAgICAgbV9j b2RlQmxvY2stPnNldENhbGxlZVNhdmVSZWdpc3RlcnMoUmVnaXN0ZXJTZXQ6OmRmZ0NhbGxlZVNh dmVSZWdpc3RlcnMoKSk7CiAKQEAgLTM4MSwxMSArMzg4LDE1IEBAIFBsYW46OkNvbXBpbGF0aW9u UGF0aCBQbGFuOjpjb21waWxlSW5UaHIKICAgICAgICAgUlVOX1BIQVNFKHBlcmZvcm1XYXRjaHBv aW50Q29sbGVjdGlvbik7CiAgICAgICAgIGR1bXBBbmRWZXJpZnlHcmFwaChkZmcsICJHcmFwaCBh ZnRlciBvcHRpbWl6YXRpb246Iik7CiAgICAgICAgIAotICAgICAgICBKSVRDb21waWxlciBkYXRh Rmxvd0pJVChkZmcpOwotICAgICAgICBpZiAobV9jb2RlQmxvY2stPmNvZGVUeXBlKCkgPT0gRnVu Y3Rpb25Db2RlKQotICAgICAgICAgICAgZGF0YUZsb3dKSVQuY29tcGlsZUZ1bmN0aW9uKCk7Ci0g ICAgICAgIGVsc2UKLSAgICAgICAgICAgIGRhdGFGbG93SklULmNvbXBpbGUoKTsKKyAgICAgICAg eworICAgICAgICAgICAgQ29tcGlsZXJUaW1pbmdTY29wZSB0aW1pbmdTY29wZSgiREZHIiwgIm1h Y2hpbmUgY29kZSBnZW5lcmF0aW9uIik7CisKKyAgICAgICAgICAgIEpJVENvbXBpbGVyIGRhdGFG bG93SklUKGRmZyk7CisgICAgICAgICAgICBpZiAobV9jb2RlQmxvY2stPmNvZGVUeXBlKCkgPT0g RnVuY3Rpb25Db2RlKQorICAgICAgICAgICAgICAgIGRhdGFGbG93SklULmNvbXBpbGVGdW5jdGlv bigpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGRhdGFGbG93SklULmNvbXBp bGUoKTsKKyAgICAgICAgfQogICAgICAgICAKICAgICAgICAgcmV0dXJuIERGR1BhdGg7CiAgICAg fQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9uc0xpc3QuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25zTGlzdC5oCShy ZXZpc2lvbiAyNTQ4MzEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRpb25z TGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjQsNiArMTY0LDcgQEAgY29uc3RleHByIGJvb2wg ZW5hYmxlV2ViQXNzZW1ibHlTdHJlYW1pbgogICAgIHYoQm9vbCwgcmVwb3J0REZHQ29tcGlsZVRp bWVzLCBmYWxzZSwgTm9ybWFsLCAiZHVtcHMgSlMgZnVuY3Rpb24gc2lnbmF0dXJlIGFuZCB0aGUg dGltZSBpdCB0b29rIHRvIERGRyBhbmQgRlRMIGNvbXBpbGUiKSBcCiAgICAgdihCb29sLCByZXBv cnRGVExDb21waWxlVGltZXMsIGZhbHNlLCBOb3JtYWwsICJkdW1wcyBKUyBmdW5jdGlvbiBzaWdu YXR1cmUgYW5kIHRoZSB0aW1lIGl0IHRvb2sgdG8gRlRMIGNvbXBpbGUiKSBcCiAgICAgdihCb29s LCByZXBvcnRUb3RhbENvbXBpbGVUaW1lcywgZmFsc2UsIE5vcm1hbCwgbnVsbHB0cikgXAorICAg IHYoQm9vbCwgcmVwb3J0VG90YWxQaGFzZVRpbWVzLCBmYWxzZSwgTm9ybWFsLCAiVGhpcyBwcmlu dHMgcGhhc2UgdGltZXMgYXQgdGhlIGVuZCBvZiBydW5uaW5nIHNjcmlwdCBpbnNpZGUganNjLmNw cCIpIFwKICAgICB2KEJvb2wsIHJlcG9ydFBhcnNlVGltZXMsIGZhbHNlLCBOb3JtYWwsICJkdW1w cyBKUyBmdW5jdGlvbiBzaWduYXR1cmUgYW5kIHRoZSB0aW1lIGl0IHRvb2sgdG8gcGFyc2UiKSBc CiAgICAgdihCb29sLCByZXBvcnRCeXRlY29kZUNvbXBpbGVUaW1lcywgZmFsc2UsIE5vcm1hbCwg ImR1bXBzIEpTIGZ1bmN0aW9uIHNpZ25hdHVyZSBhbmQgdGhlIHRpbWUgaXQgdG9vayB0byBieXRl Y29kZSBjb21waWxlIikgXAogICAgIHYoQm9vbCwgY291bnRQYXJzZVRpbWVzLCBmYWxzZSwgTm9y bWFsLCAiY291bnRzIHBhcnNlIHRpbWVzIikgXApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3Rvb2xzL0NvbXBpbGVyVGltaW5nU2NvcGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS90b29scy9Db21waWxlclRpbWluZ1Njb3BlLmNwcAkocmV2aXNpb24gMjU0ODMx KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0NvbXBpbGVyVGltaW5nU2NvcGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00NCwxMSArNDQsMjggQEAgcHVibGljOgogICAgIFNlY29uZHMg YWRkVG9Ub3RhbChjb25zdCBjaGFyKiBjb21waWxlck5hbWUsIGNvbnN0IGNoYXIqIG5hbWUsIFNl Y29uZHMgZHVyYXRpb24pCiAgICAgewogICAgICAgICBhdXRvIGxvY2tlciA9IGhvbGRMb2NrKGxv Y2spOwotICAgICAgICByZXR1cm4gdG90YWxzLmFkZChzdGQ6Om1ha2VfcGFpcihjb21waWxlck5h bWUsIG5hbWUpLCBTZWNvbmRzKDApKS5pdGVyYXRvci0+dmFsdWUgKz0gZHVyYXRpb247CisKKyAg ICAgICAgZm9yIChhdXRvJiB0dXBsZSA6IHRvdGFscykgeworICAgICAgICAgICAgaWYgKFN0cmlu ZyhzdGQ6OmdldDwwPih0dXBsZSkpID09IFN0cmluZyhjb21waWxlck5hbWUpICYmIFN0cmluZyhz dGQ6OmdldDwxPih0dXBsZSkpID09IFN0cmluZyhuYW1lKSkgeworICAgICAgICAgICAgICAgIHN0 ZDo6Z2V0PDI+KHR1cGxlKSArPSBkdXJhdGlvbjsKKyAgICAgICAgICAgICAgICByZXR1cm4gc3Rk OjpnZXQ8Mj4odHVwbGUpOworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgdG90 YWxzLmFwcGVuZCh7IGNvbXBpbGVyTmFtZSwgbmFtZSwgZHVyYXRpb24gfSk7CisgICAgICAgIHJl dHVybiBkdXJhdGlvbjsKKyAgICB9CisKKyAgICB2b2lkIGxvZ1RvdGFscygpCisgICAgeworICAg ICAgICBmb3IgKGF1dG8mIHR1cGxlIDogdG90YWxzKSB7CisgICAgICAgICAgICBkYXRhTG9nTG4o CisgICAgICAgICAgICAgICAgIlsiLCBzdGQ6OmdldDwwPih0dXBsZSksICJdICIsIHN0ZDo6Z2V0 PDE+KHR1cGxlKSwgIiB0b3RhbCBtczogIiwgc3RkOjpnZXQ8Mj4odHVwbGUpLm1pbGxpc2Vjb25k cygpKTsKKyAgICAgICAgfQogICAgIH0KICAgICAKIHByaXZhdGU6Ci0gICAgSGFzaE1hcDxzdGQ6 OnBhaXI8Y29uc3QgY2hhciosIGNvbnN0IGNoYXIqPiwgU2Vjb25kcz4gdG90YWxzOworICAgIFZl Y3RvcjxzdGQ6OnR1cGxlPGNvbnN0IGNoYXIqLCBjb25zdCBjaGFyKiwgU2Vjb25kcz4+IHRvdGFs czsKICAgICBMb2NrIGxvY2s7CiB9OwogCkBAIC02NCwyMSArODEsMjcgQEAgQ29tcGlsZXJUaW1p bmdTY29wZTo6Q29tcGlsZXJUaW1pbmdTY29wZQogICAgIDogbV9jb21waWxlck5hbWUoY29tcGls ZXJOYW1lKQogICAgICwgbV9uYW1lKG5hbWUpCiB7Ci0gICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6 OmxvZ1BoYXNlVGltZXMoKSkpCisgICAgaWYgKFVOTElLRUxZKE9wdGlvbnM6OmxvZ1BoYXNlVGlt ZXMoKSB8fCBPcHRpb25zOjpyZXBvcnRUb3RhbFBoYXNlVGltZXMoKSkpCiAgICAgICAgIG1fYmVm b3JlID0gTW9ub3RvbmljVGltZTo6bm93KCk7CiB9CiAKIENvbXBpbGVyVGltaW5nU2NvcGU6On5D b21waWxlclRpbWluZ1Njb3BlKCkKIHsKLSAgICBpZiAoVU5MSUtFTFkoT3B0aW9uczo6bG9nUGhh c2VUaW1lcygpKSkgeworICAgIGlmIChVTkxJS0VMWShPcHRpb25zOjpsb2dQaGFzZVRpbWVzKCkg fHwgT3B0aW9uczo6cmVwb3J0VG90YWxQaGFzZVRpbWVzKCkpKSB7CiAgICAgICAgIFNlY29uZHMg ZHVyYXRpb24gPSBNb25vdG9uaWNUaW1lOjpub3coKSAtIG1fYmVmb3JlOwotICAgICAgICBkYXRh TG9nKAotICAgICAgICAgICAgIlsiLCBtX2NvbXBpbGVyTmFtZSwgIl0gIiwgbV9uYW1lLCAiIHRv b2s6ICIsIGR1cmF0aW9uLm1pbGxpc2Vjb25kcygpLCAiIG1zICIsCi0gICAgICAgICAgICAiKHRv dGFsOiAiLCBjb21waWxlclRpbWluZ1Njb3BlU3RhdGUoKS5hZGRUb1RvdGFsKG1fY29tcGlsZXJO YW1lLCBtX25hbWUsIGR1cmF0aW9uKS5taWxsaXNlY29uZHMoKSwKLSAgICAgICAgICAgICIgbXMp LlxuIik7CisgICAgICAgIGF1dG8gdG90YWwgPSBjb21waWxlclRpbWluZ1Njb3BlU3RhdGUoKS5h ZGRUb1RvdGFsKG1fY29tcGlsZXJOYW1lLCBtX25hbWUsIGR1cmF0aW9uKTsKKyAgICAgICAgaWYg KE9wdGlvbnM6OmxvZ1BoYXNlVGltZXMoKSkgeworICAgICAgICAgICAgZGF0YUxvZygKKyAgICAg ICAgICAgICAgICAiWyIsIG1fY29tcGlsZXJOYW1lLCAiXSAiLCBtX25hbWUsICIgdG9vazogIiwg ZHVyYXRpb24ubWlsbGlzZWNvbmRzKCksICIgbXMgIiwKKyAgICAgICAgICAgICAgICAiKHRvdGFs OiAiLCB0b3RhbC5taWxsaXNlY29uZHMoKSwKKyAgICAgICAgICAgICAgICAiIG1zKS5cbiIpOwor ICAgICAgICB9CiAgICAgfQogfQogCi19IC8vIG5hbWVzcGFjZSBKU0MKLQordm9pZCBsb2dUb3Rh bFBoYXNlVGltZXMoKQoreworICAgIGNvbXBpbGVyVGltaW5nU2NvcGVTdGF0ZSgpLmxvZ1RvdGFs cygpOworfQogCit9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS90b29scy9Db21waWxlclRpbWluZ1Njb3BlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3Rvb2xzL0NvbXBpbGVyVGltaW5nU2NvcGUuaAkocmV2aXNpb24gMjU0ODMxKQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Rvb2xzL0NvbXBpbGVyVGltaW5nU2NvcGUuaAkod29y a2luZyBjb3B5KQpAQCAtNDcsNSArNDcsNiBAQCBwcml2YXRlOgogICAgIE1vbm90b25pY1RpbWUg bV9iZWZvcmU7CiB9OwogCi19IC8vIG5hbWVzcGFjZSBKU0MKK0pTX0VYUE9SVF9QUklWQVRFIHZv aWQgbG9nVG90YWxQaGFzZVRpbWVzKCk7CiAKK30gLy8gbmFtZXNwYWNlIEpTQwo=