69207 2011-10-01 00:40:44 -0700 Bencher script makes it difficult to do automated performance testing 2011-10-01 15:01:59 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 69208 1 fpizlo webkit-unassigned crogers sam oldest_to_newest 476559 0 fpizlo 2011-10-01 00:40:44 -0700 The Tools/Scripts/bencher script simplifies performance testing. Sometimes it would be useful to use bencher itself within a script, and read out the results - for example when varying some configuration parameter of a particular build of a VM. But bencher has no way of computing a single aggregate result for all benchmark suites, and no way of printing it. It also gets confused if a VM is modified to print additional output beyond jsc's print statement, which makes it impossible to use bencher with certain profiling features enabled. 476561 1 109402 fpizlo 2011-10-01 00:50:40 -0700 Created attachment 109402 the patch 476580 2 crogers 2011-10-01 10:48:52 -0700 Hi Filip, I'm not sure why this issue is associated with the "Web Audio" component? 476589 3 sam 2011-10-01 13:24:14 -0700 (In reply to comment #2) > Hi Filip, I'm not sure why this issue is associated with the "Web Audio" component? My guess is off by one from Tools/Tests. Fixed. 476597 4 fpizlo 2011-10-01 14:52:42 -0700 (In reply to comment #3) > (In reply to comment #2) > > Hi Filip, I'm not sure why this issue is associated with the "Web Audio" component? > > My guess is off by one from Tools/Tests. Fixed. Thanks! 476599 5 fpizlo 2011-10-01 15:01:59 -0700 Landed in r96462. 109402 2011-10-01 00:50:40 -0700 2011-10-01 13:24:57 -0700 the patch betterbencher_patch_1.diff text/plain 13193 fpizlo SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDk2NDU1KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjMgQEAKKzIwMTEtMTAtMDEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KKwor ICAgICAgICBCZW5jaGVyIHNjcmlwdCBtYWtlcyBpdCBkaWZmaWN1bHQgdG8gZG8gYXV0b21hdGVk IHBlcmZvcm1hbmNlIHRlc3RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY5MjA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBUaGlzIGFkZHMgdHdvIG5ldyBmZWF0dXJlczoKKyAgICAgICAg CisgICAgICAgIFRoZSBhYmlsaXR5IHRvIGRpc2FibGUgYXV0b21hdGljIFZNIGRldGVjdGlvbiwg d2hpY2ggaXMgZmxha3kgaWYgYW55CisgICAgICAgIHByb2ZpbGluZyBmZWF0dXJlcyBhcmUgZW5h YmxlZCBpbiBqc2MuCisgICAgICAgIAorICAgICAgICBUaGUgYWJpbGl0eSB0byBjb21wdXRlLCBh bmQgcmVwb3J0LCBhIHNjYWxlZCByZXN1bHQgZm9yIGFsbCBiZW5jaG1hcmsKKyAgICAgICAgc3Vp dGVzLiBJdCBpcyB0aGUgZ2VvbWV0cmljIG1lYW4gb2YgdGhyZWUgbnVtYmVyczogU3VuU3BpZGVy J3MKKyAgICAgICAgYXJpdGhtZXRpYyBtZWFuLCBWOCdzIGdlb21ldHJpYyBtZWFuLCBhbmQgS3Jh a2VuJ3MgYXJpdGhtZXRpYyBtZWFuLgorICAgICAgICBJdCBpcyBhbHNvIHBvc3NpYmxlIHRvIHR1 cm4gb2ZmIGFsbCBvdGhlciBvdXRwdXQgZnJvbSBiZW5jaGVyIGFuZCBqdXN0CisgICAgICAgIGdl dCB0aGlzIG51bWJlciB3aXRoIHRoZSAtLWJyaWVmIG9wdGlvbi4KKworICAgICAgICAqIFNjcmlw dHMvYmVuY2hlcjoKKwogMjAxMS0wOS0zMCAgRGFuaWVsIEJhdGVzICA8ZGJhdGVzQHJpbS5jb20+ CiAKICAgICAgICAgQ2xlYW51cDogRXh0cmFjdCBjb2RlIHRvIGxhdW5jaCBhIE1hYyBXZWJLaXQg YXBwbGljYXRpb24gaW50byBhIGNvbW1vbiBmdW5jdGlvbgpJbmRleDogVG9vbHMvU2NyaXB0cy9i ZW5jaGVyCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvYmVuY2hlcgkocmV2aXNpb24gOTY0 NTUpCisrKyBUb29scy9TY3JpcHRzL2JlbmNoZXIJKHdvcmtpbmcgY29weSkKQEAgLTIwOSw2ICsy MDksOCBAQCAkdmVyYm9zaXR5PTAKICRpbm5lck1vZGU9OnJlbG9hZAogJHRpbWVNb2RlPTphdXRv CiAka2VlcEZpbGVzPWZhbHNlCiskZm9yY2VWTUtpbmQ9bmlsCiskYnJpZWY9ZmFsc2UKIAogIyBI ZWxwZnVsIGZ1bmN0aW9ucyBhbmQgY2xhc3NlcwogCkBAIC0yNTAsNiArMjUyLDkgQEAgZGVmIHVz YWdlCiAgIHB1dHMgIi0tdGltaW5nLW1vZGUgICAgICAgIFNldCB0aGUgd2F5IHRoYXQgYmVuY2hl ciBtZWFzdXJlcyB0aW1lLiAgUG9zc2libGUgdmFsdWVzIgogICBwdXRzICIgICAgICAgICAgICAg ICAgICAgICBhcmUgJ3ByZWNpc2VUaW1lJywgJ2RhdGUnLCBhbmQgJ2F1dG8nLiAgRGVmYXVsdCBp cyIKICAgcHV0cyAiICAgICAgICAgICAgICAgICAgICAgJ2F1dG8nLCB3aGljaCBhdXRvbWF0aWNh bGx5IGRldGVjdHMgdGhlIGJlc3Qgd2F5LiIKKyAgcHV0cyAiLS1mb3JjZS12bS1raW5kICAgICAg VHVybiBvZmYgYXV0by1kZXRlY3Rpb24gb2YgVk0ga2luZCwgYW5kIGFzc3VtZSB0aGF0IGl0IGlz IgorICBwdXRzICIgICAgICAgICAgICAgICAgICAgICB0aGUgb25lIHNwZWNpZmllZC4gIFZhbGlk IGFyZ3VtZW50cyBhcmUgJ2pzYycgb3IiCisgIHB1dHMgIiAgICAgICAgICAgICAgICAgICAgICdE dW1wUmVuZGVyVHJlZScuIgogICBwdXRzICItLXY4LW9ubHkgICAgICAgICAgICBPbmx5IHJ1biBW OC4iCiAgIHB1dHMgIi0tc3Vuc3BpZGVyLW9ubHkgICAgIE9ubHkgcnVuIFN1blNwaWRlci4iCiAg IHB1dHMgIi0ta3Jha2VuLW9ubHkgICAgICAgIE9ubHkgcnVuIEtyYWtlbi4iCkBAIC0yNTksNiAr MjY0LDcgQEAgZGVmIHVzYWdlCiAgIHB1dHMgIi0tYmVuY2htYXJrcyAgICAgICAgIE9ubHkgcnVu IGJlbmNobWFya3MgbWF0Y2hpbmcgdGhlIGdpdmVuIHJlZ3VsYXIgZXhwcmVzc2lvbi4iCiAgIHB1 dHMgIi0ta2VlcC1maWxlcyAgICAgICAgIEtlZXAgdGVtcG9yYXJ5IGZpbGVzLiAgVXNlZnVsIGZv ciBkZWJ1Z2dpbmcuIgogICBwdXRzICItLXZlcmJvc2Ugb3IgLXYgICAgICBQcmludCBtb3JlIHN0 dWZmLiIKKyAgcHV0cyAiLS1icmllZiAgICAgICAgICAgICAgUHJpbnQgb25seSB0aGUgZmluYWwg cmVzdWx0IGZvciBlYWNoIFZNLiIKICAgcHV0cyAiLS1oZWxwIG9yIC1oICAgICAgICAgRGlzcGxh eSB0aGlzIG1lc3NhZ2UuIgogICBwdXRzCiAgIHB1dHMgIkV4YW1wbGU6IgpAQCAtNjkxLDI2ICs2 OTcsMzEgQEAgY2xhc3MgVk0gPCBTdGF0c0FjY3VtdWxhdG9yCiAgICAgQG5hbWUgPSBuYW1lCiAg ICAgQG5hbWVLaW5kID0gbmFtZUtpbmQKICAgICAKLSAgICBUZW1wZmlsZS5vcGVuKCJiZW5jaGVy LXZtdGVzdCIpIHsKLSAgICAgIHwgZmlsZSB8Ci0gICAgICBmaWxlLnB1dHMgInByaW50KFwiaGVy ZVwiKTsiCi0gICAgICBmaWxlLmZsdXNoCi0gICAgICAKLSAgICAgIHJlc3VsdCA9IG5pbAotICAg ICAgQHZtVHlwZSA9IDpqc2MKLSAgICAgIHJ1bihmaWxlLnBhdGgpIHsKLSAgICAgICAgfCBpbnAg fAotICAgICAgICByZXN1bHQgPSBpbnAucmVhZAotICAgICAgfQotICAgICAgCi0gICAgICBpZiBy ZXN1bHQuY2hvbXAgPT0gImhlcmUiCi0gICAgICAgICRzdGRlcnIucHV0cyAiI3tAbmFtZX0gaXMg ZGVmaW5pdGVseSBhIGpzYy1zdHlsZSBWTS4iIGlmICR2ZXJib3NpdHk+PTEKKyAgICBpZiAkZm9y Y2VWTUtpbmQKKyAgICAgIEB2bVR5cGUgPSAkZm9yY2VWTUtpbmQKKyAgICBlbHNlCisgICAgICBU ZW1wZmlsZS5vcGVuKCJiZW5jaGVyLXZtdGVzdCIpIHsKKyAgICAgICAgfCBmaWxlIHwKKyAgICAg ICAgZmlsZS5wdXRzICJwcmludChcImhlcmVcIik7IgorICAgICAgICBmaWxlLmZsdXNoCisgICAg ICAgIAorICAgICAgICByZXN1bHQgPSBuaWwKICAgICAgICAgQHZtVHlwZSA9IDpqc2MKLSAgICAg IGVsc2UKLSAgICAgICAgJHN0ZGVyci5wdXRzICJBc3N1bWluZyB0aGF0ICN7QG5hbWV9IGlzIGEg RHVtcFJlbmRlclRyZWUtc3R5bGUgVk0uIiBpZiAkdmVyYm9zaXR5Pj0xCi0gICAgICAgIEB2bVR5 cGUgPSA6ZHVtcFJlbmRlclRyZWUKLSAgICAgIGVuZAotICAgIH0KKyAgICAgICAgcnVuKGZpbGUu cGF0aCkgeworICAgICAgICAgIHwgaW5wIHwKKyAgICAgICAgICByZXN1bHQgPSBpbnAucmVhZAor ICAgICAgICAgICRzdGRlcnIucHV0cyAic3Rkb3V0OiAje3Jlc3VsdH0iIGlmICR2ZXJib3NpdHk+ PTIKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgaWYgcmVzdWx0LmNob21wID09ICJoZXJl IgorICAgICAgICAgICRzdGRlcnIucHV0cyAiI3tAbmFtZX0gaXMgZGVmaW5pdGVseSBhIGpzYy1z dHlsZSBWTS4iIGlmICR2ZXJib3NpdHk+PTEKKyAgICAgICAgICBAdm1UeXBlID0gOmpzYworICAg ICAgICBlbHNlCisgICAgICAgICAgJHN0ZGVyci5wdXRzICJBc3N1bWluZyB0aGF0ICN7QG5hbWV9 IGlzIGEgRHVtcFJlbmRlclRyZWUtc3R5bGUgVk0uIiBpZiAkdmVyYm9zaXR5Pj0xCisgICAgICAg ICAgQHZtVHlwZSA9IDpkdW1wUmVuZGVyVHJlZQorICAgICAgICBlbmQKKyAgICAgIH0KKyAgICBl bmQKICAgZW5kCiAgIAogICBkZWYgdG9fcwpAQCAtOTI4LDkgKzkzOSwxMCBAQCBjbGFzcyBLcmFr ZW5CZW5jaG1hcmsKIGVuZAogCiBjbGFzcyBCZW5jaG1hcmtTdWl0ZQotICBkZWYgaW5pdGlhbGl6 ZShuYW1lLCBwYXRoKQorICBkZWYgaW5pdGlhbGl6ZShuYW1lLCBwYXRoLCBwcmVmZXJyZWRNZWFu KQogICAgIEBuYW1lID0gbmFtZQogICAgIEBwYXRoID0gcGF0aAorICAgIEBwcmVmZXJyZWRNZWFu ID0gcHJlZmVycmVkTWVhbgogICAgIEBiZW5jaG1hcmtzID0gW10KICAgZW5kCiAgIApAQCAtOTY3 LDYgKzk3OSwxNCBAQCBjbGFzcyBCZW5jaG1hcmtTdWl0ZQogICAgICAgbm90IHlpZWxkIGJlbmNo bWFyawogICAgIH0KICAgZW5kCisgIAorICBkZWYgcHJlZmVycmVkTWVhbgorICAgIEBwcmVmZXJy ZWRNZWFuCisgIGVuZAorICAKKyAgZGVmIGNvbXB1dGVNZWFuKHN0YXQpCisgICAgc3RhdC5zZW5k IEBwcmVmZXJyZWRNZWFuCisgIGVuZAogZW5kCiAKIGNsYXNzIEJlbmNobWFya09uVk0KQEAgLTEw OTMsNyArMTExMywxNSBAQCBkZWYgY2VudGVyKHN0cixjaGFycykKIGVuZAogCiBkZWYgc3RhdHNU b1N0cihzdGF0cykKLSAgbHBhZChudW1Ub1N0cihzdGF0cy5tZWFuKSwxMSkrIistIitycGFkKG51 bVRvU3RyKHN0YXRzLmNvbmZJbnQpLDkpCisgIGlmICRpbm5lciokb3V0ZXIgPT0gMQorICAgIHN0 cmluZyA9IG51bVRvU3RyKHN0YXRzLm1lYW4pCisgICAgcmFpc2UgdW5sZXNzIHN0cmluZyA9fiAv XC4vCisgICAgbGVmdCA9ICR+LnByZV9tYXRjaAorICAgIHJpZ2h0ID0gJH4ucG9zdF9tYXRjaAor ICAgIGxwYWQobGVmdCwxMikrIi4iK3JwYWQocmlnaHQsOSkKKyAgZWxzZQorICAgIGxwYWQobnVt VG9TdHIoc3RhdHMubWVhbiksMTEpKyIrLSIrcnBhZChudW1Ub1N0cihzdGF0cy5jb25mSW50KSw5 KQorICBlbmQKIGVuZAogICAKIGJlZ2luCkBAIC0xMTA4LDkgKzExMzYsMTEgQEAgYmVnaW4KICAg ICAgICAgICAgICAgICAgWyctLWV4Y2x1ZGUtdjgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0s CiAgICAgICAgICAgICAgICAgIFsnLS1leGNsdWRlLWtyYWtlbicsIEdldG9wdExvbmc6Ok5PX0FS R1VNRU5UXSwKICAgICAgICAgICAgICAgICAgWyctLWJlbmNobWFya3MnLCBHZXRvcHRMb25nOjpS RVFVSVJFRF9BUkdVTUVOVF0sCisgICAgICAgICAgICAgICAgIFsnLS1mb3JjZS12bS1raW5kJywg R2V0b3B0TG9uZzo6UkVRVUlSRURfQVJHVU1FTlRdLAogICAgICAgICAgICAgICAgICBbJy0tbG9h ZC1vbmNlJywgR2V0b3B0TG9uZzo6Tk9fQVJHVU1FTlRdLAogICAgICAgICAgICAgICAgICBbJy0t a2VlcC1maWxlcycsIEdldG9wdExvbmc6Ok5PX0FSR1VNRU5UXSwKICAgICAgICAgICAgICAgICAg WyctLXZlcmJvc2UnLCAnLXYnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0sCisgICAgICAgICAg ICAgICAgIFsnLS1icmllZicsIEdldG9wdExvbmc6Ok5PX0FSR1VNRU5UXSwKICAgICAgICAgICAg ICAgICAgWyctLWhlbHAnLCAnLWgnLCBHZXRvcHRMb25nOjpOT19BUkdVTUVOVF0pLmVhY2ggewog ICAgIHwgb3B0LCBhcmcgfAogICAgIGNhc2Ugb3B0CkBAIC0xMTMxLDYgKzExNjEsMTcgQEAgYmVn aW4KICAgICAgICAgcXVpY2tGYWlsKCJFeHBlY3RlZCBlaXRoZXIgJ3ByZWNpc2VUaW1lJywgJ2Rh dGUnLCBvciAnYXV0bycgZm9yIC0tdGltZS1tb2RlLCBidXQgZ290ICcje2FyZ30nLiIsCiAgICAg ICAgICAgICAgICAgICAiSW52YWxpZCBhcmd1bWVudCBmb3IgY29tbWFuZC1saW5lIG9wdGlvbiIp CiAgICAgICBlbmQKKyAgICB3aGVuICctLWZvcmNlLXZtLWtpbmQnCisgICAgICBpZiBhcmcudXBj YXNlID09ICJKU0MiCisgICAgICAgICRmb3JjZVZNS2luZCA9IDpqc2MKKyAgICAgIGVsc2lmIGFy Zy51cGNhc2UgPT0gIkRVTVBSRU5ERVJUUkVFIgorICAgICAgICAkZm9yY2VWTUtpbmQgPSA6ZHVt cFJlbmRlclRyZWUKKyAgICAgIGVsc2lmIGFyZy51cGNhc2UgPT0gIkFVVE8iCisgICAgICAgICRm b3JjZVZNS2luZCA9IG5pbAorICAgICAgZWxzZQorICAgICAgICBxdWlja0ZhaWwoIkV4cGVjdGVk IGVpdGhlciAnanNjJyBvciAnRHVtcFJlbmRlclRyZWUnIGZvciAtLWZvcmNlLXZtLWtpbmQsIGJ1 dCBnb3QgJyN7YXJnfScuIiwKKyAgICAgICAgICAgICAgICAgICJJbnZhbGlkIGFyZ3VtZW50IGZv ciBjb21tYW5kLWxpbmUgb3B0aW9uIikKKyAgICAgIGVuZAogICAgIHdoZW4gJy0tc3Vuc3BpZGVy LW9ubHknCiAgICAgICAkaW5jbHVkZVY4ID0gZmFsc2UKICAgICAgICRpbmNsdWRlS3Jha2VuID0g ZmFsc2UKQEAgLTExNTQsNiArMTE5NSw4IEBAIGJlZ2luCiAgICAgICAka2VlcEZpbGVzID0gdHJ1 ZQogICAgIHdoZW4gJy0tdmVyYm9zZScKICAgICAgICR2ZXJib3NpdHkgKz0gMQorICAgIHdoZW4g Jy0tYnJpZWYnCisgICAgICAkYnJpZWYgPSB0cnVlCiAgICAgd2hlbiAnLS1oZWxwJwogICAgICAg dXNhZ2UKICAgICBlbHNlCkBAIC0xMTY2LDcgKzEyMDksNyBAQCBiZWdpbgogICAgICAgICAgICAg ICAiSW5zdWZmaWNpZW50IGFyZ3VtZW50cyIpCiAgIGVuZAogICAKLSAgU1VOU1BJREVSID0gQmVu Y2htYXJrU3VpdGUubmV3KCJTdW5TcGlkZXIiLCBTVU5TUElERVJfUEFUSCkKKyAgU1VOU1BJREVS ID0gQmVuY2htYXJrU3VpdGUubmV3KCJTdW5TcGlkZXIiLCBTVU5TUElERVJfUEFUSCwgOmFyaXRo bWV0aWNNZWFuKQogICBbIjNkLWN1YmUiLCAiM2QtbW9ycGgiLCAiM2QtcmF5dHJhY2UiLCAiYWNj ZXNzLWJpbmFyeS10cmVlcyIsCiAgICAiYWNjZXNzLWZhbm5rdWNoIiwgImFjY2Vzcy1uYm9keSIs ICJhY2Nlc3MtbnNpZXZlIiwKICAgICJiaXRvcHMtM2JpdC1iaXRzLWluLWJ5dGUiLCAiYml0b3Bz LWJpdHMtaW4tYnl0ZSIsICJiaXRvcHMtYml0d2lzZS1hbmQiLApAQCAtMTE3OSwxNCArMTIyMiwx NCBAQCBiZWdpbgogICAgIFNVTlNQSURFUi5hZGQgU3VuU3BpZGVyQmVuY2htYXJrLm5ldyhuYW1l KQogICB9CiAKLSAgVjggPSBCZW5jaG1hcmtTdWl0ZS5uZXcoIlY4IiwgVjhfUEFUSCkKKyAgVjgg PSBCZW5jaG1hcmtTdWl0ZS5uZXcoIlY4IiwgVjhfUEFUSCwgOmdlb21ldHJpY01lYW4pCiAgIFsi Y3J5cHRvIiwgImRlbHRhYmx1ZSIsICJlYXJsZXktYm95ZXIiLCAicmF5dHJhY2UiLAogICAgInJl Z2V4cCIsICJyaWNoYXJkcyIsICJzcGxheSJdLmVhY2ggewogICAgIHwgbmFtZSB8CiAgICAgVjgu YWRkIFY4QmVuY2htYXJrLm5ldyhuYW1lKQogICB9CiAKLSAgS1JBS0VOID0gQmVuY2htYXJrU3Vp dGUubmV3KCJLcmFrZW4iLCBLUkFLRU5fUEFUSCkKKyAgS1JBS0VOID0gQmVuY2htYXJrU3VpdGUu bmV3KCJLcmFrZW4iLCBLUkFLRU5fUEFUSCwgOmFyaXRobWV0aWNNZWFuKQogICBbImFpLWFzdGFy IiwgImF1ZGlvLWJlYXQtZGV0ZWN0aW9uIiwgImF1ZGlvLWRmdCIsICJhdWRpby1mZnQiLAogICAg ImF1ZGlvLW9zY2lsbGF0b3IiLCAiaW1hZ2luZy1kYXJrcm9vbSIsICJpbWFnaW5nLWRlc2F0dXJh dGUiLAogICAgImltYWdpbmctZ2F1c3NpYW4tYmx1ciIsICJqc29uLXBhcnNlLWZpbmFuY2lhbCIs CkBAIC0xMjg1LDYgKzEzMjgsMTEgQEAgYmVnaW4KICAgICB8IHN1aXRlIHwKICAgICAkc3VpdGVz T25WTXNGb3JTdWl0ZVtzdWl0ZV0gPSBbXQogICB9CisgICRzdWl0ZXNPblZNc0ZvclZNID0ge30K KyAgJHZtcy5lYWNoIHsKKyAgICB8IHZtIHwKKyAgICAkc3VpdGVzT25WTXNGb3JWTVt2bV0gPSBb XQorICB9CiAgIAogICAkYmVuY2htYXJrc09uVk1zID0gW10KICAgJGJlbmNobWFya3NPblZNc0Zv ckJlbmNobWFyayA9IHt9CkBAIC0xMzAwLDYgKzEzNDgsNyBAQCBiZWdpbgogICAgICAgc3VpdGVP blZNID0gU3VpdGVPblZNLm5ldyh2bSwgc3VpdGUpCiAgICAgICAkc3VpdGVzT25WTXMgPDwgc3Vp dGVPblZNCiAgICAgICAkc3VpdGVzT25WTXNGb3JTdWl0ZVtzdWl0ZV0gPDwgc3VpdGVPblZNCisg ICAgICAkc3VpdGVzT25WTXNGb3JWTVt2bV0gPDwgc3VpdGVPblZNCiAgICAgICBzdWl0ZS5iZW5j aG1hcmtzLmVhY2ggewogICAgICAgICB8IGJlbmNobWFyayB8CiAgICAgICAgIGJlbmNobWFya09u Vk0gPSBCZW5jaG1hcmtPblZNLm5ldyh2bSwgYmVuY2htYXJrLCBzdWl0ZU9uVk0pCkBAIC0xMzI2 LDcgKzEzNzUsNyBAQCBiZWdpbgogICB9Lm1heCArIDEKICAgCiAgICRiZW5jaHBhZCA9ICgkYmVu Y2htYXJrcyArCi0gICAgICAgICAgICAgICBbIjxhcml0aG1ldGljPiIsICI8Z2VvbWV0cmljPiIs ICI8aGFybW9uaWM+Il0pLmNvbGxlY3QgeworICAgICAgICAgICAgICAgWyI8YXJpdGhtZXRpYz4g KiIsICI8Z2VvbWV0cmljPiAqIiwgIjxoYXJtb25pYz4gKiJdKS5jb2xsZWN0IHsKICAgICB8IGJl bmNobWFyayB8CiAgICAgYmVuY2htYXJrLnRvX3Muc2l6ZQogICB9Lm1heCArIDEKQEAgLTEzMzUs MTAgKzEzODQsMjEgQEAgYmVnaW4KICAgICB8IHZtIHwKICAgICB2bS50b19zLnNpemUKICAgfS5t YXggKyAxCisKKyAgdW5sZXNzICRicmllZgorICAgIDMudGltZXMgeworICAgICAgfCBpZHggfAor ICAgICAgJHN0ZGVyci5wcmludCAiXHJTdGFydGluZyBpbiAjezMtaWR4fS4uLiIKKyAgICAgICRz dGRlcnIuZmx1c2gKKyAgICAgIHNsZWVwIDEKKyAgICB9CisgICAgJHN0ZGVyci5wcmludCAiXHIg ICAgICAgICAgICAgICAgICAgICAgIFxyIgorICAgICRzdGRlcnIuZmx1c2gKKyAgZW5kCiAgIAog ICAkcGxhbnMuZWFjaF93aXRoX2luZGV4IHsKICAgICB8IHBsYW4sIGlkeCB8Ci0gICAgaWYgJHZl cmJvc2l0eSA9PSAwCisgICAgaWYgJHZlcmJvc2l0eSA9PSAwIGFuZCBub3QgJGJyaWVmCiAgICAg ICB0ZXh0MSA9IGxwYWQoaWR4LnRvX3MsJHBsYW5zLnNpemUudG9fcy5zaXplKSsiLyIrJHBsYW5z LnNpemUudG9fcwogICAgICAgdGV4dDIgPSBwbGFuLnN1aXRlLnRvX3MrIi8iK3BsYW4uYmVuY2ht YXJrLnRvX3MrIi8iK3BsYW4udm0udG9fcwogICAgICAgJHN0ZGVyci5wcmludCAiXHIje3RleHQx fSAje3JwYWQodGV4dDIsJHN1aXRlcGFkKzErJGJlbmNocGFkKzErJHZtcGFkKX0iCkBAIC0xMzQ4 LDExICsxNDA4LDQ0IEBAIGJlZ2luCiAgICAgcGxhbi5ydW5BbmRSZWNvcmQKICAgfQogICAKLSAg aWYgJHZlcmJvc2l0eSA9PSAwCisgIGlmICR2ZXJib3NpdHkgPT0gMCBhbmQgbm90ICRicmllZgog ICAgICRzdGRlcnIucHJpbnQgIlxyI3skcGxhbnMuc2l6ZX0vI3skcGxhbnMuc2l6ZX0gI3snICcq KCRzdWl0ZXBhZCsxKyRiZW5jaHBhZCsxKyR2bXBhZCl9IgogICAgICRzdGRlcnIucHV0cyAiXHIj eyRwbGFucy5zaXplfS8jeyRwbGFucy5zaXplfSIKICAgZW5kCiAgIAorICAjIENvbXB1dGUgdGhl IGdlb21lYW4gb2YgdGhlIHByZWZlcnJlZCBtZWFucyBvZiByZXN1bHRzIG9uIGEgU3VpdGVPblZN CisgICRvdmVyYWxsUmVzdWx0cyA9IFtdCisgICR2bXMuZWFjaCB7CisgICAgfCB2bSB8CisgICAg cmVzdWx0ID0gU3RhdHMubmV3CisgICAgJG91dGVyLnRpbWVzIHsKKyAgICAgIHwgb3V0ZXJJbmRl eCB8CisgICAgICAkaW5uZXIudGltZXMgeworICAgICAgICB8IGlubmVySW5kZXggfAorICAgICAg ICBjdXJSZXN1bHQgPSBTdGF0cy5uZXcKKyAgICAgICAgJHN1aXRlc09uVk1zRm9yVk1bdm1dLmVh Y2ggeworICAgICAgICAgIHwgc3VpdGVPblZNIHwKKyAgICAgICAgICAjIEZvciBhIGdpdmVuIGl0 ZXJhdGlvbiwgc3VpdGUsIGFuZCBWTSwgY29tcHV0ZSB0aGUgc3VpdGUncyBwcmVmZXJyZWQgbWVh bgorICAgICAgICAgICMgb3ZlciB0aGUgZGF0YSBjb2xsZWN0ZWQgZm9yIGFsbCBiZW5jaG1hcmtz IGluIHRoYXQgc3VpdGUuIFdlJ2xsIGhhdmUgb25lCisgICAgICAgICAgIyBzYW1wbGUgcGVyIGJl bmNobWFyay4gRm9yIGV4YW1wbGUgb24gVjggdGhpcyB3aWxsIGJlIHRoZSBnZW9tZWFuIG9mIDEK KyAgICAgICAgICAjIHNhbXBsZSBmb3IgY3J5cHRvLCAxIHNhbXBsZSBmb3IgZGVsdGFibHVlLCBh bmQgc28gb24sIGFuZCAxIHNhbXBsZSBmb3IKKyAgICAgICAgICAjIHNwbGF5LgorICAgICAgICAg IGN1clJlc3VsdC5hZGQoc3VpdGVPblZNLnN1aXRlLmNvbXB1dGVNZWFuKHN1aXRlT25WTS5zdGF0 c0Zvckl0ZXJhdGlvbihvdXRlckluZGV4LCBpbm5lckluZGV4KSkpCisgICAgICAgIH0KKyAgICAg ICAgCisgICAgICAgICMgY3VyUmVzdWx0IG5vdyBob2xkcyAxIHNhbXBsZSBmb3IgZWFjaCBvZiB0 aGUgbWVhbnMgY29tcHV0ZWQgaW4gdGhlIGFib3ZlCisgICAgICAgICMgbG9vcC4gQ29tcHV0ZSB0 aGUgZ2VvbWVhbiBvdmVyIHRoaXMsIGFuZCBzdG9yZSBpdC4KKyAgICAgICAgcmVzdWx0LmFkZChj dXJSZXN1bHQuZ2VvbWV0cmljTWVhbikKKyAgICAgIH0KKyAgICB9CisKKyAgICAjICRvdmVyYWxs UmVzdWx0cyB3aWxsIGhhdmUgYSBTdGF0cyBmb3IgZWFjaCBWTS4gVGhhdCBTdGF0cyBvYmplY3Qg d2lsbCBob2xkCisgICAgIyAkaW5uZXIqJG91dGVyIGdlb21lYW5zLCBhbGxvd2luZyB1cyB0byBj b21wdXRlIHRoZSBhcml0aG1ldGljIG1lYW4gYW5kCisgICAgIyBjb25maWRlbmNlIGludGVydmFs IG9mIHRoZSBnZW9tZWFucyBvZiBwcmVmZXJyZWQgbWVhbnMuIENvbnZvbHV0ZWQsIGJ1dAorICAg ICMgdXNlZnVsIGFuZCBwcm9iYWJseSBzb3VuZC4KKyAgICAkb3ZlcmFsbFJlc3VsdHMgPDwgcmVz dWx0CisgIH0KKyAgCiAgIGlmICR2ZXJib3NpdHkgPj0gMgogICAgICRiZW5jaG1hcmtzT25WTXMu ZWFjaCB7CiAgICAgICB8IGJlbmNobWFya09uVk0gfApAQCAtMTM2NSw3ICsxNDU4LDcgQEAgYmVn aW4KICAgICAgICRzdGRlcnIucHV0cyAiI3t2bX0gKGdlb21ldHJpY01lYW4pOiAje3ZtLmdlb21l dHJpY01lYW5TdGF0c30iCiAgICAgfQogICBlbmQKLSAgCisKICAgcmVwb3J0TmFtZSA9CiAgICAg KGlmICgkdm1zLmNvbGxlY3QgewogICAgICAgICAgICB8IHZtIHwKQEAgLTEzODksOCArMTQ4Miwx MCBAQCBiZWdpbgogICAgICAgICAgICB0aW1lLmhvdXIsIHRpbWUubWluIF0KICAgICAgZW5kKSAr CiAgICAgIl9iZW5jaFJlcG9ydC50eHQiCi0gIAotICAkc3RkZXJyLnB1dHMgIkdlbmVyYXRpbmcg YmVuY2htYXJrIHJlcG9ydCBhdCAje3JlcG9ydE5hbWV9IgorCisgIHVubGVzcyAkYnJpZWYKKyAg ICAkc3RkZXJyLnB1dHMgIkdlbmVyYXRpbmcgYmVuY2htYXJrIHJlcG9ydCBhdCAje3JlcG9ydE5h bWV9IgorICBlbmQKICAgCiAgIG91dHAgPSAkc3Rkb3V0CiAgIGJlZ2luCkBAIC0xNTIxLDE4ICsx NjE2LDI2IEBAIGJlZ2luCiAgICAgb3V0cC5wdXRzCiAgIGVuZAogICAKLSAgZGVmIGFsbFN1bW1h cnlTdGF0cyhvdXRwLCBhY2N1bXVsYXRvcnMpCi0gICAgc3VtbWFyeVN0YXRzKG91dHAsIGFjY3Vt dWxhdG9ycywgIjxhcml0aG1ldGljPiIpIHsKKyAgZGVmIG1lYW5OYW1lKGN1cnJlbnRNZWFuLCBw cmVmZXJyZWRNZWFuKQorICAgIHJlc3VsdCA9ICI8I3tjdXJyZW50TWVhbn0+IgorICAgIGlmICIj e2N1cnJlbnRNZWFufU1lYW4iID09IHByZWZlcnJlZE1lYW4udG9fcworICAgICAgcmVzdWx0ICs9 ICIgKiIKKyAgICBlbmQKKyAgICByZXN1bHQKKyAgZW5kCisgIAorICBkZWYgYWxsU3VtbWFyeVN0 YXRzKG91dHAsIGFjY3VtdWxhdG9ycywgcHJlZmVycmVkTWVhbikKKyAgICBzdW1tYXJ5U3RhdHMo b3V0cCwgYWNjdW11bGF0b3JzLCBtZWFuTmFtZSgiYXJpdGhtZXRpYyIsIHByZWZlcnJlZE1lYW4p KSB7CiAgICAgICB8IHN0YXQgfAogICAgICAgc3RhdC5hcml0aG1ldGljTWVhbgogICAgIH0KICAg ICAKLSAgICBzdW1tYXJ5U3RhdHMob3V0cCwgYWNjdW11bGF0b3JzLCAiPGdlb21ldHJpYz4iKSB7 CisgICAgc3VtbWFyeVN0YXRzKG91dHAsIGFjY3VtdWxhdG9ycywgbWVhbk5hbWUoImdlb21ldHJp YyIsIHByZWZlcnJlZE1lYW4pKSB7CiAgICAgICB8IHN0YXQgfAogICAgICAgc3RhdC5nZW9tZXRy aWNNZWFuCiAgICAgfQogICAgIAotICAgIHN1bW1hcnlTdGF0cyhvdXRwLCBhY2N1bXVsYXRvcnMs ICI8aGFybW9uaWM+IikgeworICAgIHN1bW1hcnlTdGF0cyhvdXRwLCBhY2N1bXVsYXRvcnMsIG1l YW5OYW1lKCJoYXJtb25pYyIsIHByZWZlcnJlZE1lYW4pKSB7CiAgICAgICB8IHN0YXQgfAogICAg ICAgc3RhdC5oYXJtb25pY01lYW4KICAgICB9CkBAIC0xNTY1LDE3ICsxNjY4LDM2IEBAIGJlZ2lu CiAgICAgICBvdXRwLnB1dHMKICAgICB9CiAgICAgb3V0cC5wdXRzCi0gICAgYWxsU3VtbWFyeVN0 YXRzKG91dHAsICRzdWl0ZXNPblZNc0ZvclN1aXRlW3N1aXRlXSkKKyAgICBhbGxTdW1tYXJ5U3Rh dHMob3V0cCwgJHN1aXRlc09uVk1zRm9yU3VpdGVbc3VpdGVdLCBzdWl0ZS5wcmVmZXJyZWRNZWFu KQogICAgIG91dHAucHV0cyBpZiAkc3VpdGVzLnNpemUgPiAxCiAgIH0KICAgCiAgIGlmICRzdWl0 ZXMuc2l6ZSA+IDEKICAgICBwcmludFZNcyhvdXRwKQogICAgIG91dHAucHV0cyAiQWxsIGJlbmNo bWFya3M6IgotICAgIGFsbFN1bW1hcnlTdGF0cyhvdXRwLCAkdm1zKQorICAgIGFsbFN1bW1hcnlT dGF0cyhvdXRwLCAkdm1zLCBuaWwpCisgICAgCisgICAgb3V0cC5wdXRzCisgICAgcHJpbnRWTXMo b3V0cCkKKyAgICBvdXRwLnB1dHMgIkdlb21lYW4gb2YgcHJlZmVycmVkIG1lYW5zOiIKKyAgICBv dXRwLnByaW50ICIgICAiCisgICAgb3V0cC5wcmludCBycGFkKCI8c2NhbGVkLXJlc3VsdD4iLCAk YmVuY2hwYWQpCisgICAgb3V0cC5wcmludCAiICIKKyAgICAkdm1zLnNpemUudGltZXMgeworICAg ICAgfCBpbmRleCB8CisgICAgICBpZiBpbmRleCAhPSAwCisgICAgICAgIG91dHAucHJpbnQgIiAi KyRvdmVyYWxsUmVzdWx0c1tpbmRleF0uY29tcGFyZVRvKCRvdmVyYWxsUmVzdWx0c1tpbmRleC0x XSkuc2hvcnRGb3JtCisgICAgICBlbmQKKyAgICAgIG91dHAucHJpbnQgc3RhdHNUb1N0cigkb3Zl cmFsbFJlc3VsdHNbaW5kZXhdKQorICAgIH0KKyAgICBpZiAkb3ZlcmFsbFJlc3VsdHMuc2l6ZT49 MgorICAgICAgb3V0cC5wcmludCgiICAgICIrJG92ZXJhbGxSZXN1bHRzWy0xXS5jb21wYXJlVG8o JG92ZXJhbGxSZXN1bHRzWzBdKS50b19zKQorICAgIGVuZAorICAgIG91dHAucHV0cworICAgIG91 dHAucHV0cwogICBlbmQKICAgCi0gIGlmIG91dHAgIT0gJHN0ZG91dAorICBpZiBvdXRwICE9ICRz dGRvdXQgYW5kIG5vdCAkYnJpZWYKICAgICBvdXRwLmNsb3NlCiAgICAgcHV0cwogICAgIEZpbGUu b3BlbihyZXBvcnROYW1lKSB7CkBAIC0xNTg0LDYgKzE3MDYsMTEgQEAgYmVnaW4KICAgICB9CiAg IGVuZAogICAKKyAgaWYgJGJyaWVmCisgICAgcHV0cygkb3ZlcmFsbFJlc3VsdHMuY29sbGVjdHt8 c3RhdHN8IHN0YXRzLm1lYW59LmpvaW4oIlx0IikpCisgICAgcHV0cygkb3ZlcmFsbFJlc3VsdHMu Y29sbGVjdHt8c3RhdHN8IHN0YXRzLmNvbmZJbnR9LmpvaW4oIlx0IikpCisgIGVuZAorICAKIHJl c2N1ZSA9PiBlCiAgIGZhaWwoZSkKIGVuZAo=