From 59df50055a03a8db1a7864e0d150a4249205db40 Mon Sep 17 00:00:00 2001
From: Bryan Godbolt <godbolt@ualberta.ca>
Date: Wed, 11 Aug 2010 08:36:05 -0600
Subject: [PATCH] fixed mutex usage in getTotalUpstream and getTotalDownstream
 and added initialization to connectionStartTime (cherry picked from commit
 15161eec808674a20f4bd7aa192da442f1c530b0)

---
 src/comm/UDPLink.cc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/comm/UDPLink.cc b/src/comm/UDPLink.cc
index fb9429876..61c1ed517 100644
--- a/src/comm/UDPLink.cc
+++ b/src/comm/UDPLink.cc
@@ -209,7 +209,11 @@ bool UDPLink::connect()
     connectState = socket->bind(host, port);
 
     emit connected(connectState);
-    if (connectState) emit connected();
+    if (connectState)
+    {
+        emit connected();
+        connectionStartTime = MG::TIME::getGroundTimeNow();
+    }
 
     start(HighPriority);
     return connectState;
@@ -247,8 +251,9 @@ qint64 UDPLink::getNominalDataRate() {
 
 qint64 UDPLink::getTotalUpstream() {
     statisticsMutex.lock();
-    return bitsSentTotal / ((MG::TIME::getGroundTimeNow() - connectionStartTime) / 1000);
+    qint64 totalUpstream = bitsSentTotal / ((MG::TIME::getGroundTimeNow() - connectionStartTime) / 1000);
     statisticsMutex.unlock();
+    return totalUpstream;
 }
 
 qint64 UDPLink::getCurrentUpstream() {
@@ -269,8 +274,9 @@ qint64 UDPLink::getBitsReceived() {
 
 qint64 UDPLink::getTotalDownstream() {
     statisticsMutex.lock();
-    return bitsReceivedTotal / ((MG::TIME::getGroundTimeNow() - connectionStartTime) / 1000);
+    qint64 totalDownstream = bitsReceivedTotal / ((MG::TIME::getGroundTimeNow() - connectionStartTime) / 1000);
     statisticsMutex.unlock();
+    return totalDownstream;
 }
 
 qint64 UDPLink::getCurrentDownstream() {
-- 
2.22.0