Merge remote branch 'cros/upstream' into master

server/standalone_profiler.py

 #
 # Copyright 2007 Google Inc. All Rights Reserved.
 
 """Runs profilers on a machine when no autotest job is running.
 
 This is used to profile a task when the task is running on a machine that is not
 running through autotest.
 """
 
 __author__ = 'cranger@google.com (Colby Ranger)'
 
+import platform
 import common
 from autotest_lib.client.common_lib import barrier
 
 # Client control file snippet used to synchronize profiler start & stop.
 _RUNTEST_PATTERN = ("job.run_test('profiler_sync', timeout_sync=%r,\n"
                     "             timeout_start=%r, timeout_stop=%r,\n"
                     "             hostid='%s', masterid='%s', all_ids=%r)")
-_PROF_MASTER = "PROF_MASTER"
+_PROF_MASTER = platform.node()
 _PORT = 11920
 
 
 def _encode_args(profiler, args, dargs):
     parts = [repr(profiler)]
     parts += [repr(arg) for arg in args]
     parts += ["%s=%r" % darg for darg in dargs.iteritems()]
     return ", ".join(parts)
 
 
@@ skipping 49 matching lines @@
 def stop_profilers(machines, timeout=120):
     sb = barrier.barrier(_PROF_MASTER, "stop_profilers",
             timeout, port=_PORT)
     sb.rendezvous_servers(_PROF_MASTER, *machines)
 
 
 def finish_profilers(machines, timeout=120):
     sb = barrier.barrier(_PROF_MASTER, "finish_profilers",
             timeout, port=_PORT)
     sb.rendezvous_servers(_PROF_MASTER, *machines)