From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Tue, 2 Aug 2016 09:42:29 +0000 (+0000)
Subject: Updated armband
X-Git-Tag: colorado.1.rc1~189
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7edcb241199b7da1d33ec817fa09973177ca6a8b;p=armband.git

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 <ctrautma@redhat.com>
---

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