Merge "Cache regex pattern matches for XMPP_SKIP_UPDATE_SEND pattern"…

… into R3.0
Juniper · Jul 22, 2016 · 2e78fd4 · 2e78fd4
2 parents 4028ba7 + c730ad2
commit 2e78fd4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/src/bgp/bgp_xmpp_channel.cc b/src/bgp/bgp_xmpp_channel.cc
@@ -5,6 +5,7 @@
 #include "bgp/bgp_xmpp_channel.h"
 
 #include <boost/foreach.hpp>
+#include <boost/regex.hpp>
 
 #include <limits>
 #include <vector>
@@ -49,6 +50,9 @@ using autogen::SecurityGroupListType;
 using autogen::CommunityTagListType;
 using autogen::TunnelEncapsulationListType;
 
+using boost::regex;
+using boost::regex_search;
+using boost::smatch;
 using boost::system::error_code;
 using pugi::xml_node;
 using std::auto_ptr;
@@ -441,23 +445,29 @@ class BgpXmppChannel::XmppPeer : public IPeer {
     uint64_t deleted_at_;
 };
 
-static bool SkipUpdateSend() {
-    static bool init_;
-    static bool skip_;
-
-    if (init_) return skip_;
-
-    skip_ = getenv("XMPP_SKIP_UPDATE_SEND") != NULL;
-    init_ = true;
+// Skip sending updates if the destinatin matches against the pattern.
+// XXX Used in test environments only
+bool BgpXmppChannel::SkipUpdateSend() {
+    static char *skip_env_ = getenv("XMPP_SKIP_UPDATE_SEND");
+    if (!skip_env_)
+        return false;
 
-    return skip_;
+    // Use XMPP_SKIP_UPDATE_SEND as a regex pattern to match against destination
+    // Cache the result to avoid redundant regex evaluation
+    if (!skip_update_send_cached_) {
+        smatch matches;
+        skip_update_send_ = regex_search(ToString(), matches, regex(skip_env_));
+        skip_update_send_cached_ = true;
+    }
+    return skip_update_send_;
 }
 
 bool BgpXmppChannel::XmppPeer::SendUpdate(const uint8_t *msg, size_t msgsize) {
     XmppChannel *channel = parent_->channel_;
     if (channel->GetPeerState() == xmps::READY) {
         parent_->stats_[TX].rt_updates++;
-        if (SkipUpdateSend()) return true;
+        if (parent_->SkipUpdateSend())
+            return true;
         send_ready_ = channel->Send(msg, msgsize, xmps::BGP,
                 boost::bind(&BgpXmppChannel::XmppPeer::WriteReadyCb, this, _1));
         if (!send_ready_) {
@@ -499,6 +509,8 @@ BgpXmppChannel::BgpXmppChannel(XmppChannel *channel, BgpServer *bgp_server,
       close_in_progress_(false),
       deleted_(false),
       defer_peer_close_(false),
+      skip_update_send_(false),
+      skip_update_send_cached_(false),
       membership_response_worker_(
             TaskScheduler::GetInstance()->GetTaskId("xmpp::StateMachine"),
             channel->connection()->GetIndex(),

diff --git a/src/bgp/bgp_xmpp_channel.h b/src/bgp/bgp_xmpp_channel.h
@@ -116,6 +116,7 @@ class BgpXmppChannel {
     uint64_t get_tx_route_reach() const { return stats_[TX].reach; }
     uint64_t get_tx_route_unreach() const { return stats_[TX].unreach; }
     uint64_t get_tx_update() const { return stats_[TX].rt_updates; }
+    bool SkipUpdateSend();
 
 protected:
     XmppChannel *channel_;
@@ -234,6 +235,8 @@ class BgpXmppChannel {
     bool close_in_progress_;
     bool deleted_;
     bool defer_peer_close_;
+    bool skip_update_send_;
+    bool skip_update_send_cached_;
     WorkQueue<std::string> membership_response_worker_;
     SubscribedRoutingInstanceList routing_instances_;
     PublishedRTargetRoutes rtarget_routes_;