xtimeでのcondition.timed_waitからsleepに変更

UTコード修正

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10280 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7vsd/include/virtualservice.h b/l7vsd/include/virtualservice.h
index 0b19c39..9fb943b 100644 (file)
--- a/l7vsd/include/virtualservice.h
+++ b/l7vsd/include/virtualservice.h
@@ -149,6 +149,7 @@ public:
                 long long          sorry_maxconnection;
                 char               sorry_endpoint[48];
                 bool               sorry_flag;
+                unsigned int       sorry_fwdmode;
                 unsigned long long qos_up;
                 unsigned long long qos_down;
         };
@@ -164,7 +165,7 @@ public:
         //! Operation timed out value
         const static int  OPERATION_TIMEOUT        = 1;
         //! wait interval for rs_ref_count check
-        const static int  REFCOUNT_WAIT_INTERVAL   = 10000;
+        const static int  REFCOUNT_WAIT_INTERVAL   = 10; // msec
         const static int  SCHEDULER_PRIORITY       = 20;
 protected:
 

diff --git a/l7vsd/src/virtualservice_tcp.cpp b/l7vsd/src/virtualservice_tcp.cpp
index 074a03a..9c4bb7b 100644 (file)
--- a/l7vsd/src/virtualservice_tcp.cpp
+++ b/l7vsd/src/virtualservice_tcp.cpp
@@ -177,6 +177,7 @@ void l7vs::virtualservice_tcp::handle_replication_interrupt(const boost::system:
         rep_data_ptr->sorry_maxconnection = element.sorry_maxconnection;
         strncpy(rep_data_ptr->sorry_endpoint, tmp_sorry_ep.str().c_str(), 48);
         rep_data_ptr->sorry_flag = element.sorry_flag;
+        rep_data_ptr->sorry_fwdmode = element.sorry_fwdmode;
         rep_data_ptr->qos_up = element.qos_upstream;
         rep_data_ptr->qos_down = element.qos_downstream;
 
@@ -305,6 +306,7 @@ void l7vs::virtualservice_tcp::read_replicationdata()
                         element.sorry_endpoint =
                                 tcp_endpoint_type(boost::asio::ip::address::from_string(ipaddr), portno);
                         element.sorry_flag = rep_data_ptr->sorry_flag;
+                        element.sorry_fwdmode = (virtualservice_element::SORRYSERVER_FWDMODE_TAG)(rep_data_ptr->sorry_fwdmode);
                         element.qos_upstream = rep_data_ptr->qos_up;
                         element.qos_downstream = rep_data_ptr->qos_down;
                         break;
@@ -1219,14 +1221,10 @@ void l7vs::virtualservice_tcp::add_realserver(const l7vs::virtualservice_element
         rw_scoped_lock inc_lock(rs_list_ref_count_inc_mutex);
 
         //waiting, rs_list_ref_count become 0
-        boost::xtime interval;
-        boost::mutex mtx;
-        boost::condition cond;
-
-        interval.nsec = virtualservice_base::REFCOUNT_WAIT_INTERVAL;
-        boost::mutex::scoped_lock lk(mtx);
         while (rs_list_ref_count != 0ULL) {
-                cond.timed_wait(lk, interval);
+                boost::this_thread::sleep(
+                        boost::posix_time::milliseconds(virtualservice_base::REFCOUNT_WAIT_INTERVAL)
+                );
         }
 
         //check duplication realserver
@@ -1311,14 +1309,10 @@ void l7vs::virtualservice_tcp::edit_realserver(const l7vs::virtualservice_elemen
         rw_scoped_lock inc_lock(rs_list_ref_count_inc_mutex);
 
         //waiting, rs_list_ref_count become 0
-        boost::xtime interval;
-        boost::mutex mtx;
-        boost::condition cond;
-
-        interval.nsec = virtualservice_base::REFCOUNT_WAIT_INTERVAL;
-        boost::mutex::scoped_lock lk(mtx);
         while (rs_list_ref_count != 0ULL) {
-                cond.timed_wait(lk, interval);
+                boost::this_thread::sleep(
+                        boost::posix_time::milliseconds(virtualservice_base::REFCOUNT_WAIT_INTERVAL)
+                );
         }
 
         virtualservice_element &in_element = const_cast<virtualservice_element &>(in);
@@ -1418,14 +1412,10 @@ void l7vs::virtualservice_tcp::del_realserver(const l7vs::virtualservice_element
         rw_scoped_lock inc_lock(rs_list_ref_count_inc_mutex);
 
         //waiting, rs_list_ref_count become 0
-        boost::xtime interval;
-        boost::mutex mtx;
-        boost::condition cond;
-
-        interval.nsec = virtualservice_base::REFCOUNT_WAIT_INTERVAL;
-        boost::mutex::scoped_lock lk(mtx);
         while (rs_list_ref_count != 0ULL) {
-                cond.timed_wait(lk, interval);
+                boost::this_thread::sleep(
+                        boost::posix_time::milliseconds(virtualservice_base::REFCOUNT_WAIT_INTERVAL)
+                );
         }
 
         virtualservice_element &in_element = const_cast<virtualservice_element &>(in);