116492 2013-05-20 19:08:46 -0700 Remove DriverProxy._running_drivers from webkitpy.layout_tests.port 2013-05-20 22:49:53 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 rniwa rniwa benjamin commit-queue dpranke glenn ojan simon.fraser oldest_to_newest 891504 0 rniwa 2013-05-20 19:08:46 -0700 Merge https://chromium.googlesource.com/chromium/blink/+/1af2f0be5a1746784ff114952f29f7b8fa9895f3 The DriverProxy class had the concept of keeping a pool of started DRTs around (indexed by command line) so that we didn't necessarily need to restart DRT when the command line for a test changed (e.g., when starting to run tests in a virtual suite). However, the pool was per-worker (so not shared across the machine) and we didn't cap the number of processes started, so we would end up with a whole bunch of DRTs (3x-4x the number of workers started). If anything, this seemed to make the tests slightly slower and probably added to memory pressure on the machine. This change removes the pool code; now we'll simply restart DRT when the command line changes. With this change, we can actually fold the restarting code into Driver itself (and get rid of DriverProxy), but I'll leave that for a subsequent patch just to make things easier to follow. 891506 1 202369 rniwa 2013-05-20 19:10:17 -0700 Created attachment 202369 Merges the patch 891569 2 202369 commit-queue 2013-05-20 22:49:51 -0700 Comment on attachment 202369 Merges the patch Clearing flags on attachment: 202369 Committed r150416: <http://trac.webkit.org/changeset/150416> 891570 3 commit-queue 2013-05-20 22:49:53 -0700 All reviewed patches have been landed. Closing bug. 202369 2013-05-20 19:10:17 -0700 2013-05-20 22:49:51 -0700 Merges the patch bug-116492-20130520190906.patch text/plain 3660 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1MDM5OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDEzLTA1LTIwICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSBEcml2ZXJQcm94eS5fcnVubmluZ19kcml2ZXJzIGZyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLnBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNjQ5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE1lcmdlIGh0dHBzOi8vY2hyb21pdW0uZ29vZ2xlc291cmNlLmNvbS9jaHJv bWl1bS9ibGluay8rLzFhZjJmMGJlNWExNzQ2Nzg0ZmYxMTQ5NTJmMjlmN2I4ZmE5ODk1ZjMuCisK KyAgICAgICAgVGhlIERyaXZlclByb3h5IGNsYXNzIGhhZCB0aGUgY29uY2VwdCBvZiBrZWVwaW5n IGEgcG9vbCBvZiBzdGFydGVkIERSVHMgYXJvdW5kIChpbmRleGVkIGJ5IGNvbW1hbmQgbGluZSkK KyAgICAgICAgc28gdGhhdCB3ZSBkaWRuJ3QgbmVjZXNzYXJpbHkgbmVlZCB0byByZXN0YXJ0IERS VCB3aGVuIHRoZSBjb21tYW5kIGxpbmUgZm9yIGEgdGVzdCBjaGFuZ2VkIChlLmcuLCB3aGVuCisg ICAgICAgIHN0YXJ0aW5nIHRvIHJ1biB0ZXN0cyBpbiBhIHZpcnR1YWwgc3VpdGUpLiBIb3dldmVy LCB0aGUgcG9vbCB3YXMgcGVyLXdvcmtlciAoc28gbm90IHNoYXJlZCBhY3Jvc3MgdGhlIG1hY2hp bmUpCisgICAgICAgIGFuZCB3ZSBkaWRuJ3QgY2FwIHRoZSBudW1iZXIgb2YgcHJvY2Vzc2VzIHN0 YXJ0ZWQsIHNvIHdlIHdvdWxkIGVuZCB1cCB3aXRoIGEgd2hvbGUgYnVuY2ggb2YgRFJUcyAoM3gt NHgKKyAgICAgICAgdGhlIG51bWJlciBvZiB3b3JrZXJzIHN0YXJ0ZWQpLiBJZiBhbnl0aGluZywg dGhpcyBzZWVtZWQgdG8gbWFrZSB0aGUgdGVzdHMgc2xpZ2h0bHkgc2xvd2VyIGFuZCBwcm9iYWJs eSBhZGRlZAorICAgICAgICB0byBtZW1vcnkgcHJlc3N1cmUgb24gdGhlIG1hY2hpbmUuCisKKyAg ICAgICAgVGhpcyBjaGFuZ2UgcmVtb3ZlcyB0aGUgcG9vbCBjb2RlOyBub3cgd2UnbGwgc2ltcGx5 IHJlc3RhcnQgRFJUIHdoZW4gdGhlIGNvbW1hbmQgbGluZSBjaGFuZ2VzLiBXaXRoIHRoaXMgY2hh bmdlLAorICAgICAgICB3ZSBjYW4gYWN0dWFsbHkgZm9sZCB0aGUgcmVzdGFydGluZyBjb2RlIGlu dG8gRHJpdmVyIGl0c2VsZiAoYW5kIGdldCByaWQgb2YgRHJpdmVyUHJveHkpLCBidXQgSSdsbCBs ZWF2ZSB0aGF0CisgICAgICAgIGZvciBhIHN1YnNlcXVlbnQgcGF0Y2gganVzdCB0byBtYWtlIHRo aW5ncyBlYXNpZXIgdG8gZm9sbG93LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0 L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlclByb3h5Ll9faW5pdF9fKToKKyAgICAgICAgKERy aXZlclByb3h5LnJ1bl90ZXN0KToKKyAgICAgICAgKERyaXZlclByb3h5Lmhhc19jcmFzaGVkKToK KyAgICAgICAgKERyaXZlclByb3h5LnN0b3ApOgorCiAyMDEzLTA1LTIwICBKZXNzaWUgQmVybGlu ICA8amJlcmxpbkBhcHBsZS5jb20+CiAKICAgICAgICAgRXhwb3NlIGEgd2F5IHRvIGtub3cgd2hl biBmb3JtcyBhcmUgYWRkZWQgdG8gYSBwYWdlIG9yIHdoZW4gZm9ybSBjb250cm9scyBhcmUgYWRk ZWQgdG8gYSBmb3JtCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkJKHJl dmlzaW9uIDE1MDM5MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kcml2ZXIucHkJ KHdvcmtpbmcgY29weSkKQEAgLTUxMSw4ICs1MTEsNyBAQCBjbGFzcyBEcml2ZXJQcm94eShvYmpl Y3QpOgogCiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZG4ndCBuZWVkIHRvIGNyZWF0ZSBhIGRy aXZlciB1bnRpbCB3ZSBhY3R1YWxseSBydW4gYSB0ZXN0LgogICAgICAgICBzZWxmLl9kcml2ZXIg PSBzZWxmLl9tYWtlX2RyaXZlcihwaXhlbF90ZXN0cykKLSAgICAgICAgc2VsZi5fcnVubmluZ19k cml2ZXJzID0ge30KLSAgICAgICAgc2VsZi5fcnVubmluZ19kcml2ZXJzW3NlbGYuX2NtZF9saW5l X2FzX2tleShwaXhlbF90ZXN0cywgW10pXSA9IHNlbGYuX2RyaXZlcgorICAgICAgICBzZWxmLl9k cml2ZXJfY21kX2xpbmUgPSBOb25lCiAKICAgICBkZWYgX21ha2VfZHJpdmVyKHNlbGYsIHBpeGVs X3Rlc3RzKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2RyaXZlcl9pbnN0YW5jZV9jb25zdHJ1Y3Rv cihzZWxmLl9wb3J0LCBzZWxmLl93b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgc2VsZi5fbm9f dGltZW91dCkKQEAgLTUzOSwxNyArNTM4LDE4IEBAIGNsYXNzIERyaXZlclByb3h5KG9iamVjdCk6 CiAKICAgICAgICAgcGl4ZWxfdGVzdHNfbmVlZGVkID0gZHJpdmVyX2lucHV0LnNob3VsZF9ydW5f cGl4ZWxfdGVzdAogICAgICAgICBjbWRfbGluZV9rZXkgPSBzZWxmLl9jbWRfbGluZV9hc19rZXko cGl4ZWxfdGVzdHNfbmVlZGVkLCBkcml2ZXJfaW5wdXQuYXJncykKLSAgICAgICAgaWYgbm90IGNt ZF9saW5lX2tleSBpbiBzZWxmLl9ydW5uaW5nX2RyaXZlcnM6Ci0gICAgICAgICAgICBzZWxmLl9y dW5uaW5nX2RyaXZlcnNbY21kX2xpbmVfa2V5XSA9IHNlbGYuX21ha2VfZHJpdmVyKHBpeGVsX3Rl c3RzX25lZWRlZCkKKyAgICAgICAgaWYgY21kX2xpbmVfa2V5ICE9IHNlbGYuX2RyaXZlcl9jbWRf bGluZToKKyAgICAgICAgICAgIHNlbGYuX2RyaXZlci5zdG9wKCkKKyAgICAgICAgICAgIHNlbGYu X2RyaXZlciA9IHNlbGYuX21ha2VfZHJpdmVyKHBpeGVsX3Rlc3RzX25lZWRlZCkKKyAgICAgICAg ICAgIHNlbGYuX2RyaXZlcl9jbWRfbGluZSA9IGNtZF9saW5lX2tleQogCi0gICAgICAgIHJldHVy biBzZWxmLl9ydW5uaW5nX2RyaXZlcnNbY21kX2xpbmVfa2V5XS5ydW5fdGVzdChkcml2ZXJfaW5w dXQsIHN0b3Bfd2hlbl9kb25lKQorICAgICAgICByZXR1cm4gc2VsZi5fZHJpdmVyLnJ1bl90ZXN0 KGRyaXZlcl9pbnB1dCwgc3RvcF93aGVuX2RvbmUpCiAKICAgICBkZWYgaGFzX2NyYXNoZWQoc2Vs Zik6Ci0gICAgICAgIHJldHVybiBhbnkoZHJpdmVyLmhhc19jcmFzaGVkKCkgZm9yIGRyaXZlciBp biBzZWxmLl9ydW5uaW5nX2RyaXZlcnMudmFsdWVzKCkpCisgICAgICAgIHJldHVybiBzZWxmLl9k cml2ZXIuaGFzX2NyYXNoZWQoKQogCiAgICAgZGVmIHN0b3Aoc2VsZik6Ci0gICAgICAgIGZvciBk cml2ZXIgaW4gc2VsZi5fcnVubmluZ19kcml2ZXJzLnZhbHVlcygpOgotICAgICAgICAgICAgZHJp dmVyLnN0b3AoKQorICAgICAgICBzZWxmLl9kcml2ZXIuc3RvcCgpCiAKICAgICAjIEZJWE1FOiB0 aGlzIHNob3VsZCBiZSBhIEBjbGFzc21ldGhvZCAob3IgaW1wbGVtZW50ZWQgb24gUG9ydCBpbnN0 ZWFkKS4KICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxfdGVzdHM9Tm9uZSwgcGVyX3Rlc3Rf YXJncz1Ob25lKToK