From 7ec151cdc81acb6682ff22ac49f03c9ae2c1c8a2 Mon Sep 17 00:00:00 2001 From: fujita Date: Tue, 20 Jan 2009 05:08:00 +0000 Subject: [PATCH] =?utf8?q?=E8=AA=A4=E8=A8=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel@6112 1ed66053-1c2d-0410-8867-f7571e6e31d3 --- module/schedule/schedule_module_lc.h | 18 ++++++++--------- module/schedule/schedule_module_rr.h | 16 +++++++-------- module/schedule/schedule_module_wrr.h | 38 +++++++++++++++++------------------ 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/module/schedule/schedule_module_lc.h b/module/schedule/schedule_module_lc.h index f2b73c79..3810a925 100644 --- a/module/schedule/schedule_module_lc.h +++ b/module/schedule/schedule_module_lc.h @@ -11,7 +11,7 @@ #ifndef SCHEDULE_MODULE_LC_H #define SCHEDULE_MODULE_LC_H -#include "schedule_module_base.h" +#include "schedule_module_lc.h" namespace l7vs{ @@ -42,10 +42,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled TCP/IP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::tcp::endpoint& outendpoint ); //! handle schedule calles then schedule function for UDP endpoint @@ -55,10 +55,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled UDP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::udp::endpoint& outendpoint ); //! replication interval interrrupt diff --git a/module/schedule/schedule_module_rr.h b/module/schedule/schedule_module_rr.h index ef27b2a1..40cfa70b 100644 --- a/module/schedule/schedule_module_rr.h +++ b/module/schedule/schedule_module_rr.h @@ -45,10 +45,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled TCP/IP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::tcp::endpoint& outendpoint ); //! handle schedule calles then schedule function for UDP endpoint @@ -58,10 +58,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled UDP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::udp::endpoint& outendpoint ); //! replication interval interrrupt diff --git a/module/schedule/schedule_module_wrr.h b/module/schedule/schedule_module_wrr.h index 3ee356b9..a1d0db05 100644 --- a/module/schedule/schedule_module_wrr.h +++ b/module/schedule/schedule_module_wrr.h @@ -11,7 +11,7 @@ #ifndef SCHEDULE_MODULE_WRR_H #define SCHEDULE_MODULE_WRR_H -#include "schedule_module_base.h" +#include "schedule_module_wrr.h" namespace l7vs{ @@ -22,7 +22,7 @@ protected: boost::asio::ip::udp::endpoint udp_endpoint ; struct wrr_weights { - int currentWeight; /*! Current Weight */ + int currentWeight; /*! Current Weight */ int maxWeight; /*! Max of Weight */ int gcd; /*! GCD of RealServer list */ wrr_weights() : currentWeight(0), maxWeight(0), gcd(0) {} @@ -52,10 +52,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled TCP/IP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::tcp::endpoint& outendpoint ); //! handle schedule calles then schedule function for UDP endpoint @@ -65,10 +65,10 @@ public: //! @param[in] list iterator next function object //! @param[out] scheduled UDP endpoint void handle_schedule( - boost::thread::id thread_id, - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next, + boost::thread::id thread_id, + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next, boost::asio::ip::udp::endpoint& outendpoint ); //! replication interval interrrupt @@ -77,18 +77,18 @@ public: protected: int sched_wrr_service_init( - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next ); + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next ); int sched_wrr_getMaxWeight( - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next ); + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next ); int sched_wrr_gcd( int a, int b ); int sched_wrr_getGCD( - rslist_iterator_type inlist_begin, - rslist_iterator_type inlist_end, - rslist_iterator_type inlist_next ); + rslist_iterator_func_type inlist_begin, + rslist_iterator_func_type inlist_end, + rslist_iterator_func_type inlist_next ); }; -- 2.11.0