X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=python-lttngust%2Flttngust%2Fagent.py;h=8658372819c5e5cd60e6412ac2e26db3a62e6a56;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=ebfa2de1dbb8abbf0b51eb89556558efe034ea74;hpb=5b6ff569c0bf82b72f263a259e7a73a453903648;p=lttng-ust.git diff --git a/python-lttngust/lttngust/agent.py b/python-lttngust/lttngust/agent.py index ebfa2de1..86583728 100644 --- a/python-lttngust/lttngust/agent.py +++ b/python-lttngust/lttngust/agent.py @@ -1,26 +1,16 @@ # -*- coding: utf-8 -*- # -# Copyright (C) 2015 - Philippe Proulx -# Copyright (C) 2014 - David Goulet +# SPDX-License-Identifier: LGPL-2.1-only # -# This library is free software; you can redistribute it and/or modify it under -# the terms of the GNU Lesser General Public License as published by the Free -# Software Foundation; version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this library; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Copyright (C) 2015 Philippe Proulx +# Copyright (C) 2014 David Goulet from __future__ import unicode_literals from __future__ import print_function from __future__ import division import lttngust.debug as dbg import lttngust.loghandler +import lttngust.compat import lttngust.cmd from io import open import threading @@ -368,9 +358,9 @@ def _init_threads(): try: dbg._pdebug('waiting for registration done (expecting {}, timeout is {} s)'.format(reg_expecting, cur_timeout)) - t1 = time.clock() + t1 = lttngust.compat._clock() reg_queue.get(timeout=cur_timeout) - t2 = time.clock() + t2 = lttngust.compat._clock() reg_expecting -= 1 dbg._pdebug('unblocked')