Title: [224695] trunk/Tools
- Revision
- 224695
- Author
- jbed...@apple.com
- Date
- 2017-11-10 10:30:22 -0800 (Fri, 10 Nov 2017)
Log Message
webkitpy: Remove find_system_pid from port classes
https://bugs.webkit.org/show_bug.cgi?id=179514
<rdar://problem/35456900>
Reviewed by David Kilzer.
Removing dead code.
* Scripts/webkitpy/port/base.py:
(Port.find_system_pid): Deleted.
* Scripts/webkitpy/port/server_process.py:
(ServerProcess._start):
* Scripts/webkitpy/port/win.py:
(WinPort.find_system_pid): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224694 => 224695)
--- trunk/Tools/ChangeLog 2017-11-10 18:06:29 UTC (rev 224694)
+++ trunk/Tools/ChangeLog 2017-11-10 18:30:22 UTC (rev 224695)
@@ -1,3 +1,20 @@
+2017-11-10 Jonathan Bedard <jbed...@apple.com>
+
+ webkitpy: Remove find_system_pid from port classes
+ https://bugs.webkit.org/show_bug.cgi?id=179514
+ <rdar://problem/35456900>
+
+ Reviewed by David Kilzer.
+
+ Removing dead code.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.find_system_pid): Deleted.
+ * Scripts/webkitpy/port/server_process.py:
+ (ServerProcess._start):
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.find_system_pid): Deleted.
+
2017-11-10 Aakash Jain <aakash_j...@apple.com>
fix style failures in webkitpy: multiple statements on one line (semicolon)
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (224694 => 224695)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2017-11-10 18:06:29 UTC (rev 224694)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2017-11-10 18:30:22 UTC (rev 224695)
@@ -1380,10 +1380,6 @@
def sample_process(self, name, pid, target_host=None):
pass
- def find_system_pid(self, name, pid):
- # This is only overridden on Windows
- return pid
-
def should_run_as_pixel_test(self, test_input):
if not self._options.pixel_tests:
return False
Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (224694 => 224695)
--- trunk/Tools/Scripts/webkitpy/port/server_process.py 2017-11-10 18:06:29 UTC (rev 224694)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py 2017-11-10 18:30:22 UTC (rev 224695)
@@ -120,7 +120,6 @@
env=self._env,
universal_newlines=self._universal_newlines)
self._pid = self._proc.pid
- self._port.find_system_pid(self.process_name(), self._pid)
if not self._use_win32_apis:
self._set_file_nonblocking(self._proc.stdout)
self._set_file_nonblocking(self._proc.stderr)
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (224694 => 224695)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2017-11-10 18:06:29 UTC (rev 224694)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2017-11-10 18:30:22 UTC (rev 224695)
@@ -431,39 +431,7 @@
crash_logs[test_name] = crash_log
return crash_logs
- def find_system_pid(self, name, pid):
- system_pid = int(pid)
- if self.is_cygwin():
- # Windows and Cygwin PIDs are not the same. We need to find the Windows
- # PID for our Cygwin process so we can match it later to any crash
- # files we end up creating (which will be tagged with the Windows PID)
- ps_process = self._executive.run_command(['ps', '-e'], error_handler=Executive.ignore_error)
- for line in ps_process.splitlines():
- tokens = line.strip().split()
- try:
- cpid, ppid, pgid, winpid, tty, uid, stime, process_name = tokens
- if process_name.endswith(name):
- self._executive.pid_to_system_pid[int(cpid)] = int(winpid)
- if int(pid) == int(cpid):
- system_pid = int(winpid)
- break
- except ValueError, e:
- pass
- else:
- wmi = win32com.client.GetObject('winmgmts:')
- _log.debug('Querying WMI with "%{0}%"'.format(name))
- procs = wmi.ExecQuery('Select * from win32_process where name like "%{0}%"'.format(name))
- for proc in procs:
- self._executive.pid_to_system_pid[int(proc.ProcessId)] = int(proc.ProcessId)
- _log.debug("I see {0}: {1}".format(proc.Name, proc.ProcessId))
- if int(pid) == int(proc.ProcessId):
- system_pid = int(proc.ProcessId)
- break
-
- return system_pid
-
-
class WinCairoPort(WinPort):
port_name = "wincairo"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
