X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_limit.cpp;h=5b64c367aa27aa731a0c5b33e81972b83aa2fa8d;hb=c1d953eee6c00432493bc364da6284704ccd9cc2;hp=2b58fa6498c54aca240e19f5287dffa0323b6f35;hpb=e6d572ef110d14fa55115021505b808620457bd3;p=metaproxy-moved-to-github.git

diff --git a/src/filter_limit.cpp b/src/filter_limit.cpp
index 2b58fa6..5b64c36 100644
--- a/src/filter_limit.cpp
+++ b/src/filter_limit.cpp
@@ -1,5 +1,5 @@
 /* This file is part of Metaproxy.
-   Copyright (C) 2005-2010 Index Data
+   Copyright (C) 2005-2011 Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yazpp/timestat.h>
 #include <metaproxy/package.hpp>
 #include <metaproxy/util.hpp>
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 namespace mp = metaproxy_1;
 namespace yf = mp::filter;
@@ -124,9 +127,7 @@ void yf::Limit::Impl::configure(const xmlNode *ptr)
 
 void yf::Limit::Impl::process(mp::Package &package)
 {
-    package.move();
-    int reduce = 0;
-
+    int sz = 0;
     {
         boost::mutex::scoped_lock scoped_lock(m_session_mutex);
 
@@ -142,14 +143,11 @@ void yf::Limit::Impl::process(mp::Package &package)
             m_sessions[package.session()] = ses;
         }
 
-        int sz = package.request().get_size() + package.response().get_size();
-        
-        ses->bw_stat.add_bytes(sz);
-        ses->pdu_stat.add_bytes(1);
-        
+
         Z_GDU *gdu = package.request().get();
         if (gdu && gdu->which == Z_GDU_Z3950)
         {
+            sz += package.request().get_size();
             // we're getting a Z39.50 package
             Z_APDU *apdu = gdu->u.z3950;
             if (apdu->which == Z_APDU_searchRequest)
@@ -165,6 +163,28 @@ void yf::Limit::Impl::process(mp::Package &package)
                 }
             }
         }
+    }
+    package.move();
+    int reduce = 0;
+    {
+        boost::mutex::scoped_lock scoped_lock(m_session_mutex);
+
+        yf::Limit::Ses *ses = 0;
+
+        std::map<mp::Session,yf::Limit::Ses *>::iterator it = 
+            m_sessions.find(package.session());
+        if (it != m_sessions.end())
+            ses = it->second;
+        else
+        {
+            ses = new yf::Limit::Ses;
+            m_sessions[package.session()] = ses;
+        }
+
+        sz += package.response().get_size();
+        
+        ses->bw_stat.add_bytes(sz);
+        ses->pdu_stat.add_bytes(1);
         
         int bw_total = ses->bw_stat.get_total();
         int pdu_total = ses->pdu_stat.get_total();
@@ -191,7 +211,11 @@ void yf::Limit::Impl::process(mp::Package &package)
     if (reduce)
     {
         yaz_log(YLOG_LOG, "sleeping %d seconds", reduce);
+#ifdef WIN32
+        Sleep(reduce * 1000);
+#else
         sleep(reduce);
+#endif
     }
 }