162106 2016-09-16 17:14:48 -0700 Inline functions in URLParser 2016-09-17 22:40:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1230717 0 achristensen 2016-09-16 17:14:48 -0700 Inline functions in URLParser 1230718 1 289148 achristensen 2016-09-16 17:15:38 -0700 Created attachment 289148 Patch 1230735 2 achristensen 2016-09-16 18:25:23 -0700 This makes a ~5% speedup in the URLParser performance. 1230914 3 achristensen 2016-09-17 22:40:45 -0700 http://trac.webkit.org/changeset/206075 289148 2016-09-16 17:15:38 -0700 2016-09-16 19:43:46 -0700 Patch bug-162106-20160916171258.patch text/plain 15272 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwNjA1NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUyIEBACisyMDE2LTA5LTE2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW5saW5lIGZ1 bmN0aW9ucyBpbiBVUkxQYXJzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE2MjEwNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4gSnVzdCBtYWtlIFVSTFBhcnNlciBm YXN0ZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9VUkxQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6aXNDMENvbnRyb2wpOgorICAgICAgICAoV2ViQ29yZTo6aXNDMENvbnRyb2xPclNwYWNl KToKKyAgICAgICAgKFdlYkNvcmU6OmlzVGFiT3JOZXdsaW5lKToKKyAgICAgICAgKFdlYkNvcmU6 OmlzSW5TaW1wbGVFbmNvZGVTZXQpOgorICAgICAgICAoV2ViQ29yZTo6aXNJbkRlZmF1bHRFbmNv ZGVTZXQpOgorICAgICAgICAoV2ViQ29yZTo6aXNJblVzZXJJbmZvRW5jb2RlU2V0KToKKyAgICAg ICAgKFdlYkNvcmU6OmlzSW52YWxpZERvbWFpbkNoYXJhY3Rlcik6CisgICAgICAgIChXZWJDb3Jl Ojppc1BlcmNlbnRPck5vbkFTQ0lJKToKKyAgICAgICAgKFdlYkNvcmU6OmlzU2xhc2hRdWVzdGlv bk9ySGFzaCk6CisgICAgICAgIChXZWJDb3JlOjppc1dpbmRvd3NEcml2ZUxldHRlcik6CisgICAg ICAgIChXZWJDb3JlOjpzaG91bGRDb3B5RmlsZVVSTCk6CisgICAgICAgIChXZWJDb3JlOjpwZXJj ZW50RW5jb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OnV0ZjhQZXJjZW50RW5jb2RlKToKKyAgICAg ICAgKFdlYkNvcmU6OnV0ZjhQZXJjZW50RW5jb2RlUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6 ZW5jb2RlUXVlcnkpOgorICAgICAgICAoV2ViQ29yZTo6aXNEZWZhdWx0UG9ydCk6CisgICAgICAg IChXZWJDb3JlOjppc1NwZWNpYWxTY2hlbWUpOgorICAgICAgICAoV2ViQ29yZTo6Y29weUFTQ0lJ U3RyaW5nVW50aWwpOgorICAgICAgICAoV2ViQ29yZTo6aXNQZXJjZW50RW5jb2RlZERvdCk6Cisg ICAgICAgIChXZWJDb3JlOjppc1NpbmdsZURvdFBhdGhTZWdtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OmlzRG91YmxlRG90UGF0aFNlZ21lbnQpOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3VtZVNp bmdsZURvdFBhdGhTZWdtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmNvbnN1bWVEb3VibGVEb3RQ YXRoU2VnbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpzZXJpYWxpemVJUHY0KToKKyAgICAgICAg KFdlYkNvcmU6Onplcm9TZXF1ZW5jZUxlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpmaW5kTG9u Z2VzdFplcm9TZXF1ZW5jZSk6CisgICAgICAgIChXZWJDb3JlOjpzZXJpYWxpemVJUHY2UGllY2Up OgorICAgICAgICAoV2ViQ29yZTo6c2VyaWFsaXplSVB2Nik6CisgICAgICAgIChXZWJDb3JlOjpw YXJzZUlQdjROdW1iZXIpOgorICAgICAgICAoV2ViQ29yZTo6cG93MjU2KToKKyAgICAgICAgKFdl YkNvcmU6OnBhcnNlSVB2NEhvc3QpOgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VJUHY2SG9zdCk6 CisgICAgICAgIChXZWJDb3JlOjpwZXJjZW50RGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OmNv bnRhaW5zT25seUFTQ0lJKToKKyAgICAgICAgKFdlYkNvcmU6OmRvbWFpblRvQVNDSUkpOgorICAg ICAgICAoV2ViQ29yZTo6aGFzSW52YWxpZERvbWFpbkNoYXJhY3Rlcik6CisgICAgICAgIChXZWJD b3JlOjpmb3JtVVJMRGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OnNlcmlhbGl6ZVVSTEVuY29k ZWRGb3JtKToKKwogMjAxNi0wOS0xNiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIHNpemUgYXNzZXJ0IGZvciBSZW5kZXJFbGVtZW50CkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9VUkxQYXJzZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5jcHAJKHJldmlzaW9uIDIwNjA0NCkKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1VSTFBhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM4Mywx OSArMzgzLDE5IEBAIHN0YXRpYyBjb25zdCB1aW50OF90IGNoYXJhY3RlckNsYXNzVGFibGUKICAg ICBRdWVyeVBlcmNlbnQsIC8vIDB4RkYKIH07CiAKLXRlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3Rl clR5cGU+IHN0YXRpYyBib29sIGlzQzBDb250cm9sKENoYXJhY3RlclR5cGUgY2hhcmFjdGVyKSB7 IHJldHVybiBjaGFyYWN0ZXIgPD0gMHgxRjsgfQotdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVy VHlwZT4gc3RhdGljIGJvb2wgaXNDMENvbnRyb2xPclNwYWNlKENoYXJhY3RlclR5cGUgY2hhcmFj dGVyKSB7IHJldHVybiBjaGFyYWN0ZXIgPD0gMHgyMDsgfQotdGVtcGxhdGU8dHlwZW5hbWUgQ2hh cmFjdGVyVHlwZT4gc3RhdGljIGJvb2wgaXNUYWJPck5ld2xpbmUoQ2hhcmFjdGVyVHlwZSBjaGFy YWN0ZXIpIHsgcmV0dXJuIGNoYXJhY3RlciA8PSAweEQgJiYgY2hhcmFjdGVyID49IDB4OSAmJiBj aGFyYWN0ZXIgIT0gMHhCICYmIGNoYXJhY3RlciAhPSAweEM7IH0KLXRlbXBsYXRlPHR5cGVuYW1l IENoYXJhY3RlclR5cGU+IHN0YXRpYyBib29sIGlzSW5TaW1wbGVFbmNvZGVTZXQoQ2hhcmFjdGVy VHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJhY3RlciA+IDB4N0UgfHwgaXNDMENvbnRyb2wo Y2hhcmFjdGVyKTsgfQotdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4gc3RhdGljIGJv b2wgaXNJbkRlZmF1bHRFbmNvZGVTZXQoQ2hhcmFjdGVyVHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJu IGNoYXJhY3RlciA+IDB4N0UgfHwgY2hhcmFjdGVyQ2xhc3NUYWJsZVtjaGFyYWN0ZXJdICYgRGVm YXVsdDsgfQotdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4gc3RhdGljIGJvb2wgaXNJ blVzZXJJbmZvRW5jb2RlU2V0KENoYXJhY3RlclR5cGUgY2hhcmFjdGVyKSB7IHJldHVybiBjaGFy YWN0ZXIgPiAweDdFIHx8IGNoYXJhY3RlckNsYXNzVGFibGVbY2hhcmFjdGVyXSAmIFVzZXJJbmZv OyB9Ci10ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBzdGF0aWMgYm9vbCBpc0ludmFs aWREb21haW5DaGFyYWN0ZXIoQ2hhcmFjdGVyVHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJh Y3RlciA8PSAnXScgJiYgY2hhcmFjdGVyQ2xhc3NUYWJsZVtjaGFyYWN0ZXJdICYgSW52YWxpZERv bWFpbjsgfQotdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4gc3RhdGljIGJvb2wgaXNQ ZXJjZW50T3JOb25BU0NJSShDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlcikgeyByZXR1cm4gIWlzQVND SUkoY2hhcmFjdGVyKSB8fCBjaGFyYWN0ZXIgPT0gJyUnOyB9Ci10ZW1wbGF0ZTx0eXBlbmFtZSBD aGFyYWN0ZXJUeXBlPiBzdGF0aWMgYm9vbCBpc1NsYXNoUXVlc3Rpb25Pckhhc2goQ2hhcmFjdGVy VHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJhY3RlciA8PSAnXFwnICYmIGNoYXJhY3RlckNs YXNzVGFibGVbY2hhcmFjdGVyXSAmIFNsYXNoUXVlc3Rpb25Pckhhc2g7IH0KK3RlbXBsYXRlPHR5 cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGluZSBzdGF0aWMgYm9vbCBpc0MwQ29udHJvbChDaGFy YWN0ZXJUeXBlIGNoYXJhY3RlcikgeyByZXR1cm4gY2hhcmFjdGVyIDw9IDB4MUY7IH0KK3RlbXBs YXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGluZSBzdGF0aWMgYm9vbCBpc0MwQ29udHJv bE9yU3BhY2UoQ2hhcmFjdGVyVHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJhY3RlciA8PSAw eDIwOyB9Cit0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBpbmxpbmUgc3RhdGljIGJv b2wgaXNUYWJPck5ld2xpbmUoQ2hhcmFjdGVyVHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJh Y3RlciA8PSAweEQgJiYgY2hhcmFjdGVyID49IDB4OSAmJiBjaGFyYWN0ZXIgIT0gMHhCICYmIGNo YXJhY3RlciAhPSAweEM7IH0KK3RlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGlu ZSBzdGF0aWMgYm9vbCBpc0luU2ltcGxlRW5jb2RlU2V0KENoYXJhY3RlclR5cGUgY2hhcmFjdGVy KSB7IHJldHVybiBjaGFyYWN0ZXIgPiAweDdFIHx8IGlzQzBDb250cm9sKGNoYXJhY3Rlcik7IH0K K3RlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGluZSBzdGF0aWMgYm9vbCBpc0lu RGVmYXVsdEVuY29kZVNldChDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlcikgeyByZXR1cm4gY2hhcmFj dGVyID4gMHg3RSB8fCBjaGFyYWN0ZXJDbGFzc1RhYmxlW2NoYXJhY3Rlcl0gJiBEZWZhdWx0OyB9 Cit0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBpbmxpbmUgc3RhdGljIGJvb2wgaXNJ blVzZXJJbmZvRW5jb2RlU2V0KENoYXJhY3RlclR5cGUgY2hhcmFjdGVyKSB7IHJldHVybiBjaGFy YWN0ZXIgPiAweDdFIHx8IGNoYXJhY3RlckNsYXNzVGFibGVbY2hhcmFjdGVyXSAmIFVzZXJJbmZv OyB9Cit0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPiBpbmxpbmUgc3RhdGljIGJvb2wg aXNJbnZhbGlkRG9tYWluQ2hhcmFjdGVyKENoYXJhY3RlclR5cGUgY2hhcmFjdGVyKSB7IHJldHVy biBjaGFyYWN0ZXIgPD0gJ10nICYmIGNoYXJhY3RlckNsYXNzVGFibGVbY2hhcmFjdGVyXSAmIElu dmFsaWREb21haW47IH0KK3RlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGluZSBz dGF0aWMgYm9vbCBpc1BlcmNlbnRPck5vbkFTQ0lJKENoYXJhY3RlclR5cGUgY2hhcmFjdGVyKSB7 IHJldHVybiAhaXNBU0NJSShjaGFyYWN0ZXIpIHx8IGNoYXJhY3RlciA9PSAnJSc7IH0KK3RlbXBs YXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+IGlubGluZSBzdGF0aWMgYm9vbCBpc1NsYXNoUXVl c3Rpb25Pckhhc2goQ2hhcmFjdGVyVHlwZSBjaGFyYWN0ZXIpIHsgcmV0dXJuIGNoYXJhY3RlciA8 PSAnXFwnICYmIGNoYXJhY3RlckNsYXNzVGFibGVbY2hhcmFjdGVyXSAmIFNsYXNoUXVlc3Rpb25P ckhhc2g7IH0KIHN0YXRpYyBib29sIHNob3VsZFBlcmNlbnRFbmNvZGVRdWVyeUJ5dGUodWludDhf dCBieXRlKSB7IHJldHVybiBjaGFyYWN0ZXJDbGFzc1RhYmxlW2J5dGVdICYgUXVlcnlQZXJjZW50 OyB9CiAgICAgCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotc3RhdGljIGJvb2wg aXNXaW5kb3dzRHJpdmVMZXR0ZXIoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gaXRl cmF0b3IpCitpbmxpbmUgc3RhdGljIGJvb2wgaXNXaW5kb3dzRHJpdmVMZXR0ZXIoQ29kZVBvaW50 SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gaXRlcmF0b3IpCiB7CiAgICAgaWYgKGl0ZXJhdG9yLmF0 RW5kKCkgfHwgIWlzQVNDSUlBbHBoYSgqaXRlcmF0b3IpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CkBAIC00MDUsNyArNDA1LDcgQEAgc3RhdGljIGJvb2wgaXNXaW5kb3dzRHJpdmVMZXR0ZXIoQ29k ZVBvaQogICAgIHJldHVybiAqaXRlcmF0b3IgPT0gJzonIHx8ICppdGVyYXRvciA9PSAnfCc7CiB9 CiAKLXN0YXRpYyBib29sIGlzV2luZG93c0RyaXZlTGV0dGVyKGNvbnN0IFZlY3RvcjxMQ2hhcj4m IGJ1ZmZlciwgc2l6ZV90IGluZGV4KQoraW5saW5lIHN0YXRpYyBib29sIGlzV2luZG93c0RyaXZl TGV0dGVyKGNvbnN0IFZlY3RvcjxMQ2hhcj4mIGJ1ZmZlciwgc2l6ZV90IGluZGV4KQogewogICAg IGlmIChidWZmZXIuc2l6ZSgpIDwgaW5kZXggKyAyKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBA IC00MTMsNyArNDEzLDcgQEAgc3RhdGljIGJvb2wgaXNXaW5kb3dzRHJpdmVMZXR0ZXIoY29uc3Qg VgogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotc3RhdGljIGJvb2wgc2hv dWxkQ29weUZpbGVVUkwoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gaXRlcmF0b3Ip CitpbmxpbmUgc3RhdGljIGJvb2wgc2hvdWxkQ29weUZpbGVVUkwoQ29kZVBvaW50SXRlcmF0b3I8 Q2hhcmFjdGVyVHlwZT4gaXRlcmF0b3IpCiB7CiAgICAgaWYgKGlzV2luZG93c0RyaXZlTGV0dGVy KGl0ZXJhdG9yKSkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC00MjgsMTQgKzQyOCwxNCBAQCBz dGF0aWMgYm9vbCBzaG91bGRDb3B5RmlsZVVSTChDb2RlUG9pbnRJCiAgICAgcmV0dXJuICFpc1Ns YXNoUXVlc3Rpb25Pckhhc2goKml0ZXJhdG9yKTsKIH0KIAotc3RhdGljIHZvaWQgcGVyY2VudEVu Y29kZSh1aW50OF90IGJ5dGUsIFZlY3RvcjxMQ2hhcj4mIGJ1ZmZlcikKK2lubGluZSBzdGF0aWMg dm9pZCBwZXJjZW50RW5jb2RlKHVpbnQ4X3QgYnl0ZSwgVmVjdG9yPExDaGFyPiYgYnVmZmVyKQog ewogICAgIGJ1ZmZlci5hcHBlbmQoJyUnKTsKICAgICBidWZmZXIuYXBwZW5kKHVwcGVyTmliYmxl VG9BU0NJSUhleERpZ2l0KGJ5dGUpKTsKICAgICBidWZmZXIuYXBwZW5kKGxvd2VyTmliYmxlVG9B U0NJSUhleERpZ2l0KGJ5dGUpKTsKIH0KIAotc3RhdGljIHZvaWQgdXRmOFBlcmNlbnRFbmNvZGUo VUNoYXIzMiBjb2RlUG9pbnQsIFZlY3RvcjxMQ2hhcj4mIGRlc3RpbmF0aW9uLCBib29sKCppc0lu Q29kZVNldCkoVUNoYXIzMikpCitpbmxpbmUgc3RhdGljIHZvaWQgdXRmOFBlcmNlbnRFbmNvZGUo VUNoYXIzMiBjb2RlUG9pbnQsIFZlY3RvcjxMQ2hhcj4mIGRlc3RpbmF0aW9uLCBib29sKCppc0lu Q29kZVNldCkoVUNoYXIzMikpCiB7CiAgICAgaWYgKGlzSW5Db2RlU2V0KGNvZGVQb2ludCkpIHsK ICAgICAgICAgdWludDhfdCBidWZmZXJbVThfTUFYX0xFTkdUSF07CkBAIC00NTEsNyArNDUxLDcg QEAgc3RhdGljIHZvaWQgdXRmOFBlcmNlbnRFbmNvZGUoVUNoYXIzMiBjbwogICAgIH0KIH0KIAot c3RhdGljIHZvaWQgdXRmOFBlcmNlbnRFbmNvZGVRdWVyeShVQ2hhcjMyIGNvZGVQb2ludCwgVmVj dG9yPExDaGFyPiYgZGVzdGluYXRpb24pCitpbmxpbmUgc3RhdGljIHZvaWQgdXRmOFBlcmNlbnRF bmNvZGVRdWVyeShVQ2hhcjMyIGNvZGVQb2ludCwgVmVjdG9yPExDaGFyPiYgZGVzdGluYXRpb24p CiB7CiAgICAgdWludDhfdCBidWZmZXJbVThfTUFYX0xFTkdUSF07CiAgICAgaW50MzJfdCBvZmZz ZXQgPSAwOwpAQCAtNDY4LDcgKzQ2OCw3IEBAIHN0YXRpYyB2b2lkIHV0ZjhQZXJjZW50RW5jb2Rl UXVlcnkoVUNoYXIKICAgICB9CiB9CiAgICAgCi1zdGF0aWMgdm9pZCBlbmNvZGVRdWVyeShjb25z dCBTdHJpbmdCdWlsZGVyJiBzb3VyY2UsIFZlY3RvcjxMQ2hhcj4mIGRlc3RpbmF0aW9uLCBjb25z dCBUZXh0RW5jb2RpbmcmIGVuY29kaW5nKQoraW5saW5lIHN0YXRpYyB2b2lkIGVuY29kZVF1ZXJ5 KGNvbnN0IFN0cmluZ0J1aWxkZXImIHNvdXJjZSwgVmVjdG9yPExDaGFyPiYgZGVzdGluYXRpb24s IGNvbnN0IFRleHRFbmNvZGluZyYgZW5jb2RpbmcpCiB7CiAgICAgLy8gRklYTUU6IEl0IGlzIHVu Y2xlYXIgaW4gdGhlIHNwZWMgd2hhdCB0byBkbyB3aGVuIGVuY29kaW5nIGZhaWxzLiBUaGUgYmVo YXZpb3Igc2hvdWxkIGJlIHNwZWNpZmllZCBhbmQgdGVzdGVkLgogICAgIENTdHJpbmcgZW5jb2Rl ZCA9IGVuY29kaW5nLmVuY29kZShzb3VyY2UudG9TdHJpbmdQcmVzZXJ2ZUNhcGFjaXR5KCksIFVS TEVuY29kZWRFbnRpdGllc0ZvclVuZW5jb2RhYmxlcyk7CkBAIC00ODMsNyArNDgzLDcgQEAgc3Rh dGljIHZvaWQgZW5jb2RlUXVlcnkoY29uc3QgU3RyaW5nQnVpbAogICAgIH0KIH0KIAotc3RhdGlj IGJvb2wgaXNEZWZhdWx0UG9ydChTdHJpbmdWaWV3IHNjaGVtZSwgdWludDE2X3QgcG9ydCkKK2lu bGluZSBzdGF0aWMgYm9vbCBpc0RlZmF1bHRQb3J0KFN0cmluZ1ZpZXcgc2NoZW1lLCB1aW50MTZf dCBwb3J0KQogewogICAgIHN0YXRpYyBjb25zdCB1aW50MTZfdCBmdHBQb3J0ID0gMjE7CiAgICAg c3RhdGljIGNvbnN0IHVpbnQxNl90IGdvcGhlclBvcnQgPSA3MDsKQEAgLTU0Myw3ICs1NDMsNyBA QCBzdGF0aWMgYm9vbCBpc0RlZmF1bHRQb3J0KFN0cmluZ1ZpZXcgc2NoCiAgICAgfQogfQogCi1z dGF0aWMgYm9vbCBpc1NwZWNpYWxTY2hlbWUoU3RyaW5nVmlldyBzY2hlbWUpCitpbmxpbmUgc3Rh dGljIGJvb2wgaXNTcGVjaWFsU2NoZW1lKFN0cmluZ1ZpZXcgc2NoZW1lKQogewogICAgIGF1dG8g bGVuZ3RoID0gc2NoZW1lLmxlbmd0aCgpOwogICAgIGlmICghbGVuZ3RoKQpAQCAtNjM4LDcgKzYz OCw3IEBAIHNpemVfdCBVUkxQYXJzZXI6OnVybExlbmd0aFVudGlsUGFydChjb24KICAgICByZXR1 cm4gMDsKIH0KIAotc3RhdGljIHZvaWQgY29weUFTQ0lJU3RyaW5nVW50aWwoVmVjdG9yPExDaGFy PiYgZGVzdGluYXRpb24sIGNvbnN0IFN0cmluZyYgc3RyaW5nLCBzaXplX3QgbGVuZ3RoSWY4Qml0 LCBzaXplX3QgbGVuZ3RoSWYxNkJpdCkKK2lubGluZSBzdGF0aWMgdm9pZCBjb3B5QVNDSUlTdHJp bmdVbnRpbChWZWN0b3I8TENoYXI+JiBkZXN0aW5hdGlvbiwgY29uc3QgU3RyaW5nJiBzdHJpbmcs IHNpemVfdCBsZW5ndGhJZjhCaXQsIHNpemVfdCBsZW5ndGhJZjE2Qml0KQogewogICAgIEFTU0VS VChkZXN0aW5hdGlvbi5pc0VtcHR5KCkpOwogICAgIGlmIChzdHJpbmcuaXM4Qml0KCkpIHsKQEAg LTcxNyw3ICs3MTcsNyBAQCB2b2lkIFVSTFBhcnNlcjo6Y29weVVSTFBhcnRzVW50aWwoY29uc3Qg CiBzdGF0aWMgY29uc3QgY2hhciogZG90QVNDSUlDb2RlID0gIjJlIjsKIAogdGVtcGxhdGU8dHlw ZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRpYyBib29sIGlzUGVyY2VudEVuY29kZWREb3QoQ29k ZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gYykKK2lubGluZSBzdGF0aWMgYm9vbCBpc1Bl cmNlbnRFbmNvZGVkRG90KENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+IGMpCiB7CiAg ICAgaWYgKGMuYXRFbmQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNzM1LDcgKzczNSw3 IEBAIHN0YXRpYyBib29sIGlzUGVyY2VudEVuY29kZWREb3QoQ29kZVBvaW4KIH0KIAogdGVtcGxh dGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRpYyBib29sIGlzU2luZ2xlRG90UGF0aFNl Z21lbnQoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gYykKK2lubGluZSBzdGF0aWMg Ym9vbCBpc1NpbmdsZURvdFBhdGhTZWdtZW50KENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5 cGU+IGMpCiB7CiAgICAgaWYgKGMuYXRFbmQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAt NzU5LDcgKzc1OSw3IEBAIHN0YXRpYyBib29sIGlzU2luZ2xlRG90UGF0aFNlZ21lbnQoQ29kZVAK IH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRpYyBib29sIGlzRG91 YmxlRG90UGF0aFNlZ21lbnQoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4gYykKK2lu bGluZSBzdGF0aWMgYm9vbCBpc0RvdWJsZURvdFBhdGhTZWdtZW50KENvZGVQb2ludEl0ZXJhdG9y PENoYXJhY3RlclR5cGU+IGMpCiB7CiAgICAgaWYgKGMuYXRFbmQoKSkKICAgICAgICAgcmV0dXJu IGZhbHNlOwpAQCAtNzgzLDcgKzc4Myw3IEBAIHN0YXRpYyBib29sIGlzRG91YmxlRG90UGF0aFNl Z21lbnQoQ29kZVAKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KLXN0YXRp YyB2b2lkIGNvbnN1bWVTaW5nbGVEb3RQYXRoU2VnbWVudChDb2RlUG9pbnRJdGVyYXRvcjxDaGFy YWN0ZXJUeXBlPiYgYykKK2lubGluZSBzdGF0aWMgdm9pZCBjb25zdW1lU2luZ2xlRG90UGF0aFNl Z21lbnQoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4mIGMpCiB7CiAgICAgQVNTRVJU KGlzU2luZ2xlRG90UGF0aFNlZ21lbnQoYykpOwogICAgIGlmICgqYyA9PSAnLicpIHsKQEAgLTgx MSw3ICs4MTEsNyBAQCBzdGF0aWMgdm9pZCBjb25zdW1lU2luZ2xlRG90UGF0aFNlZ21lbnQoCiB9 CiAKIHRlbXBsYXRlPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+Ci1zdGF0aWMgdm9pZCBjb25zdW1l RG91YmxlRG90UGF0aFNlZ21lbnQoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlwZT4mIGMp CitpbmxpbmUgc3RhdGljIHZvaWQgY29uc3VtZURvdWJsZURvdFBhdGhTZWdtZW50KENvZGVQb2lu dEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBjKQogewogICAgIEFTU0VSVChpc0RvdWJsZURvdFBh dGhTZWdtZW50KGMpKTsKICAgICBpZiAoKmMgPT0gJy4nKQpAQCAtMTU4OCw3ICsxNTg4LDcgQEAg dm9pZCBhcHBlbmQoVmVjdG9yPExDaGFyPiYgZGVzdGluYXRpb24sIAogICAgIGRlc3RpbmF0aW9u LmFwcGVuZChwLCBlbmQgLSBwKTsKIH0KIAotc3RhdGljIHZvaWQgc2VyaWFsaXplSVB2NCh1aW50 MzJfdCBhZGRyZXNzLCBWZWN0b3I8TENoYXI+JiBidWZmZXIpCitpbmxpbmUgc3RhdGljIHZvaWQg c2VyaWFsaXplSVB2NCh1aW50MzJfdCBhZGRyZXNzLCBWZWN0b3I8TENoYXI+JiBidWZmZXIpCiB7 CiAgICAgYXBwZW5kPHVpbnQ4X3Q+KGJ1ZmZlciwgYWRkcmVzcyA+PiAyNCk7CiAgICAgYnVmZmVy LmFwcGVuZCgnLicpOwpAQCAtMTU5OSw3ICsxNTk5LDcgQEAgc3RhdGljIHZvaWQgc2VyaWFsaXpl SVB2NCh1aW50MzJfdCBhZGRyZQogICAgIGFwcGVuZDx1aW50OF90PihidWZmZXIsIGFkZHJlc3Mp OwogfQogICAgIAotc3RhdGljIHNpemVfdCB6ZXJvU2VxdWVuY2VMZW5ndGgoY29uc3Qgc3RkOjph cnJheTx1aW50MTZfdCwgOD4mIGFkZHJlc3MsIHNpemVfdCBiZWdpbikKK2lubGluZSBzdGF0aWMg c2l6ZV90IHplcm9TZXF1ZW5jZUxlbmd0aChjb25zdCBzdGQ6OmFycmF5PHVpbnQxNl90LCA4PiYg YWRkcmVzcywgc2l6ZV90IGJlZ2luKQogewogICAgIHNpemVfdCBlbmQgPSBiZWdpbjsKICAgICBm b3IgKDsgZW5kIDwgODsgZW5kKyspIHsKQEAgLTE2MDksNyArMTYwOSw3IEBAIHN0YXRpYyBzaXpl X3QgemVyb1NlcXVlbmNlTGVuZ3RoKGNvbnN0IHMKICAgICByZXR1cm4gZW5kIC0gYmVnaW47CiB9 CiAKLXN0YXRpYyBPcHRpb25hbDxzaXplX3Q+IGZpbmRMb25nZXN0WmVyb1NlcXVlbmNlKGNvbnN0 IHN0ZDo6YXJyYXk8dWludDE2X3QsIDg+JiBhZGRyZXNzKQoraW5saW5lIHN0YXRpYyBPcHRpb25h bDxzaXplX3Q+IGZpbmRMb25nZXN0WmVyb1NlcXVlbmNlKGNvbnN0IHN0ZDo6YXJyYXk8dWludDE2 X3QsIDg+JiBhZGRyZXNzKQogewogICAgIE9wdGlvbmFsPHNpemVfdD4gbG9uZ2VzdDsKICAgICBz aXplX3QgbG9uZ2VzdExlbmd0aCA9IDA7CkBAIC0xNjI2LDcgKzE2MjYsNyBAQCBzdGF0aWMgT3B0 aW9uYWw8c2l6ZV90PiBmaW5kTG9uZ2VzdFplcm9TCiAgICAgcmV0dXJuIGxvbmdlc3Q7CiB9CiAg ICAgCi1zdGF0aWMgdm9pZCBzZXJpYWxpemVJUHY2UGllY2UodWludDE2X3QgcGllY2UsIFZlY3Rv cjxMQ2hhcj4mIGJ1ZmZlcikKK2lubGluZSBzdGF0aWMgdm9pZCBzZXJpYWxpemVJUHY2UGllY2Uo dWludDE2X3QgcGllY2UsIFZlY3RvcjxMQ2hhcj4mIGJ1ZmZlcikKIHsKICAgICBib29sIHByaW50 ZWQgPSBmYWxzZTsKICAgICBpZiAoYXV0byBuaWJibGUwID0gcGllY2UgPj4gMTIpIHsKQEAgLTE2 NDQsNyArMTY0NCw3IEBAIHN0YXRpYyB2b2lkIHNlcmlhbGl6ZUlQdjZQaWVjZSh1aW50MTZfdCAK ICAgICBidWZmZXIuYXBwZW5kKGxvd2VyTmliYmxlVG9Mb3dlcmNhc2VBU0NJSUhleERpZ2l0KHBp ZWNlICYgMHhGKSk7CiB9CiAKLXN0YXRpYyB2b2lkIHNlcmlhbGl6ZUlQdjYoc3RkOjphcnJheTx1 aW50MTZfdCwgOD4gYWRkcmVzcywgVmVjdG9yPExDaGFyPiYgYnVmZmVyKQoraW5saW5lIHN0YXRp YyB2b2lkIHNlcmlhbGl6ZUlQdjYoc3RkOjphcnJheTx1aW50MTZfdCwgOD4gYWRkcmVzcywgVmVj dG9yPExDaGFyPiYgYnVmZmVyKQogewogICAgIGJ1ZmZlci5hcHBlbmQoJ1snKTsKICAgICBhdXRv IGNvbXByZXNzUG9pbnRlciA9IGZpbmRMb25nZXN0WmVyb1NlcXVlbmNlKGFkZHJlc3MpOwpAQCAt MTY2OCw3ICsxNjY4LDcgQEAgc3RhdGljIHZvaWQgc2VyaWFsaXplSVB2NihzdGQ6OmFycmF5PHVp bgogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotc3RhdGljIE9wdGlvbmFs PHVpbnQzMl90PiBwYXJzZUlQdjROdW1iZXIoQ29kZVBvaW50SXRlcmF0b3I8Q2hhcmFjdGVyVHlw ZT4mIGl0ZXJhdG9yKQoraW5saW5lIHN0YXRpYyBPcHRpb25hbDx1aW50MzJfdD4gcGFyc2VJUHY0 TnVtYmVyKENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+JiBpdGVyYXRvcikKIHsKICAg ICAvLyBGSVhNRTogQ2hlY2sgZm9yIG92ZXJmbG93LgogICAgIGVudW0gY2xhc3MgU3RhdGUgOiB1 aW50OF90IHsKQEAgLTE3MjgsNyArMTcyOCw3IEBAIHN0YXRpYyBPcHRpb25hbDx1aW50MzJfdD4g cGFyc2VJUHY0TnVtYmUKICAgICByZXR1cm4gdmFsdWU7CiB9CiAKLXN0YXRpYyB1aW50NjRfdCBw b3cyNTYoc2l6ZV90IGV4cG9uZW50KQoraW5saW5lIHN0YXRpYyB1aW50NjRfdCBwb3cyNTYoc2l6 ZV90IGV4cG9uZW50KQogewogICAgIFJFTEVBU0VfQVNTRVJUKGV4cG9uZW50IDw9IDQpOwogICAg IHVpbnQ2NF90IHZhbHVlc1s1XSA9IHsxLCAyNTYsIDI1NiAqIDI1NiwgMjU2ICogMjU2ICogMjU2 LCAyNTZ1bGwgKiAyNTYgKiAyNTYgKiAyNTYgfTsKQEAgLTE3MzYsNyArMTczNiw3IEBAIHN0YXRp YyB1aW50NjRfdCBwb3cyNTYoc2l6ZV90IGV4cG9uZW50KQogfQogCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBDaGFyYWN0ZXJUeXBlPgotc3RhdGljIE9wdGlvbmFsPHVpbnQzMl90PiBwYXJzZUlQdjRIb3N0 KENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+IGl0ZXJhdG9yKQoraW5saW5lIHN0YXRp YyBPcHRpb25hbDx1aW50MzJfdD4gcGFyc2VJUHY0SG9zdChDb2RlUG9pbnRJdGVyYXRvcjxDaGFy YWN0ZXJUeXBlPiBpdGVyYXRvcikKIHsKICAgICBWZWN0b3I8dWludDMyX3QsIDQ+IGl0ZW1zOwog ICAgIGl0ZW1zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoNCk7CkBAIC0xNzY3LDcgKzE3NjcsNyBA QCBzdGF0aWMgT3B0aW9uYWw8dWludDMyX3Q+IHBhcnNlSVB2NEhvc3QoCiB9CiAgICAgCiB0ZW1w bGF0ZTx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgotc3RhdGljIE9wdGlvbmFsPHN0ZDo6YXJyYXk8 dWludDE2X3QsIDg+PiBwYXJzZUlQdjZIb3N0KENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5 cGU+IGMpCitpbmxpbmUgc3RhdGljIE9wdGlvbmFsPHN0ZDo6YXJyYXk8dWludDE2X3QsIDg+PiBw YXJzZUlQdjZIb3N0KENvZGVQb2ludEl0ZXJhdG9yPENoYXJhY3RlclR5cGU+IGMpCiB7CiAgICAg aWYgKGMuYXRFbmQoKSkKICAgICAgICAgcmV0dXJuIE51bGxvcHQ7CkBAIC0xODYwLDcgKzE4NjAs NyBAQCBzdGF0aWMgT3B0aW9uYWw8c3RkOjphcnJheTx1aW50MTZfdCwgOD4+CiB9CiAKIC8vIEZJ WE1FOiBUaGlzIHNob3VsZCByZXR1cm4gYSBDU3RyaW5nLgotc3RhdGljIFN0cmluZyBwZXJjZW50 RGVjb2RlKGNvbnN0IExDaGFyKiBpbnB1dCwgc2l6ZV90IGxlbmd0aCkKK2lubGluZSBzdGF0aWMg U3RyaW5nIHBlcmNlbnREZWNvZGUoY29uc3QgTENoYXIqIGlucHV0LCBzaXplX3QgbGVuZ3RoKQog ewogICAgIFN0cmluZ0J1aWxkZXIgb3V0cHV0OwogICAgIApAQCAtMTg4MCwxNCArMTg4MCwxNCBA QCBzdGF0aWMgU3RyaW5nIHBlcmNlbnREZWNvZGUoY29uc3QgTENoYXIqCiAgICAgcmV0dXJuIG91 dHB1dC50b1N0cmluZ1ByZXNlcnZlQ2FwYWNpdHkoKTsKIH0KIAotc3RhdGljIGJvb2wgY29udGFp bnNPbmx5QVNDSUkoY29uc3QgU3RyaW5nJiBzdHJpbmcpCitpbmxpbmUgc3RhdGljIGJvb2wgY29u dGFpbnNPbmx5QVNDSUkoY29uc3QgU3RyaW5nJiBzdHJpbmcpCiB7CiAgICAgaWYgKHN0cmluZy5p czhCaXQoKSkKICAgICAgICAgcmV0dXJuIGNoYXJhY3RlcnNBcmVBbGxBU0NJSShzdHJpbmcuY2hh cmFjdGVyczgoKSwgc3RyaW5nLmxlbmd0aCgpKTsKICAgICByZXR1cm4gY2hhcmFjdGVyc0FyZUFs bEFTQ0lJKHN0cmluZy5jaGFyYWN0ZXJzMTYoKSwgc3RyaW5nLmxlbmd0aCgpKTsKIH0KIAotc3Rh dGljIE9wdGlvbmFsPFN0cmluZz4gZG9tYWluVG9BU0NJSShjb25zdCBTdHJpbmcmIGRvbWFpbikK K2lubGluZSBzdGF0aWMgT3B0aW9uYWw8U3RyaW5nPiBkb21haW5Ub0FTQ0lJKGNvbnN0IFN0cmlu ZyYgZG9tYWluKQogewogICAgIGNvbnN0IHVuc2lnbmVkIGhvc3RuYW1lQnVmZmVyTGVuZ3RoID0g MjA0ODsKIApAQCAtMTkyMCw3ICsxOTIwLDcgQEAgc3RhdGljIE9wdGlvbmFsPFN0cmluZz4gZG9t YWluVG9BU0NJSShjbwogICAgIHJldHVybiBOdWxsb3B0OwogfQogCi1zdGF0aWMgYm9vbCBoYXNJ bnZhbGlkRG9tYWluQ2hhcmFjdGVyKGNvbnN0IFN0cmluZyYgYXNjaWlEb21haW4pCitpbmxpbmUg c3RhdGljIGJvb2wgaGFzSW52YWxpZERvbWFpbkNoYXJhY3Rlcihjb25zdCBTdHJpbmcmIGFzY2lp RG9tYWluKQogewogICAgIFJFTEVBU0VfQVNTRVJUKGFzY2lpRG9tYWluLmlzOEJpdCgpKTsKICAg ICBjb25zdCBMQ2hhciogY2hhcmFjdGVycyA9IGFzY2lpRG9tYWluLmNoYXJhY3RlcnM4KCk7CkBA IC0yMDczLDcgKzIwNzMsNyBAQCBib29sIFVSTFBhcnNlcjo6cGFyc2VIb3N0KENvZGVQb2ludEl0 ZXJhCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBPcHRpb25hbDxTdHJpbmc+IGZvcm1V UkxEZWNvZGUoU3RyaW5nVmlldyBpbnB1dCkKK2lubGluZSBzdGF0aWMgT3B0aW9uYWw8U3RyaW5n PiBmb3JtVVJMRGVjb2RlKFN0cmluZ1ZpZXcgaW5wdXQpCiB7CiAgICAgYXV0byB1dGY4ID0gaW5w dXQudXRmOChTdHJpY3RDb252ZXJzaW9uKTsKICAgICBpZiAodXRmOC5pc051bGwoKSkKQEAgLTIx MDMsNyArMjEwMyw3IEBAIGF1dG8gVVJMUGFyc2VyOjpwYXJzZVVSTEVuY29kZWRGb3JtKFN0cmkK ICAgICByZXR1cm4gb3V0cHV0OwogfQogCi1zdGF0aWMgdm9pZCBzZXJpYWxpemVVUkxFbmNvZGVk Rm9ybShjb25zdCBTdHJpbmcmIGlucHV0LCBWZWN0b3I8TENoYXI+JiBvdXRwdXQpCitpbmxpbmUg c3RhdGljIHZvaWQgc2VyaWFsaXplVVJMRW5jb2RlZEZvcm0oY29uc3QgU3RyaW5nJiBpbnB1dCwg VmVjdG9yPExDaGFyPiYgb3V0cHV0KQogewogICAgIGF1dG8gdXRmOCA9IGlucHV0LnV0ZjgoU3Ry aWN0Q29udmVyc2lvbik7CiAgICAgY29uc3QgY2hhciogZGF0YSA9IHV0ZjguZGF0YSgpOwo=