From 5e2daf376ef4adc403cf9c962bfeb2669741cacb Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 11 Dec 2005 17:23:05 +0000
Subject: [PATCH] Use boost::scoped_ptr for Log filter

---
 src/filter_log.cpp |   47 ++++++++++++++++++++++++++++++++---------------
 src/filter_log.hpp |   17 ++++++-----------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index cb3b67d..2ed0b96 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,31 +1,51 @@
-/* $Id: filter_log.cpp,v 1.8 2005-10-30 17:13:36 adam Exp $
+/* $Id: filter_log.cpp,v 1.9 2005-12-11 17:23:05 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
  */
 
-
 #include "config.hpp"
 
 #include "filter.hpp"
 #include "router.hpp"
 #include "package.hpp"
 
+#include <string>
+#include <boost/thread/mutex.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include "util.hpp"
 #include "filter_log.hpp"
 
 #include <yaz/zgdu.h>
-#include <yaz/log.h>
 
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <iostream>
+namespace yf = yp2::filter;
 
+namespace yp2 {
+    namespace filter {
+        class Log::Rep {
+            friend class Log;
+            static boost::mutex m_log_mutex;
+            std::string m_msg;
+        };
+    }
+}
 
-yp2::filter::Log::Log() {}
-yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
+boost::mutex yf::Log::Rep::m_log_mutex;
 
-void yp2::filter::Log::process(Package &package) const {
+yf::Log::Log(const std::string &x) : m_p(new Rep)
+{
+    m_p->m_msg = x;
+}
+
+yf::Log::Log() : m_p(new Rep)
+{
+}
 
+yf::Log::~Log() {}
+
+void yf::Log::process(Package &package) const
+{
     Z_GDU *gdu;
 
     // getting timestamp for receiving of package
@@ -34,8 +54,8 @@ void yp2::filter::Log::process(Package &package) const {
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
-        std::cout << receive_time << " " << m_msg;
+        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        std::cout << receive_time << " " << m_p->m_msg;
         std::cout << " request id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes" : "no")
@@ -59,8 +79,8 @@ void yp2::filter::Log::process(Package &package) const {
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
-        std::cout << send_time << " " << m_msg;
+        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        std::cout << send_time << " " << m_p->m_msg;
         std::cout << " response id=" << package.session().id();
         std::cout << " close=" 
                   << (package.session().is_closed() ? "yes " : "no ")
@@ -78,9 +98,6 @@ void yp2::filter::Log::process(Package &package) const {
     }
 }
 
-// defining and initializing static members
-boost::mutex yp2::filter::Log::m_log_mutex;
-
 /*
  * Local variables:
  * c-basic-offset: 4
diff --git a/src/filter_log.hpp b/src/filter_log.hpp
index d7ad4ed..28545eb 100644
--- a/src/filter_log.hpp
+++ b/src/filter_log.hpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.hpp,v 1.9 2005-10-31 09:40:18 marc Exp $
+/* $Id: filter_log.hpp,v 1.10 2005-12-11 17:23:05 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -7,25 +7,20 @@
 #ifndef FILTER_LOG_HPP
 #define FILTER_LOG_HPP
 
-#include <stdexcept>
-#include <vector>
+#include <boost/scoped_ptr.hpp>
 
 #include "filter.hpp"
 
-#include <boost/thread/mutex.hpp>
-
-
 namespace yp2 {
     namespace filter {
         class Log : public Base {
+            class Rep;
+            boost::scoped_ptr<Rep> m_p;
         public:
-            Log(const std::string &msg);
             Log();
+            Log(const std::string &x);
+            ~Log();
             void process(yp2::Package & package) const;
-        private:
-            /// static mutex to lock Ostream during logging operation
-            static boost::mutex m_log_mutex;
-            std::string m_msg;
         };
     }
 }
-- 
1.7.10.4