Merge "Add more counters in IFMapUpdateSender" into R2.22.x

Juniper · Apr 30, 2016 · 4ab72aa · 4ab72aa
2 parents d9adec8 + 9d22459
commit 4ab72aa
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 13 deletions.
diff --git a/src/ifmap/ifmap_client.cc b/src/ifmap/ifmap_client.cc
@@ -11,7 +11,8 @@
 
 IFMapClient::IFMapClient()
     : index_(kIndexInvalid), exporter_(NULL), msgs_sent_(0), msgs_blocked_(0),
-      bytes_sent_(0), nodes_sent_(0), links_sent_(0), send_is_blocked_(false),
+      bytes_sent_(0), update_nodes_sent_(0), delete_nodes_sent_(0),
+      update_links_sent_(0), delete_links_sent_(0), send_is_blocked_(false),
       created_at_(UTCTimestampUsec()) {
 }
 

diff --git a/src/ifmap/ifmap_client.h b/src/ifmap/ifmap_client.h
@@ -32,16 +32,20 @@ class IFMapClient {
     uint64_t msgs_sent() const { return msgs_sent_; }
     uint64_t msgs_blocked() const { return msgs_blocked_; }
     uint64_t bytes_sent() const { return bytes_sent_; }
-    uint64_t nodes_sent() const { return nodes_sent_; }
-    uint64_t links_sent() const { return links_sent_; }
+    uint64_t update_nodes_sent() const { return update_nodes_sent_; }
+    uint64_t delete_nodes_sent() const { return delete_nodes_sent_; }
+    uint64_t update_links_sent() const { return update_links_sent_; }
+    uint64_t delete_links_sent() const { return delete_links_sent_; }
     bool send_is_blocked() const { return send_is_blocked_; }
     uint64_t created_at() const { return created_at_; }
 
     void incr_msgs_sent() { ++msgs_sent_; }
     void incr_msgs_blocked() { ++msgs_blocked_; }
     void incr_bytes_sent(uint64_t bytes) { bytes_sent_ += bytes; }
-    void incr_nodes_sent() { ++nodes_sent_; }
-    void incr_links_sent() { ++links_sent_; }
+    void incr_update_nodes_sent() { ++update_nodes_sent_; }
+    void incr_delete_nodes_sent() { ++delete_nodes_sent_; }
+    void incr_update_links_sent() { ++update_links_sent_; }
+    void incr_delete_links_sent() { ++delete_links_sent_; }
     void set_send_is_blocked(bool is_blocked) { send_is_blocked_ = is_blocked; }
 
     void Initialize(IFMapExporter *exporter, int index);
@@ -73,8 +77,10 @@ class IFMapClient {
     uint64_t msgs_sent_;
     uint64_t msgs_blocked_;
     uint64_t bytes_sent_;
-    uint64_t nodes_sent_;
-    uint64_t links_sent_;
+    uint64_t update_nodes_sent_;
+    uint64_t delete_nodes_sent_;
+    uint64_t update_links_sent_;
+    uint64_t delete_links_sent_;
     bool send_is_blocked_;
     VmMap vm_map_;
     std::string name_;

diff --git a/src/ifmap/ifmap_server_show.sandesh b/src/ifmap/ifmap_server_show.sandesh
@@ -90,8 +90,10 @@ struct IFMapXmppClientInfo {
     9: VmRegInfo vm_reg_info;
     3: u64 msgs_sent;
     4: u64 msgs_blocked;
-    5: u64 nodes_sent;
-    6: u64 links_sent;
+    5: u64 update_nodes_sent;
+    10: u64 delete_nodes_sent;
+    6: u64 update_links_sent;
+    11: u64 delete_links_sent;
     7: u64 bytes_sent;
     8: bool is_blocked;
 }

diff --git a/src/ifmap/ifmap_update_sender.cc b/src/ifmap/ifmap_update_sender.cc
@@ -317,9 +317,21 @@ void IFMapUpdateSender::LogAndCountSentUpdate(IFMapUpdate *update,
                 IFMAP_DEBUG_ONLY(IFMapClientSendInfo, operation, name,
                                  client->identifier(), client->name());
                 if (update->IsNode()) {
-                    client->incr_nodes_sent();
+                    if (update->IsUpdate()) {
+                        client->incr_update_nodes_sent();
+                    } else if (update->IsDelete()) {
+                        client->incr_delete_nodes_sent();
+                    } else {
+                        assert(0);
+                    }
                 } else if (update->IsLink()) {
-                    client->incr_links_sent();
+                    if (update->IsUpdate()) {
+                        client->incr_update_links_sent();
+                    } else if (update->IsDelete()) {
+                        client->incr_delete_links_sent();
+                    } else {
+                        assert(0);
+                    }
                 }
             }
             client_id = base_send_set.find_next(client_id);

diff --git a/src/ifmap/ifmap_xmpp_client_show.cc b/src/ifmap/ifmap_xmpp_client_show.cc
@@ -58,8 +58,10 @@ void ShowIFMapXmppClientInfo::CopyNode(IFMapXmppClientInfo *dest,
     dest->set_client_index(src->index());
     dest->set_msgs_sent(src->msgs_sent());
     dest->set_msgs_blocked(src->msgs_blocked());
-    dest->set_nodes_sent(src->nodes_sent());
-    dest->set_links_sent(src->links_sent());
+    dest->set_update_nodes_sent(src->update_nodes_sent());
+    dest->set_delete_nodes_sent(src->delete_nodes_sent());
+    dest->set_update_links_sent(src->update_links_sent());
+    dest->set_delete_links_sent(src->delete_links_sent());
     dest->set_bytes_sent(src->bytes_sent());
     dest->set_is_blocked(src->send_is_blocked());