From 693a749595ec949e0e9620c66fa65bcf8f567927 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 20 Mar 2011 19:15:30 -0400 Subject: [PATCH] osx: restore atomic stats to knet pulled wrong version of change into master. put back atomic versions of stats. Change-Id: I3b8413e2606a8bc4bf55aa674860685b2ca2ced6 Reviewed-on: http://gerrit.openafs.org/4265 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/rx/DARWIN/rx_knet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rx/DARWIN/rx_knet.c b/src/rx/DARWIN/rx_knet.c index c70e171cb..0ea37ab90 100644 --- a/src/rx/DARWIN/rx_knet.c +++ b/src/rx/DARWIN/rx_knet.c @@ -12,6 +12,8 @@ #include "rx/rx_kcommon.h" +#include "rx/rx_atomic.h" +#include "rx/rx_stats.h" #ifdef AFS_DARWIN80_ENV #define soclose sock_close @@ -102,7 +104,7 @@ rx_upcall(socket_t so, void *arg, __unused int waitflag) if (nbytes <= 0) { if (rx_stats_active) { MUTEX_ENTER(&rx_stats_mutex); - rx_stats.bogusPacketOnRead++; + rx_atomic_inc(&rx_stats.bogusPacketOnRead); rx_stats.bogusHost = from.sin_addr.s_addr; MUTEX_EXIT(&rx_stats_mutex); } @@ -118,9 +120,7 @@ rx_upcall(socket_t so, void *arg, __unused int waitflag) port = from.sin_port; if (p->header.type > 0 && p->header.type < RX_N_PACKET_TYPES) { if (rx_stats_active) { - MUTEX_ENTER(&rx_stats_mutex); - rx_stats.packetsRead[p->header.type - 1]++; - MUTEX_EXIT(&rx_stats_mutex); + rx_atomic_inc(&rx_stats.packetsRead[p->header.type - 1]); } } -- 2.39.5