-/* $Id: filter_load_balance.cpp,v 1.2 2007-01-03 15:03:55 marc Exp $
- Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_load_balance.cpp,v 1.10 2008-02-20 15:07:52 adam Exp $
+ Copyright (c) 2005-2007, Index Data.
- See the LICENSE file for details
+This file is part of Metaproxy.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Metaproxy; see the file LICENSE. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
*/
#include "config.hpp"
#include "filter_load_balance.hpp"
#include "util.hpp"
+
#include <boost/thread/mutex.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <yaz/zgdu.h>
-#include <iostream>
+// remove max macro if already defined (defined later in <limits>)
+#ifdef max
+#undef max
+#endif
+
+//#include <iostream>
#include <list>
#include <map>
#include <limits>
unsigned int deads;
unsigned int cost() {
unsigned int c = sessions + packages + deads;
- std::cout << "cost c:" << c
- << " s:" << sessions
- << " p:" << packages
- << " d:" << deads
- <<"\n";
+ //std::cout << "stats c:" << c
+ // << " s:" << sessions
+ // << " p:" << packages
+ // << " d:" << deads
+ // <<"\n";
return c;
}
};
{ // must have a destructor because of boost::scoped_ptr
}
-void yf::LoadBalance::configure(const xmlNode *xmlnode)
+void yf::LoadBalance::configure(const xmlNode *xmlnode, bool test_only)
{
m_p->configure(xmlnode);
}
{
bool is_closed_front = false;
+ bool is_closed_back = false;
// checking for closed front end packages
if (package.session().is_closed()){
// copying new target into init package
mp::util::set_vhost_otherinfo(&(org_init->otherInfo),
- odr_en, target);
+ odr_en, target, 1);
package.request() = gdu_req;
}
// checking for closed back end packages
- if (package.session().is_closed()) {
- boost::mutex::scoped_lock scoped_lock(m_mutex);
-
- // marking backend dead if backend closed without fronted close
- if (is_closed_front == false)
- add_dead(package.session().id());
-
- remove_session(package.session().id());
- }
+ if (package.session().is_closed())
+ is_closed_back = true;
Z_GDU *gdu_res = package.response().get();
// session closing only on Z39.50 close response
if (gdu_res->u.z3950->which == Z_APDU_close){
+ is_closed_back = true;
boost::mutex::scoped_lock scoped_lock(m_mutex);
remove_package(package.session().id());
-
- // marking backend dead if backend closed without fronted close
- if (is_closed_front == false)
- add_dead(package.session().id());
-
- //remove_session(package.session().id());
}
// any other Z39.50 package is removed from statistics
else {
remove_package(package.session().id());
}
}
+
+ // finally removing sessions and marking deads
+ if (is_closed_back || is_closed_front){
+ boost::mutex::scoped_lock scoped_lock(m_mutex);
+
+ // marking backend dead if backend closed without fronted close
+ if (is_closed_front == false)
+ add_dead(package.session().id());
+
+ remove_session(package.session().id());
+
+ // making sure that package is closed
+ package.session().close();
+ }
}
// getting timestamp for receiving of package
// statistic manipulating functions,
void yf::LoadBalance::Impl::add_dead(unsigned long session_id){
+
std::string target = find_session_target(session_id);
- std::cout << "add_dead " << session_id << "\n";
+ if (target.size() != 0){
+ std::map<std::string, TargetStat>::iterator itarg;
+ itarg = m_target_stat.find(target);
+ if (itarg != m_target_stat.end()
+ && itarg->second.deads < std::numeric_limits<unsigned int>::max()){
+ itarg->second.deads += 1;
+ // std:.cout << "add_dead " << session_id << " " << target
+ // << " d:" << itarg->second.deads << "\n";
+ }
+ }
};
//void yf::LoadBalance::Impl::clear_dead(unsigned long session_id){
if (target.size() != 0){
std::map<std::string, TargetStat>::iterator itarg;
itarg = m_target_stat.find(target);
- if (itarg != m_target_stat.end()){
+ if (itarg != m_target_stat.end()
+ && itarg->second.packages
+ < std::numeric_limits<unsigned int>::max()){
itarg->second.packages += 1;
- std::cout << "add_package " << session_id << " " << target
- << " p:" << itarg->second.packages << "\n";
+ // std:.cout << "add_package " << session_id << " " << target
+ // << " p:" << itarg->second.packages << "\n";
}
}
};
if (target.size() != 0){
std::map<std::string, TargetStat>::iterator itarg;
itarg = m_target_stat.find(target);
- if (itarg != m_target_stat.end()){
+ if (itarg != m_target_stat.end()
+ && itarg->second.packages > 0){
itarg->second.packages -= 1;
- std::cout << "remove_package " << session_id << " " << target
- << " p:" << itarg->second.packages << "\n";
+ // std:.cout << "remove_package " << session_id << " " << target
+ // << " p:" << itarg->second.packages << "\n";
}
}
};
if (itarg == m_target_stat.end()){
TargetStat stat;
stat.sessions = 1;
- m_target_stat.insert(std::make_pair(target, stat));
- std::cout << "add_session " << session_id << " " << target
- << " s:1\n";
- } else {
+ stat.packages = 0; // no idea why the defaut constructor TargetStat()
+ stat.deads = 0; // is not initializig this correctly to zero ??
+ m_target_stat.insert(std::make_pair(target, stat));
+ // std:.cout << "add_session " << session_id << " " << target
+ // << " s:1\n";
+ }
+ else if (itarg->second.sessions < std::numeric_limits<unsigned int>::max())
+ {
itarg->second.sessions += 1;
- std::cout << "add_session " << session_id << " " << target
- << " s:" << itarg->second.sessions << "\n";
+ // std:.cout << "add_session " << session_id << " " << target
+ // << " s:" << itarg->second.sessions << "\n";
}
-
-
};
void yf::LoadBalance::Impl::remove_session(unsigned long session_id){
}
// counting session down
- itarg->second.sessions -= 1;
+ if (itarg->second.sessions > 0)
+ itarg->second.sessions -= 1;
- std::cout << "remove_session " << session_id << " " << target
- << " s:" << itarg->second.sessions << "\n";
+ // std:.cout << "remove_session " << session_id << " " << target
+ // << " s:" << itarg->second.sessions << "\n";
// clearing empty sessions and targets
- if (itarg->second.sessions == 0){
+ if (itarg->second.sessions == 0 && itarg->second.deads == 0 ){
m_target_stat.erase(itarg);
m_session_target.erase(isess);
}
}
}
- std::cout << "cost " << target << " c:" << cost << "\n";
+ //std::cout << "cost " << target << " c:" << cost << "\n";
return cost;
};
unsigned int yf::LoadBalance::Impl::dead(std::string target){
- std::cout << "dead " << target << "\n";
- return 0;
+
+ unsigned int dead;
+
+ if (target.size() != 0){
+ std::map<std::string, TargetStat>::iterator itarg;
+ itarg = m_target_stat.find(target);
+ if (itarg != m_target_stat.end()){
+ dead = itarg->second.deads;
+ }
+ }
+
+ //std::cout << "dead " << target << " d:" << dead << "\n";
+ return dead;
};
projects / metaproxy-moved-to-github.git / blobdiff