Adding method to XMPPStream: getNumberOfBytesSent:numberOfBytesReceived: (simple atomic operation to fetch 2 related properties at the same time). Also updated XMPPBandwidthMonitor to use the new method.

Author: robbiehanson

Core/XMPPStream.h

@@ -208,10 +208,16 @@ extern const NSTimeInterval XMPPStreamTimeoutNone;
  * the count will be the summation of all connections.
  * 
  * The functionality may optionaly be changed to count only the current socket connection.
- * See the resetByteCountPerConnection property.
+ * @see resetByteCountPerConnection
 **/
-@property (readonly) UInt64 numberOfBytesSent;
-@property (readonly) UInt64 numberOfBytesReceived;
+@property (readonly) uint64_t numberOfBytesSent;
+@property (readonly) uint64_t numberOfBytesReceived;
+
+/**
+ * Same as the individual properties,
+ * but provides a way to fetch them in one atomic operation.
+**/
+- (void)getNumberOfBytesSent:(uint64_t *)bytesSentPtr numberOfBytesReceived:(uint64_t *)bytesReceivedPtr;
 
 /**
  * Affects the funtionality of the byte counter.
@@ -320,7 +326,10 @@ extern const NSTimeInterval XMPPStreamTimeoutNone;
  * The given address is specified as a sockaddr structure wrapped in a NSData object.
  * For example, a NSData object returned from NSNetservice's addresses method.
 **/
-- (BOOL)connectTo:(XMPPJID *)remoteJID withAddress:(NSData *)remoteAddr withTimeout:(NSTimeInterval)timeout error:(NSError **)errPtr;
+- (BOOL)connectTo:(XMPPJID *)remoteJID
+      withAddress:(NSData *)remoteAddr
+      withTimeout:(NSTimeInterval)timeout
+            error:(NSError **)errPtr;
 
 /**
  * Starts a P2P connection with the given accepted socket.

Core/XMPPStream.m

@@ -97,8 +97,8 @@ @interface XMPPStream ()
 
 	GCDAsyncSocket *asyncSocket;
 
-	UInt64 numberOfBytesSent;
-	UInt64 numberOfBytesReceived;
+	uint64_t numberOfBytesSent;
+	uint64_t numberOfBytesReceived;
 
 	XMPPParser *parser;
 	NSError *parserError;
@@ -585,40 +585,55 @@ - (void)setKeepAliveWhitespaceCharacter:(char)keepAliveChar
 		dispatch_async(xmppQueue, block);
 }
 
-- (UInt64)numberOfBytesSent
+- (uint64_t)numberOfBytesSent
 {
+	__block uint64_t result = 0;
+	
+	dispatch_block_t block = ^{
+		result = numberOfBytesSent;
+	};
+	
 	if (dispatch_get_specific(xmppQueueTag))
-	{
-		return numberOfBytesSent;
-	}
+		block();
 	else
-	{
-		__block UInt64 result;
-		
-		dispatch_sync(xmppQueue, ^{
-			result = numberOfBytesSent;
-		});
-		
-		return result;
-	}
+		dispatch_sync(xmppQueue, block);
+	
+	return result;
 }
 
-- (UInt64)numberOfBytesReceived
+- (uint64_t)numberOfBytesReceived
 {
+	__block uint64_t result = 0;
+	
+	dispatch_block_t block = ^{
+		result = numberOfBytesReceived;
+	};
+	
 	if (dispatch_get_specific(xmppQueueTag))
-	{
-		return numberOfBytesReceived;
-	}
+		block();
 	else
-	{
-		__block UInt64 result;
-		
-		dispatch_sync(xmppQueue, ^{
-			result = numberOfBytesReceived;
-		});
-		
-		return result;
-	}
+		dispatch_sync(xmppQueue, block);
+	
+	return result;
+}
+
+- (void)getNumberOfBytesSent:(uint64_t *)bytesSentPtr numberOfBytesReceived:(uint64_t *)bytesReceivedPtr
+{
+	__block uint64_t bytesSent = 0;
+	__block uint64_t bytesReceived = 0;
+	
+	dispatch_block_t block = ^{
+		bytesSent = numberOfBytesSent;
+		bytesReceived = numberOfBytesReceived;
+	};
+	
+	if (dispatch_get_specific(xmppQueueTag))
+		block();
+	else
+		dispatch_sync(xmppQueue, block);
+	
+	if (bytesSentPtr) *bytesSentPtr = bytesSent;
+	if (bytesReceivedPtr) *bytesReceivedPtr = bytesReceived;
 }
 
 - (BOOL)resetByteCountPerConnection

Extensions/BandwidthMonitor/XMPPBandwidthMonitor.m

@@ -59,8 +59,10 @@ - (double)incomingBandwidth
 
 - (void)updateBandwidth
 {
-	uint64_t currentNumberOfBytesSent = xmppStream.numberOfBytesSent;
-	uint64_t currentNumberOfBytesReceived = xmppStream.numberOfBytesReceived;
+	uint64_t currentNumberOfBytesSent = 0;
+	uint64_t currentNumberOfBytesReceived = 0;
+	
+	[xmppStream getNumberOfBytesSent:&currentNumberOfBytesSent numberOfBytesReceived:&currentNumberOfBytesReceived];
 
 	double currentOutgoingBandwidth = currentNumberOfBytesSent - lastNumberOfBytesSent;         // Bytes per second
 	double currentIncomingBandwidth = currentNumberOfBytesReceived - lastNumberOfBytesReceived; // Bytes per second
@@ -97,8 +99,13 @@ - (void)startTimer
 {
 	if (timer == NULL)
 	{
-		lastNumberOfBytesSent = xmppStream.numberOfBytesSent;
-		lastNumberOfBytesReceived = xmppStream.numberOfBytesReceived;
+		uint64_t numberOfBytesSent = 0;
+		uint64_t numberOfBytesReceived = 0;
+		
+		[xmppStream getNumberOfBytesSent:&numberOfBytesSent numberOfBytesReceived:&numberOfBytesReceived];
+		
+		lastNumberOfBytesSent = numberOfBytesSent;
+		lastNumberOfBytesReceived = numberOfBytesReceived;
 
 		smoothedAverageOutgoingBandwidth = 0.0;
 		smoothedAverageIncomingBandwidth = 0.0;