X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=udpinput.cpp;h=0035640ad4a91bd6ed2d4d59f3a6db8feb677a6d;hp=445d4f551fff145b3ceac1e417b574d4292a1ade;hb=1135808bf9df44b879994e6dac07a31eb78c2fdb;hpb=a0fe013448d188b324c00383cfd91695d9d3d076

diff --git a/udpinput.cpp b/udpinput.cpp
index 445d4f5..0035640 100644
--- a/udpinput.cpp
+++ b/udpinput.cpp
@@ -11,7 +11,6 @@
 
 #include "acceptor.h"
 #include "log.h"
-#include "mutexlock.h"
 #include "serverpool.h"
 #include "state.pb.h"
 #include "stream.h"
@@ -113,13 +112,8 @@ UDPInput::UDPInput(const string &url)
 
 	construct_header();
 
-	pthread_mutex_init(&stats_mutex, nullptr);
 	stats.url = url;
-	stats.bytes_received = 0;
-	stats.data_bytes_received = 0;
-	stats.metadata_bytes_received = 0;
 	stats.connect_time = time(nullptr);
-	stats.latency_sec = HUGE_VAL;
 }
 
 UDPInput::UDPInput(const InputProto &serialized)
@@ -133,7 +127,6 @@ UDPInput::UDPInput(const InputProto &serialized)
 
 	construct_header();
 
-	pthread_mutex_init(&stats_mutex, nullptr);
 	stats.url = url;
 	stats.bytes_received = serialized.bytes_received();
 	stats.data_bytes_received = serialized.data_bytes_received();
@@ -224,7 +217,7 @@ void UDPInput::do_work()
 		}
 
 		{
-			MutexLock lock(&stats_mutex);
+			lock_guard<mutex> lock(stats_mutex);
 			stats.bytes_received += ret;
 			stats.data_bytes_received += ret;
 		}
@@ -237,6 +230,6 @@ void UDPInput::do_work()
 
 InputStats UDPInput::get_stats() const
 {
-	MutexLock lock(&stats_mutex);
+	lock_guard<mutex> lock(stats_mutex);
 	return stats;
 }