From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 420331B1A5 for ; Mon, 8 Jan 2018 10:56:27 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jan 2018 01:56:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,330,1511856000"; d="scan'208";a="193209977" Received: from dpdk-test38.sh.intel.com ([10.67.119.87]) by fmsmga006.fm.intel.com with ESMTP; 08 Jan 2018 01:56:26 -0800 From: Marvin Liu To: dts@dpdk.org Cc: Marvin Liu Date: Sun, 7 Jan 2018 21:49:20 -0500 Message-Id: <1515379769-11553-8-git-send-email-yong.liu@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1515379769-11553-1-git-send-email-yong.liu@intel.com> References: <1515379769-11553-1-git-send-email-yong.liu@intel.com> Subject: [dts] [PATCH v1 07/16] framework/debugger: support multiple VMs module X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Jan 2018 09:56:27 -0000 1. Disable signal when running in parallel mode since signal is not support in child thread 2. Support connect to session by integer index argument Signed-off-by: Marvin Liu diff --git a/framework/debugger.py b/framework/debugger.py index 5c02414..8018f55 100644 --- a/framework/debugger.py +++ b/framework/debugger.py @@ -28,8 +28,8 @@ import signal import code import time import imp -from settings import load_global_setting, DEBUG_SETTING -from utils import get_subclasses, copy_instance_attr +from settings import load_global_setting, DEBUG_SETTING, DTS_PARALLEL_SETTING +from utils import get_subclasses, copy_instance_attr, GREEN from test_case import TestCase @@ -71,10 +71,16 @@ def connect_command(connect): Connect to ssh session and give control to user. """ from ssh_connection import CONNECTIONS - for connection in CONNECTIONS: - for name, session in connection.items(): - if name == connect: - session.session.interact() + if type(connect) == int: + name, session = CONNECTIONS[connect].items()[0] + print GREEN("Connecting to session[%s]" % name) + session.session.interact() + else: + for connection in CONNECTIONS: + for name, session in connection.items(): + if name == connect: + print GREEN("Connecting to session[%s]" % name) + session.session.interact() def rerun_command(): @@ -164,7 +170,8 @@ def ignore_keyintr(): """ Temporary disable interrupt handler. """ - if load_global_setting(DEBUG_SETTING) != 'yes': + # signal can't be used in thread + if load_global_setting(DEBUG_SETTING) != 'yes' or load_global_setting(DTS_PARALLEL_SETTING) == 'yes': return global debug_cmd @@ -180,7 +187,8 @@ def aware_keyintr(): """ Reenable interrupt handler. """ - if load_global_setting(DEBUG_SETTING) != 'yes': + # signal can't be used in thread + if load_global_setting(DEBUG_SETTING) != 'yes' or load_global_setting(DTS_PARALLEL_SETTING) == 'yes': return return signal.signal(signal.SIGINT, keyboard_handle) -- 1.9.3