From ad4c9aad080b6e26d38fa0d59c6ba0493ea23318 Mon Sep 17 00:00:00 2001
From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@intra2net.com>
Date: Mon, 2 May 2011 13:00:47 +0200
Subject: [PATCH] Using lock_guard to handle mutex locking/unlocking through RAII

---
 src/link/linkstatusanalyzer.cpp |   13 ++++++-------
 src/link/linkstatusanalyzer.h   |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/link/linkstatusanalyzer.cpp b/src/link/linkstatusanalyzer.cpp
index 8e55a44..f01b6bf 100644
--- a/src/link/linkstatusanalyzer.cpp
+++ b/src/link/linkstatusanalyzer.cpp
@@ -7,11 +7,14 @@
 #include <logfunc.hpp>
 
 using namespace std;
+using boost::lock_guard;
+using boost::mutex;
 using boost::posix_time::microsec_clock;
 using boost::posix_time::ptime;
-using boost::mutex;
 using I2n::Logger::GlobalLogger;
 
+typedef lock_guard<mutex> mutex_lock_guard;
+
 //-----------------------------------------------------------------------------
 // LinkStatusAnalyzer
 //-----------------------------------------------------------------------------
@@ -42,7 +45,7 @@ void LinkStatusAnalyzer::notify_host_up( const string &host_address )
 {
     BOOST_ASSERT( !host_address.empty() );
 
-    Mutex.lock();
+    mutex_lock_guard lock( Mutex );
 
     GlobalLogger.info() << "- Host up: " << host_address << endl;
 
@@ -55,15 +58,13 @@ void LinkStatusAnalyzer::notify_host_up( const string &host_address )
 
     // removed from the list?
     BOOST_ASSERT( HostsDownList.count( host_address ) == 0 );
-
-    Mutex.unlock();
 }
 
 void LinkStatusAnalyzer::notify_host_down( const string &host_address )
 {
     BOOST_ASSERT( !host_address.empty() );
 
-    Mutex.lock();
+    mutex_lock_guard lock( Mutex );
 
     GlobalLogger.info() << "- Host down: " << host_address << endl;
 
@@ -76,8 +77,6 @@ void LinkStatusAnalyzer::notify_host_down( const string &host_address )
 
     // inserted in the list?
     BOOST_ASSERT( HostsDownList.count( host_address ) == 1 );
-
-    Mutex.unlock();
 }
 
 void LinkStatusAnalyzer::add_host_up( const string &host_address )
diff --git a/src/link/linkstatusanalyzer.h b/src/link/linkstatusanalyzer.h
index ffd2930..ab8b1a0 100644
--- a/src/link/linkstatusanalyzer.h
+++ b/src/link/linkstatusanalyzer.h
@@ -5,7 +5,7 @@
 #include <string>
 
 #include <boost/asio.hpp>
-#include <boost/thread/mutex.hpp>
+#include <boost/thread.hpp>
 
 #include "link/statusnotifiercommand.h"
 
-- 
1.7.1