Build Tools Cleanup
Cleans up Python Code in Build Tools TEST: build everything and run tests BUG: https://code.google.com/p/dart/issues/detail?id=19592 R=ricow@google.com Review URL: https://codereview.chromium.org//350483003 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@38573 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
+15
-15
@@ -12,12 +12,12 @@
|
||||
import optparse
|
||||
import os
|
||||
import signal
|
||||
import shutil
|
||||
import string
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
import utils
|
||||
|
||||
|
||||
os_name = utils.GuessOS()
|
||||
|
||||
POSIX_INFO = 'ps -p %s -o args'
|
||||
@@ -118,13 +118,13 @@ def GetPidsWindows(process_name):
|
||||
return results
|
||||
|
||||
def GetPids(process_name):
|
||||
if (os_name == "win32"):
|
||||
if os_name == "win32":
|
||||
return GetPidsWindows(process_name)
|
||||
else:
|
||||
return GetPidsPosix(process_name)
|
||||
|
||||
def PrintPidInfo(pid):
|
||||
# We asume that the list command will return lines in the format:
|
||||
# We assume that the list command will return lines in the format:
|
||||
# EXECUTABLE_PATH ARGS
|
||||
# There may be blank strings in the output
|
||||
p = subprocess.Popen(INFO_COMMAND[os_name] % pid,
|
||||
@@ -146,7 +146,7 @@ def PrintPidInfo(pid):
|
||||
|
||||
def KillPosix(pid):
|
||||
try:
|
||||
os.kill(int(pid), signal.SIGKILL);
|
||||
os.kill(int(pid), signal.SIGKILL)
|
||||
except:
|
||||
# Ignore this, the process is already dead from killing another process.
|
||||
pass
|
||||
@@ -161,19 +161,19 @@ def KillWindows(pid):
|
||||
p.communicate()
|
||||
|
||||
def Kill(name):
|
||||
if (name not in EXECUTABLE_NAMES[os_name]):
|
||||
if name not in EXECUTABLE_NAMES[os_name]:
|
||||
return 0
|
||||
print("***************** Killing %s *****************" % name)
|
||||
platform_name = EXECUTABLE_NAMES[os_name][name]
|
||||
pids = GetPids(platform_name)
|
||||
for pid in pids:
|
||||
PrintPidInfo(pid);
|
||||
if (os_name == "win32"):
|
||||
PrintPidInfo(pid)
|
||||
if os_name == "win32":
|
||||
KillWindows(pid)
|
||||
else:
|
||||
KillPosix(pid)
|
||||
print("Killed pid: %s" % pid)
|
||||
if (len(pids) == 0):
|
||||
if len(pids) == 0:
|
||||
print(" No %s processes found." % name)
|
||||
return len(pids)
|
||||
|
||||
@@ -205,13 +205,13 @@ def KillEditor():
|
||||
def Main():
|
||||
options = GetOptions()
|
||||
status = 0
|
||||
if (options.kill_dart):
|
||||
status += KillDart();
|
||||
if (options.kill_vc):
|
||||
status += KillVCSystems();
|
||||
if (options.kill_browsers):
|
||||
if options.kill_dart:
|
||||
status += KillDart()
|
||||
if options.kill_vc:
|
||||
status += KillVCSystems()
|
||||
if options.kill_browsers:
|
||||
status += KillBrowsers()
|
||||
if (options.kill_editor):
|
||||
if options.kill_editor:
|
||||
status += KillEditor()
|
||||
return status
|
||||
|
||||
|
||||
Reference in New Issue
Block a user