From 7edcb241199b7da1d33ec817fa09973177ca6a8b Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Tue, 2 Aug 2016 09:42:29 +0000 Subject: Updated armband Project: vswitchperf 65034580a2759c89c418e0a47ee16bee10cc2c7c xena_deadlock: Fix xena2544.exe deadlock Fix Xena2544.exe execution with mono where sometimes the Xena process says complete, but the mono process doesn't exit. Changes call of Xena2544.exe from communicate thread lock to a wait try/catch block and checks the log periodically to see if a deadlock has occured and if so, the mono pid is terminated to prevent deadlock. * Fix one small issue with typecasting to int, changed to float JIRA: VSPERF-319 Change-Id: Ie7a86a2b9ff9cdfacba5a912ad17df6cc0581702 Signed-off-by: Christian Trautman --- upstream/vswitchperf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'upstream/vswitchperf') diff --git a/upstream/vswitchperf b/upstream/vswitchperf index 7ad56eff..65034580 160000 --- a/upstream/vswitchperf +++ b/upstream/vswitchperf @@ -1 +1 @@ -Subproject commit 7ad56eff11393807085775f075fcc93640c26ce2 +Subproject commit 65034580a2759c89c418e0a47ee16bee10cc2c7c -- cgit 1.2.3-korg