169424 2017-03-09 12:28:03 -0800 Use const AbstractLocker& (instead of const LockHolder&) in more places. 2017-03-09 13:07:15 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo commit-queue dbates keith_miller msaboff saam oldest_to_newest 1285450 0 mark.lam 2017-03-09 12:28:03 -0800 This is the modern idiom, and it makes some of these functions more flexible to use. 1285455 1 303950 mark.lam 2017-03-09 12:29:34 -0800 Created attachment 303950 proposed patch. 1285496 2 303950 fpizlo 2017-03-09 12:59:47 -0800 Comment on attachment 303950 proposed patch. Nice! 1285509 3 mark.lam 2017-03-09 13:07:15 -0800 Thanks for the review. Landed in r213657: <http://trac.webkit.org/r213657>. 303950 2017-03-09 12:29:34 -0800 2017-03-09 12:59:47 -0800 proposed patch. bug-169424.patch text/plain 17645 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjEzNjU0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQxIEBA CisyMDE3LTAzLTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBV c2UgY29uc3QgQWJzdHJhY3RMb2NrZXImIChpbnN0ZWFkIG9mIGNvbnN0IExvY2tIb2xkZXImKSBp biBtb3JlIHBsYWNlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2OTQyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaGVhcC9Db2RlQmxvY2tTZXQuY3BwOgorICAgICAgICAoSlNDOjpDb2RlQmxvY2tT ZXQ6OnByb21vdGVZb3VuZ0NvZGVCbG9ja3MpOgorICAgICAgICAqIGhlYXAvQ29kZUJsb2NrU2V0 Lmg6CisgICAgICAgICogaGVhcC9Db2RlQmxvY2tTZXRJbmxpbmVzLmg6CisgICAgICAgIChKU0M6 OkNvZGVCbG9ja1NldDo6bWFyayk6CisgICAgICAgICogaGVhcC9Db25zZXJ2YXRpdmVSb290cy5j cHA6CisgICAgICAgIChKU0M6OkNvbXBvc2l0ZU1hcmtIb29rOjpDb21wb3NpdGVNYXJrSG9vayk6 CisgICAgICAgICogaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwOgorICAgICAgICAoSlNDOjpN YWNoaW5lVGhyZWFkczo6dHJ5Q29weU90aGVyVGhyZWFkU3RhY2tzKToKKyAgICAgICAgKiBoZWFw L01hY2hpbmVTdGFja01hcmtlci5oOgorICAgICAgICAqIHByb2ZpbGVyL1Byb2ZpbGVyRGF0YWJh c2UuY3BwOgorICAgICAgICAoSlNDOjpQcm9maWxlcjo6RGF0YWJhc2U6OmVuc3VyZUJ5dGVjb2Rl c0Zvcik6CisgICAgICAgICogcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFzZS5oOgorICAgICAgICAq IHJ1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5jcHA6CisgICAgICAgIChKU0M6OkZyYW1lV2Fsa2Vy OjpGcmFtZVdhbGtlcik6CisgICAgICAgIChKU0M6OkNGcmFtZVdhbGtlcjo6Q0ZyYW1lV2Fsa2Vy KToKKyAgICAgICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6Y3JlYXRlVGhyZWFkSWZOZWNlc3Nh cnkpOgorICAgICAgICAoSlNDOjpTYW1wbGluZ1Byb2ZpbGVyOjp0YWtlU2FtcGxlKToKKyAgICAg ICAgKEpTQzo6U2FtcGxpbmdQcm9maWxlcjo6c3RhcnQpOgorICAgICAgICAoSlNDOjpTYW1wbGlu Z1Byb2ZpbGVyOjpwYXVzZSk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6Om5vdGlj ZUN1cnJlbnRUaHJlYWRBc0pTQ0V4ZWN1dGlvblRocmVhZCk6CisgICAgICAgIChKU0M6OlNhbXBs aW5nUHJvZmlsZXI6OmNsZWFyRGF0YSk6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6 OnJlbGVhc2VTdGFja1RyYWNlcyk6CisgICAgICAgICogcnVudGltZS9TYW1wbGluZ1Byb2ZpbGVy Lmg6CisgICAgICAgIChKU0M6OlNhbXBsaW5nUHJvZmlsZXI6OnNldFN0b3BXYXRjaCk6CisgICAg ICAgICogd2FzbS9XYXNtTWVtb3J5LmNwcDoKKyAgICAgICAgKEpTQzo6V2FzbTo6YXZhaWxhYmxl RmFzdE1lbW9yaWVzKToKKyAgICAgICAgKEpTQzo6V2FzbTo6YWN0aXZlRmFzdE1lbW9yaWVzKToK KyAgICAgICAgKEpTQzo6V2FzbTo6dmlld0FjdGl2ZUZhc3RNZW1vcmllcyk6CisgICAgICAgICog d2FzbS9XYXNtTWVtb3J5Lmg6CisKIDIwMTctMDMtMDkgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBh cHBsZS5jb20+CiAKICAgICAgICAgV2ViQXNzZW1ibHk6IE1ha2UgdGhlIFVuaXR5IEFuZ3J5Qm90 cyBkZW1vIHJ1bgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29kZUJsb2NrU2V0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9Db2RlQmxvY2tT ZXQuY3BwCShyZXZpc2lvbiAyMTM2NTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9D b2RlQmxvY2tTZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw3ICs0Nyw3IEBAIHZvaWQgQ29k ZUJsb2NrU2V0OjphZGQoQ29kZUJsb2NrKiBjb2RlQmwKICAgICBBU1NFUlRfVU5VU0VEKGlzTmV3 RW50cnksIGlzTmV3RW50cnkpOwogfQogCi12b2lkIENvZGVCbG9ja1NldDo6cHJvbW90ZVlvdW5n Q29kZUJsb2Nrcyhjb25zdCBMb2NrSG9sZGVyJikKK3ZvaWQgQ29kZUJsb2NrU2V0Ojpwcm9tb3Rl WW91bmdDb2RlQmxvY2tzKGNvbnN0IEFic3RyYWN0TG9ja2VyJikKIHsKICAgICBBU1NFUlQobV9s b2NrLmlzTG9ja2VkKCkpOwogICAgIG1fb2xkQ29kZUJsb2Nrcy5hZGQobV9uZXdDb2RlQmxvY2tz LmJlZ2luKCksIG1fbmV3Q29kZUJsb2Nrcy5lbmQoKSk7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9Db2RlQmxvY2tTZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9Db2RlQmxvY2tTZXQuaAkocmV2aXNpb24gMjEzNjUyKQorKysgU291cmNlL0ph dmFTY3JpcHRDb3JlL2hlYXAvQ29kZUJsb2NrU2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDkg KzYyLDkgQEAgcHVibGljOgogICAgIC8vIE1hcmsgYSBwb2ludGVyIHRoYXQgbWF5IGJlIGEgQ29k ZUJsb2NrIHRoYXQgYmVsb25ncyB0byB0aGUgc2V0IG9mIERGRwogICAgIC8vIGJsb2Nrcy4gVGhp cyBpcyBkZWZpbmVkIGluIENvZGVCbG9jay5oLgogcHJpdmF0ZToKLSAgICB2b2lkIG1hcmsoY29u c3QgTG9ja0hvbGRlciYsIENvZGVCbG9jayogY2FuZGlkYXRlQ29kZUJsb2NrKTsKKyAgICB2b2lk IG1hcmsoY29uc3QgQWJzdHJhY3RMb2NrZXImLCBDb2RlQmxvY2sqIGNhbmRpZGF0ZUNvZGVCbG9j ayk7CiBwdWJsaWM6Ci0gICAgdm9pZCBtYXJrKGNvbnN0IExvY2tIb2xkZXImLCB2b2lkKiBjYW5k aWRhdGVDb2RlQmxvY2spOworICAgIHZvaWQgbWFyayhjb25zdCBBYnN0cmFjdExvY2tlciYsIHZv aWQqIGNhbmRpZGF0ZUNvZGVCbG9jayk7CiAgICAgCiAgICAgLy8gRGVsZXRlIGFsbCBjb2RlIGJs b2NrcyB0aGF0IGFyZSBvbmx5IHJlZmVyZW5jZWQgYnkgdGhpcyBzZXQgKGkuZS4gb3duZWQKICAg ICAvLyBieSB0aGlzIHNldCksIGFuZCB0aGF0IGhhdmUgbm90IGJlZW4gbWFya2VkLgpAQCAtODYs NyArODYsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkdW1wKFByaW50U3RyZWFtJikgY29uc3Q7CiAK IHByaXZhdGU6Ci0gICAgdm9pZCBwcm9tb3RlWW91bmdDb2RlQmxvY2tzKGNvbnN0IExvY2tIb2xk ZXImKTsKKyAgICB2b2lkIHByb21vdGVZb3VuZ0NvZGVCbG9ja3MoY29uc3QgQWJzdHJhY3RMb2Nr ZXImKTsKIAogICAgIEhhc2hTZXQ8Q29kZUJsb2NrKj4gbV9vbGRDb2RlQmxvY2tzOwogICAgIEhh c2hTZXQ8Q29kZUJsb2NrKj4gbV9uZXdDb2RlQmxvY2tzOwpJbmRleDogU291cmNlL0phdmFTY3Jp cHRDb3JlL2hlYXAvQ29kZUJsb2NrU2V0SW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9oZWFwL0NvZGVCbG9ja1NldElubGluZXMuaAkocmV2aXNpb24gMjEzNjUy KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29kZUJsb2NrU2V0SW5saW5lcy5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMyw3ICszMyw3IEBACiAKIG5hbWVzcGFjZSBKU0MgewogCi1pbmxp bmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsoY29uc3QgTG9ja0hvbGRlciYgbG9ja2VyLCB2b2lk KiBjYW5kaWRhdGVDb2RlQmxvY2spCitpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsoY29u c3QgQWJzdHJhY3RMb2NrZXImIGxvY2tlciwgdm9pZCogY2FuZGlkYXRlQ29kZUJsb2NrKQogewog ICAgIEFTU0VSVChtX2xvY2suaXNMb2NrZWQoKSk7CiAgICAgLy8gV2UgaGF2ZSB0byBjaGVjayBm b3IgMCBhbmQgLTEgYmVjYXVzZSB0aG9zZSBhcmUgdXNlZCBieSB0aGUgSGFzaE1hcCBhcyBtYXJr ZXJzLgpAQCAtNTIsNyArNTIsNyBAQCBpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsoY29u c3QgTG9jCiAgICAgbWFyayhsb2NrZXIsIGNvZGVCbG9jayk7CiB9CiAKLWlubGluZSB2b2lkIENv ZGVCbG9ja1NldDo6bWFyayhjb25zdCBMb2NrSG9sZGVyJiwgQ29kZUJsb2NrKiBjb2RlQmxvY2sp CitpbmxpbmUgdm9pZCBDb2RlQmxvY2tTZXQ6Om1hcmsoY29uc3QgQWJzdHJhY3RMb2NrZXImLCBD b2RlQmxvY2sqIGNvZGVCbG9jaykKIHsKICAgICBpZiAoIWNvZGVCbG9jaykKICAgICAgICAgcmV0 dXJuOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hlYXAvQ29uc2VydmF0aXZlUm9vdHMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9oZWFwL0NvbnNlcnZhdGl2 ZVJvb3RzLmNwcAkocmV2aXNpb24gMjEzNjUyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvQ29uc2VydmF0aXZlUm9vdHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTcsNyArMTE3LDcg QEAgdm9pZCBDb25zZXJ2YXRpdmVSb290czo6YWRkKHZvaWQqIGJlZ2luLAogCiBjbGFzcyBDb21w b3NpdGVNYXJrSG9vayB7CiBwdWJsaWM6Ci0gICAgQ29tcG9zaXRlTWFya0hvb2soSklUU3R1YlJv dXRpbmVTZXQmIHN0dWJSb3V0aW5lcywgQ29kZUJsb2NrU2V0JiBjb2RlQmxvY2tzLCBjb25zdCBM b2NrSG9sZGVyJiBsb2NrZXIpCisgICAgQ29tcG9zaXRlTWFya0hvb2soSklUU3R1YlJvdXRpbmVT ZXQmIHN0dWJSb3V0aW5lcywgQ29kZUJsb2NrU2V0JiBjb2RlQmxvY2tzLCBjb25zdCBBYnN0cmFj dExvY2tlciYgbG9ja2VyKQogICAgICAgICA6IG1fc3R1YlJvdXRpbmVzKHN0dWJSb3V0aW5lcykK ICAgICAgICAgLCBtX2NvZGVCbG9ja3MoY29kZUJsb2NrcykKICAgICAgICAgLCBtX2NvZGVCbG9j a3NMb2NrZXIobG9ja2VyKQpAQCAtMTMzLDcgKzEzMyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAg ICAgSklUU3R1YlJvdXRpbmVTZXQmIG1fc3R1YlJvdXRpbmVzOwogICAgIENvZGVCbG9ja1NldCYg bV9jb2RlQmxvY2tzOwotICAgIGNvbnN0IExvY2tIb2xkZXImIG1fY29kZUJsb2Nrc0xvY2tlcjsK KyAgICBjb25zdCBBYnN0cmFjdExvY2tlciYgbV9jb2RlQmxvY2tzTG9ja2VyOwogfTsKIAogdm9p ZCBDb25zZXJ2YXRpdmVSb290czo6YWRkKApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2hl YXAvTWFjaGluZVN0YWNrTWFya2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwCShyZXZpc2lvbiAyMTM2NTIpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNoaW5lU3RhY2tNYXJrZXIuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC05MjgsNyArOTI4LDcgQEAgdm9pZCBNYWNoaW5lVGhyZWFkczo6dHJ5Q29weU90 aGVyVGhyZWFkUwogICAgIHRocmVhZC0+ZnJlZVJlZ2lzdGVycyhyZWdpc3RlcnMpOwogfQogCi1i b29sIE1hY2hpbmVUaHJlYWRzOjp0cnlDb3B5T3RoZXJUaHJlYWRTdGFja3MoTG9ja0hvbGRlciYs IHZvaWQqIGJ1ZmZlciwgc2l6ZV90IGNhcGFjaXR5LCBzaXplX3QqIHNpemUpCitib29sIE1hY2hp bmVUaHJlYWRzOjp0cnlDb3B5T3RoZXJUaHJlYWRTdGFja3MoY29uc3QgQWJzdHJhY3RMb2NrZXIm LCB2b2lkKiBidWZmZXIsIHNpemVfdCBjYXBhY2l0eSwgc2l6ZV90KiBzaXplKQogewogICAgIC8v IFByZXZlbnQgdHdvIFZNcyBmcm9tIHN1c3BlbmRpbmcgZWFjaCBvdGhlcidzIHRocmVhZHMgYXQg dGhlIHNhbWUgdGltZSwKICAgICAvLyB3aGljaCBjYW4gY2F1c2UgZGVhZGxvY2s6IDxyZGFyOi8v cHJvYmxlbS8yMDMwMDg0Mj4uCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVhcC9NYWNo aW5lU3RhY2tNYXJrZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaGVh cC9NYWNoaW5lU3RhY2tNYXJrZXIuaAkocmV2aXNpb24gMjEzNjUyKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2hlYXAvTWFjaGluZVN0YWNrTWFya2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE0 Miw3ICsxNDIsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZ2F0aGVyRnJvbUN1cnJlbnRUaHJlYWQo Q29uc2VydmF0aXZlUm9vdHMmLCBKSVRTdHViUm91dGluZVNldCYsIENvZGVCbG9ja1NldCYsIEN1 cnJlbnRUaHJlYWRTdGF0ZSYpOwogCiAgICAgdm9pZCB0cnlDb3B5T3RoZXJUaHJlYWRTdGFjayhU aHJlYWQqLCB2b2lkKiwgc2l6ZV90IGNhcGFjaXR5LCBzaXplX3QqKTsKLSAgICBib29sIHRyeUNv cHlPdGhlclRocmVhZFN0YWNrcyhMb2NrSG9sZGVyJiwgdm9pZCosIHNpemVfdCBjYXBhY2l0eSwg c2l6ZV90Kik7CisgICAgYm9vbCB0cnlDb3B5T3RoZXJUaHJlYWRTdGFja3MoY29uc3QgQWJzdHJh Y3RMb2NrZXImLCB2b2lkKiwgc2l6ZV90IGNhcGFjaXR5LCBzaXplX3QqKTsKIAogICAgIHN0YXRp YyB2b2lkIFRIUkVBRF9TUEVDSUZJQ19DQUxMIHJlbW92ZVRocmVhZCh2b2lkKik7CiAKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcHJvZmlsZXIvUHJvZmlsZXJEYXRhYmFz ZS5jcHAJKHJldmlzaW9uIDIxMzY1MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9wcm9maWxl ci9Qcm9maWxlckRhdGFiYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBC eXRlY29kZXMqIERhdGFiYXNlOjplbnN1cmVCeXRlY29kZXNGb3IoCiAgICAgcmV0dXJuIGVuc3Vy ZUJ5dGVjb2Rlc0Zvcihsb2NrZXIsIGNvZGVCbG9jayk7CiB9CiAKLUJ5dGVjb2RlcyogRGF0YWJh c2U6OmVuc3VyZUJ5dGVjb2Rlc0Zvcihjb25zdCBMb2NrSG9sZGVyJiwgQ29kZUJsb2NrKiBjb2Rl QmxvY2spCitCeXRlY29kZXMqIERhdGFiYXNlOjplbnN1cmVCeXRlY29kZXNGb3IoY29uc3QgQWJz dHJhY3RMb2NrZXImLCBDb2RlQmxvY2sqIGNvZGVCbG9jaykKIHsKICAgICBjb2RlQmxvY2sgPSBj b2RlQmxvY2stPmJhc2VsaW5lQWx0ZXJuYXRpdmUoKTsKICAgICAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9wcm9maWxlci9Qcm9maWxlckRhdGFiYXNlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJhc2UuaAkocmV2aXNpb24g MjEzNjUyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3Byb2ZpbGVyL1Byb2ZpbGVyRGF0YWJh c2UuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNyArNzIsNyBAQCBwdWJsaWM6CiAgICAgSlNfRVhQ T1JUX1BSSVZBVEUgdm9pZCBsb2dFdmVudChDb2RlQmxvY2sqIGNvZGVCbG9jaywgY29uc3QgY2hh ciogc3VtbWFyeSwgY29uc3QgQ1N0cmluZyYgZGV0YWlsKTsKICAgICAKIHByaXZhdGU6Ci0gICAg Qnl0ZWNvZGVzKiBlbnN1cmVCeXRlY29kZXNGb3IoY29uc3QgTG9ja0hvbGRlciYsIENvZGVCbG9j ayopOworICAgIEJ5dGVjb2RlcyogZW5zdXJlQnl0ZWNvZGVzRm9yKGNvbnN0IEFic3RyYWN0TG9j a2VyJiwgQ29kZUJsb2NrKik7CiAgICAgCiAgICAgdm9pZCBhZGREYXRhYmFzZVRvQXRFeGl0KCk7 CiAgICAgdm9pZCByZW1vdmVEYXRhYmFzZUZyb21BdEV4aXQoKTsKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1NhbXBsaW5nUHJvZmlsZXIuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1NhbXBsaW5nUHJvZmlsZXIuY3BwCShyZXZpc2lv biAyMTM2NTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TYW1wbGluZ1Byb2Zp bGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEsNyArODEsNyBAQCBBTFdBWVNfSU5MSU5FIHN0 YXRpYyB2b2lkIHJlcG9ydFN0YXRzKCkKIAogY2xhc3MgRnJhbWVXYWxrZXIgewogcHVibGljOgot ICAgIEZyYW1lV2Fsa2VyKFZNJiB2bSwgRXhlY1N0YXRlKiBjYWxsRnJhbWUsIGNvbnN0IExvY2tI b2xkZXImIGNvZGVCbG9ja1NldExvY2tlciwgY29uc3QgTG9ja0hvbGRlciYgbWFjaGluZVRocmVh ZHNMb2NrZXIpCisgICAgRnJhbWVXYWxrZXIoVk0mIHZtLCBFeGVjU3RhdGUqIGNhbGxGcmFtZSwg Y29uc3QgQWJzdHJhY3RMb2NrZXImIGNvZGVCbG9ja1NldExvY2tlciwgY29uc3QgQWJzdHJhY3RM b2NrZXImIG1hY2hpbmVUaHJlYWRzTG9ja2VyKQogICAgICAgICA6IG1fdm0odm0pCiAgICAgICAg ICwgbV9jYWxsRnJhbWUoY2FsbEZyYW1lKQogICAgICAgICAsIG1fdm1FbnRyeUZyYW1lKHZtLnRv cFZNRW50cnlGcmFtZSkKQEAgLTE5MCw4ICsxOTAsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgVk0mIG1f dm07CiAgICAgRXhlY1N0YXRlKiBtX2NhbGxGcmFtZTsKICAgICBWTUVudHJ5RnJhbWUqIG1fdm1F bnRyeUZyYW1lOwotICAgIGNvbnN0IExvY2tIb2xkZXImIG1fY29kZUJsb2NrU2V0TG9ja2VyOwot ICAgIGNvbnN0IExvY2tIb2xkZXImIG1fbWFjaGluZVRocmVhZHNMb2NrZXI7CisgICAgY29uc3Qg QWJzdHJhY3RMb2NrZXImIG1fY29kZUJsb2NrU2V0TG9ja2VyOworICAgIGNvbnN0IEFic3RyYWN0 TG9ja2VyJiBtX21hY2hpbmVUaHJlYWRzTG9ja2VyOwogICAgIGJvb2wgbV9iYWlsaW5nT3V0IHsg ZmFsc2UgfTsKICAgICBzaXplX3QgbV9kZXB0aCB7IDAgfTsKIH07CkBAIC0yMDAsNyArMjAwLDcg QEAgY2xhc3MgQ0ZyYW1lV2Fsa2VyIDogcHVibGljIEZyYW1lV2Fsa2VyIAogcHVibGljOgogICAg IHR5cGVkZWYgRnJhbWVXYWxrZXIgQmFzZTsKIAotICAgIENGcmFtZVdhbGtlcihWTSYgdm0sIHZv aWQqIG1hY2hpbmVGcmFtZSwgRXhlY1N0YXRlKiBjYWxsRnJhbWUsIGNvbnN0IExvY2tIb2xkZXIm IGNvZGVCbG9ja1NldExvY2tlciwgY29uc3QgTG9ja0hvbGRlciYgbWFjaGluZVRocmVhZHNMb2Nr ZXIpCisgICAgQ0ZyYW1lV2Fsa2VyKFZNJiB2bSwgdm9pZCogbWFjaGluZUZyYW1lLCBFeGVjU3Rh dGUqIGNhbGxGcmFtZSwgY29uc3QgQWJzdHJhY3RMb2NrZXImIGNvZGVCbG9ja1NldExvY2tlciwg Y29uc3QgQWJzdHJhY3RMb2NrZXImIG1hY2hpbmVUaHJlYWRzTG9ja2VyKQogICAgICAgICA6IEJh c2Uodm0sIGNhbGxGcmFtZSwgY29kZUJsb2NrU2V0TG9ja2VyLCBtYWNoaW5lVGhyZWFkc0xvY2tl cikKICAgICAgICAgLCBtX21hY2hpbmVGcmFtZShtYWNoaW5lRnJhbWUpCiAgICAgewpAQCAtMjk2 LDcgKzI5Niw3IEBAIFNhbXBsaW5nUHJvZmlsZXI6On5TYW1wbGluZ1Byb2ZpbGVyKCkKIHsKIH0K IAotdm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpjcmVhdGVUaHJlYWRJZk5lY2Vzc2FyeShjb25zdCBM b2NrSG9sZGVyJikKK3ZvaWQgU2FtcGxpbmdQcm9maWxlcjo6Y3JlYXRlVGhyZWFkSWZOZWNlc3Nh cnkoY29uc3QgQWJzdHJhY3RMb2NrZXImKQogewogICAgIEFTU0VSVChtX2xvY2suaXNMb2NrZWQo KSk7CiAKQEAgLTMzNCw3ICszMzQsNyBAQCB2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnRpbWVyTG9v cCgpCiAgICAgfQogfQogCi12b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnRha2VTYW1wbGUoY29uc3Qg TG9ja0hvbGRlciYsIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMmIHN0YWNrVHJhY2VQcm9jZXNz aW5nVGltZSkKK3ZvaWQgU2FtcGxpbmdQcm9maWxlcjo6dGFrZVNhbXBsZShjb25zdCBBYnN0cmFj dExvY2tlciYsIHN0ZDo6Y2hyb25vOjptaWNyb3NlY29uZHMmIHN0YWNrVHJhY2VQcm9jZXNzaW5n VGltZSkKIHsKICAgICBBU1NFUlQobV9sb2NrLmlzTG9ja2VkKCkpOwogICAgIGlmIChtX3ZtLmVu dHJ5U2NvcGUpIHsKQEAgLTY1OSwyMSArNjU5LDIxIEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6 c3RhcnQoKQogICAgIHN0YXJ0KGxvY2tlcik7CiB9CiAKLXZvaWQgU2FtcGxpbmdQcm9maWxlcjo6 c3RhcnQoY29uc3QgTG9ja0hvbGRlciYgbG9ja2VyKQordm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpz dGFydChjb25zdCBBYnN0cmFjdExvY2tlciYgbG9ja2VyKQogewogICAgIEFTU0VSVChtX2xvY2su aXNMb2NrZWQoKSk7CiAgICAgbV9pc1BhdXNlZCA9IGZhbHNlOwogICAgIGNyZWF0ZVRocmVhZElm TmVjZXNzYXJ5KGxvY2tlcik7CiB9CiAKLXZvaWQgU2FtcGxpbmdQcm9maWxlcjo6cGF1c2UoY29u c3QgTG9ja0hvbGRlciYpCit2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OnBhdXNlKGNvbnN0IEFic3Ry YWN0TG9ja2VyJikKIHsKICAgICBBU1NFUlQobV9sb2NrLmlzTG9ja2VkKCkpOwogICAgIG1faXNQ YXVzZWQgPSB0cnVlOwogICAgIHJlcG9ydFN0YXRzKCk7CiB9CiAKLXZvaWQgU2FtcGxpbmdQcm9m aWxlcjo6bm90aWNlQ3VycmVudFRocmVhZEFzSlNDRXhlY3V0aW9uVGhyZWFkKGNvbnN0IExvY2tI b2xkZXImKQordm9pZCBTYW1wbGluZ1Byb2ZpbGVyOjpub3RpY2VDdXJyZW50VGhyZWFkQXNKU0NF eGVjdXRpb25UaHJlYWQoY29uc3QgQWJzdHJhY3RMb2NrZXImKQogewogICAgIEFTU0VSVChtX2xv Y2suaXNMb2NrZWQoKSk7CiAgICAgbV9qc2NFeGVjdXRpb25UaHJlYWQgPSBtX3ZtLmhlYXAubWFj aGluZVRocmVhZHMoKS5tYWNoaW5lVGhyZWFkRm9yQ3VycmVudFRocmVhZCgpOwpAQCAtNzAwLDcg KzcwMCw3IEBAIHZvaWQgU2FtcGxpbmdQcm9maWxlcjo6bm90aWNlVk1FbnRyeSgpCiAgICAgY3Jl YXRlVGhyZWFkSWZOZWNlc3NhcnkobG9ja2VyKTsKIH0KIAotdm9pZCBTYW1wbGluZ1Byb2ZpbGVy OjpjbGVhckRhdGEoY29uc3QgTG9ja0hvbGRlciYpCit2b2lkIFNhbXBsaW5nUHJvZmlsZXI6OmNs ZWFyRGF0YShjb25zdCBBYnN0cmFjdExvY2tlciYpCiB7CiAgICAgQVNTRVJUKG1fbG9jay5pc0xv Y2tlZCgpKTsKICAgICBtX3N0YWNrVHJhY2VzLmNsZWFyKCk7CkBAIC04NTgsNyArODU4LDcgQEAg U3RyaW5nIFNhbXBsaW5nUHJvZmlsZXI6OlN0YWNrRnJhbWU6OnVybAogICAgIHJldHVybiB1cmw7 CiB9CiAKLVZlY3RvcjxTYW1wbGluZ1Byb2ZpbGVyOjpTdGFja1RyYWNlPiBTYW1wbGluZ1Byb2Zp bGVyOjpyZWxlYXNlU3RhY2tUcmFjZXMoY29uc3QgTG9ja0hvbGRlciYgbG9ja2VyKQorVmVjdG9y PFNhbXBsaW5nUHJvZmlsZXI6OlN0YWNrVHJhY2U+IFNhbXBsaW5nUHJvZmlsZXI6OnJlbGVhc2VT dGFja1RyYWNlcyhjb25zdCBBYnN0cmFjdExvY2tlciYgbG9ja2VyKQogewogICAgIEFTU0VSVCht X2xvY2suaXNMb2NrZWQoKSk7CiAgICAgewpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvU2FtcGxpbmdQcm9maWxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1NhbXBsaW5nUHJvZmlsZXIuaAkocmV2aXNpb24gMjEzNjUyKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2FtcGxpbmdQcm9maWxlci5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNjYsMTUgKzE2NiwxNSBAQCBwdWJsaWM6CiAgICAgTG9jayYgZ2V0TG9jaygpIHsg cmV0dXJuIG1fbG9jazsgfQogICAgIHZvaWQgc2V0VGltaW5nSW50ZXJ2YWwoc3RkOjpjaHJvbm86 Om1pY3Jvc2Vjb25kcyBpbnRlcnZhbCkgeyBtX3RpbWluZ0ludGVydmFsID0gaW50ZXJ2YWw7IH0K ICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIHN0YXJ0KCk7Ci0gICAgdm9pZCBzdGFydChjb25z dCBMb2NrSG9sZGVyJik7Ci0gICAgVmVjdG9yPFN0YWNrVHJhY2U+IHJlbGVhc2VTdGFja1RyYWNl cyhjb25zdCBMb2NrSG9sZGVyJik7CisgICAgdm9pZCBzdGFydChjb25zdCBBYnN0cmFjdExvY2tl ciYpOworICAgIFZlY3RvcjxTdGFja1RyYWNlPiByZWxlYXNlU3RhY2tUcmFjZXMoY29uc3QgQWJz dHJhY3RMb2NrZXImKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSBTdHJpbmcgc3RhY2tUcmFjZXNB c0pTT04oKTsKICAgICBKU19FWFBPUlRfUFJJVkFURSB2b2lkIG5vdGljZUN1cnJlbnRUaHJlYWRB c0pTQ0V4ZWN1dGlvblRocmVhZCgpOwotICAgIHZvaWQgbm90aWNlQ3VycmVudFRocmVhZEFzSlND RXhlY3V0aW9uVGhyZWFkKGNvbnN0IExvY2tIb2xkZXImKTsKKyAgICB2b2lkIG5vdGljZUN1cnJl bnRUaHJlYWRBc0pTQ0V4ZWN1dGlvblRocmVhZChjb25zdCBBYnN0cmFjdExvY2tlciYpOwogICAg IHZvaWQgcHJvY2Vzc1VudmVyaWZpZWRTdGFja1RyYWNlcygpOyAvLyBZb3Ugc2hvdWxkIGNhbGwg dGhpcyBvbmx5IGFmdGVyIGFjcXVpcmluZyB0aGUgbG9jay4KLSAgICB2b2lkIHNldFN0b3BXYXRj aChjb25zdCBMb2NrSG9sZGVyJiwgUmVmPFN0b3B3YXRjaD4mJiBzdG9wd2F0Y2gpIHsgbV9zdG9w d2F0Y2ggPSBXVEZNb3ZlKHN0b3B3YXRjaCk7IH0KLSAgICB2b2lkIHBhdXNlKGNvbnN0IExvY2tI b2xkZXImKTsKLSAgICB2b2lkIGNsZWFyRGF0YShjb25zdCBMb2NrSG9sZGVyJik7CisgICAgdm9p ZCBzZXRTdG9wV2F0Y2goY29uc3QgQWJzdHJhY3RMb2NrZXImLCBSZWY8U3RvcHdhdGNoPiYmIHN0 b3B3YXRjaCkgeyBtX3N0b3B3YXRjaCA9IFdURk1vdmUoc3RvcHdhdGNoKTsgfQorICAgIHZvaWQg cGF1c2UoY29uc3QgQWJzdHJhY3RMb2NrZXImKTsKKyAgICB2b2lkIGNsZWFyRGF0YShjb25zdCBB YnN0cmFjdExvY2tlciYpOwogCiAgICAgLy8gVXNlZCBmb3IgZGVidWdnaW5nIGluIHRoZSBKU0Mg c2hlbGwvRFJULgogICAgIHZvaWQgcmVnaXN0ZXJGb3JSZXBvcnRBdEV4aXQoKTsKQEAgLTE4NSw5 ICsxODUsOSBAQCBwdWJsaWM6CiAgICAgSlNfRVhQT1JUX1BSSVZBVEUgdm9pZCByZXBvcnRUb3BC eXRlY29kZXMoUHJpbnRTdHJlYW0mKTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGNyZWF0ZVRocmVh ZElmTmVjZXNzYXJ5KGNvbnN0IExvY2tIb2xkZXImKTsKKyAgICB2b2lkIGNyZWF0ZVRocmVhZElm TmVjZXNzYXJ5KGNvbnN0IEFic3RyYWN0TG9ja2VyJik7CiAgICAgdm9pZCB0aW1lckxvb3AoKTsK LSAgICB2b2lkIHRha2VTYW1wbGUoY29uc3QgTG9ja0hvbGRlciYsIHN0ZDo6Y2hyb25vOjptaWNy b3NlY29uZHMmIHN0YWNrVHJhY2VQcm9jZXNzaW5nVGltZSk7CisgICAgdm9pZCB0YWtlU2FtcGxl KGNvbnN0IEFic3RyYWN0TG9ja2VyJiwgc3RkOjpjaHJvbm86Om1pY3Jvc2Vjb25kcyYgc3RhY2tU cmFjZVByb2Nlc3NpbmdUaW1lKTsKIAogICAgIFZNJiBtX3ZtOwogICAgIFJlZlB0cjxTdG9wd2F0 Y2g+IG1fc3RvcHdhdGNoOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1l bW9yeS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1l bW9yeS5jcHAJKHJldmlzaW9uIDIxMzY1MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS93YXNt L1dhc21NZW1vcnkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCwxOSArNjgsMTkgQEAgTWVtb3J5 OjpNb2RlIE1lbW9yeTo6bGFzdEFsbG9jYXRlZE1vZGUoKQogc3RhdGljIGNvbnN0IHVuc2lnbmVk IG1heEZhc3RNZW1vcmllcyA9IDQ7CiBzdGF0aWMgdW5zaWduZWQgYWxsb2NhdGVkRmFzdE1lbW9y aWVzIHsgMCB9OwogU3RhdGljTG9jayBtZW1vcnlMb2NrOwotaW5saW5lIERlcXVlPHZvaWQqLCBt YXhGYXN0TWVtb3JpZXM+JiBhdmFpbGFibGVGYXN0TWVtb3JpZXMoY29uc3QgTG9ja0hvbGRlciYp CitpbmxpbmUgRGVxdWU8dm9pZCosIG1heEZhc3RNZW1vcmllcz4mIGF2YWlsYWJsZUZhc3RNZW1v cmllcyhjb25zdCBBYnN0cmFjdExvY2tlciYpCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PERlcXVlPHZvaWQqLCBtYXhGYXN0TWVtb3JpZXM+PiBhdmFpbGFibGVGYXN0TWVtb3JpZXM7CiAg ICAgcmV0dXJuIGF2YWlsYWJsZUZhc3RNZW1vcmllczsKIH0KIAotaW5saW5lIEhhc2hTZXQ8dm9p ZCo+JiBhY3RpdmVGYXN0TWVtb3JpZXMoY29uc3QgTG9ja0hvbGRlciYpCitpbmxpbmUgSGFzaFNl dDx2b2lkKj4mIGFjdGl2ZUZhc3RNZW1vcmllcyhjb25zdCBBYnN0cmFjdExvY2tlciYpCiB7CiAg ICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8dm9pZCo+PiBhY3RpdmVGYXN0TWVtb3Jp ZXM7CiAgICAgcmV0dXJuIGFjdGl2ZUZhc3RNZW1vcmllczsKIH0KIAotY29uc3QgSGFzaFNldDx2 b2lkKj4mIHZpZXdBY3RpdmVGYXN0TWVtb3JpZXMoY29uc3QgTG9ja0hvbGRlciYgbG9ja2VyKQor Y29uc3QgSGFzaFNldDx2b2lkKj4mIHZpZXdBY3RpdmVGYXN0TWVtb3JpZXMoY29uc3QgQWJzdHJh Y3RMb2NrZXImIGxvY2tlcikKIHsKICAgICByZXR1cm4gYWN0aXZlRmFzdE1lbW9yaWVzKGxvY2tl cik7CiB9CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTWVtb3J5LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vV2FzbU1lbW9yeS5oCShyZXZp c2lvbiAyMTM2NTIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9XYXNtTWVtb3J5LmgJ KHdvcmtpbmcgY29weSkKQEAgLTk4LDcgKzk4LDcgQEAgc3RhdGljX2Fzc2VydChzaXplb2YodWlu dDY0X3QpID09IHNpemVvZgogCiBjb25zdCBzaXplX3QgZmFzdE1lbW9yeU1hcHBlZEJ5dGVzID0g KHN0YXRpY19jYXN0PHNpemVfdD4oc3RkOjpudW1lcmljX2xpbWl0czx1aW50MzJfdD46Om1heCgp KSArIDEpICogMjsgLy8gcG9pbnRlciBtYXggKyBvZmZzZXQgbWF4LiBUaGlzIGlzIGFsbCB3ZSBu ZWVkIHNpbmNlIGEgbG9hZCBzdHJhZGRsaW5nIHJlYWRhYmxlIG1lbW9yeSB3aWxsIHRyYXAuCiBl eHRlcm4gU3RhdGljTG9jayBtZW1vcnlMb2NrOwotY29uc3QgSGFzaFNldDx2b2lkKj4mIHZpZXdB Y3RpdmVGYXN0TWVtb3JpZXMoY29uc3QgTG9ja0hvbGRlciYpOworY29uc3QgSGFzaFNldDx2b2lk Kj4mIHZpZXdBY3RpdmVGYXN0TWVtb3JpZXMoY29uc3QgQWJzdHJhY3RMb2NrZXImKTsKIAogfSB9 IC8vIG5hbWVzcGFjZSBKU0M6Oldhc20KIApJbmRleDogU291cmNlL1dURi9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dURi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzY1MikKKysrIFNv dXJjZS9XVEYvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTct MDMtMDkgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgorCisgICAgICAgIFVzZSBjb25z dCBBYnN0cmFjdExvY2tlciYgKGluc3RlYWQgb2YgY29uc3QgTG9ja0hvbGRlciYpIGluIG1vcmUg cGxhY2VzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY5NDI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiB3dGYvUnVuTG9vcC5oOgorICAgICAgICAqIHd0Zi9nZW5lcmljL1J1bkxvb3BHZW5lcmljLmNw cDoKKyAgICAgICAgKFdURjo6UnVuTG9vcDo6d2FrZVVwKToKKyAgICAgICAgKFdURjo6UnVuTG9v cDo6c2NoZWR1bGUpOgorCiAyMDE3LTAzLTA5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBNYWtlIHRoZSBWTSBUcmFwcyBtZWNoYW5pc20gbm9uLXBvbGxpbmcgZm9y IHRoZSBERkcgYW5kIEZUTC4KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL1J1bkxvb3AuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9SdW5Mb29wLmgJKHJldmlzaW9uIDIxMzY1MikKKysrIFNv dXJjZS9XVEYvd3RmL1J1bkxvb3AuaAkod29ya2luZyBjb3B5KQpAQCAtMTY3LDggKzE2Nyw4IEBA IHByaXZhdGU6CiAgICAgR1JlZlB0cjxHU291cmNlPiBtX3NvdXJjZTsKICNlbGlmIFVTRShHRU5F UklDX0VWRU5UX0xPT1ApCiAgICAgdm9pZCBzY2hlZHVsZShSZWZQdHI8VGltZXJCYXNlOjpTY2hl ZHVsZWRUYXNrPiYmKTsKLSAgICB2b2lkIHNjaGVkdWxlKGNvbnN0IExvY2tIb2xkZXImLCBSZWZQ dHI8VGltZXJCYXNlOjpTY2hlZHVsZWRUYXNrPiYmKTsKLSAgICB2b2lkIHdha2VVcChjb25zdCBM b2NrSG9sZGVyJik7CisgICAgdm9pZCBzY2hlZHVsZShjb25zdCBBYnN0cmFjdExvY2tlciYsIFJl ZlB0cjxUaW1lckJhc2U6OlNjaGVkdWxlZFRhc2s+JiYpOworICAgIHZvaWQgd2FrZVVwKGNvbnN0 IEFic3RyYWN0TG9ja2VyJik7CiAgICAgdm9pZCBzY2hlZHVsZUFuZFdha2VVcChSZWZQdHI8VGlt ZXJCYXNlOjpTY2hlZHVsZWRUYXNrPik7CiAKICAgICBlbnVtIGNsYXNzIFJ1bk1vZGUgewpJbmRl eDogU291cmNlL1dURi93dGYvZ2VuZXJpYy9SdW5Mb29wR2VuZXJpYy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dURi93dGYvZ2VuZXJpYy9SdW5Mb29wR2VuZXJpYy5jcHAJKHJldmlzaW9uIDIx MzY1MikKKysrIFNvdXJjZS9XVEYvd3RmL2dlbmVyaWMvUnVuTG9vcEdlbmVyaWMuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yMDYsNyArMjA2LDcgQEAgdm9pZCBSdW5Mb29wOjpzdG9wKCkKICAgICB9 CiB9CiAKLXZvaWQgUnVuTG9vcDo6d2FrZVVwKGNvbnN0IExvY2tIb2xkZXImKQordm9pZCBSdW5M b29wOjp3YWtlVXAoY29uc3QgQWJzdHJhY3RMb2NrZXImKQogewogICAgIG1fcGVuZGluZ1Rhc2tz ID0gdHJ1ZTsKICAgICBtX3JlYWR5VG9SdW4ubm90aWZ5T25lKCk7CkBAIC0yMTgsNyArMjE4LDcg QEAgdm9pZCBSdW5Mb29wOjp3YWtlVXAoKQogICAgIHdha2VVcChsb2NrZXIpOwogfQogCi12b2lk IFJ1bkxvb3A6OnNjaGVkdWxlKGNvbnN0IExvY2tIb2xkZXImLCBSZWZQdHI8VGltZXJCYXNlOjpT Y2hlZHVsZWRUYXNrPiYmIHRhc2spCit2b2lkIFJ1bkxvb3A6OnNjaGVkdWxlKGNvbnN0IEFic3Ry YWN0TG9ja2VyJiwgUmVmUHRyPFRpbWVyQmFzZTo6U2NoZWR1bGVkVGFzaz4mJiB0YXNrKQogewog ICAgIG1fc2NoZWR1bGVzLmFwcGVuZChXVEZNb3ZlKHRhc2spKTsKICAgICBzdGQ6OnB1c2hfaGVh cChtX3NjaGVkdWxlcy5iZWdpbigpLCBtX3NjaGVkdWxlcy5lbmQoKSwgVGltZXJCYXNlOjpTY2hl ZHVsZWRUYXNrOjpFYXJsaWVzdFNjaGVkdWxlKCkpOwo=