浏览代码

RDS: Move atomic stats from general to ib-specific area

Signed-off-by: Andy Grover <andy.grover@oracle.com>
Andy Grover 15 年之前
父节点
当前提交
51e2cba8b5
共有 5 个文件被更改,包括 6 次插入6 次删除
  1. 2 0
      net/rds/ib.h
  2. 2 2
      net/rds/ib_send.c
  3. 2 0
      net/rds/ib_stats.c
  4. 0 2
      net/rds/rds.h
  5. 0 2
      net/rds/stats.c

+ 2 - 0
net/rds/ib.h

@@ -202,6 +202,8 @@ struct rds_ib_statistics {
 	uint64_t	s_ib_rdma_mr_pool_flush;
 	uint64_t	s_ib_rdma_mr_pool_flush;
 	uint64_t	s_ib_rdma_mr_pool_wait;
 	uint64_t	s_ib_rdma_mr_pool_wait;
 	uint64_t	s_ib_rdma_mr_pool_depleted;
 	uint64_t	s_ib_rdma_mr_pool_depleted;
+	uint64_t	s_ib_atomic_cswp;
+	uint64_t	s_ib_atomic_fadd;
 };
 };
 
 
 extern struct workqueue_struct *rds_ib_wq;
 extern struct workqueue_struct *rds_ib_wq;

+ 2 - 2
net/rds/ib_send.c

@@ -132,9 +132,9 @@ static void rds_ib_send_unmap_atomic(struct rds_ib_connection *ic,
 			     wc_status, rds_atomic_send_complete);
 			     wc_status, rds_atomic_send_complete);
 
 
 	if (op->op_type == RDS_ATOMIC_TYPE_CSWP)
 	if (op->op_type == RDS_ATOMIC_TYPE_CSWP)
-		rds_stats_inc(s_atomic_cswp);
+		rds_ib_stats_inc(s_ib_atomic_cswp);
 	else
 	else
-		rds_stats_inc(s_atomic_fadd);
+		rds_ib_stats_inc(s_ib_atomic_fadd);
 }
 }
 
 
 /*
 /*

+ 2 - 0
net/rds/ib_stats.c

@@ -67,6 +67,8 @@ static const char *const rds_ib_stat_names[] = {
 	"ib_rdma_mr_pool_flush",
 	"ib_rdma_mr_pool_flush",
 	"ib_rdma_mr_pool_wait",
 	"ib_rdma_mr_pool_wait",
 	"ib_rdma_mr_pool_depleted",
 	"ib_rdma_mr_pool_depleted",
+	"ib_atomic_cswp",
+	"ib_atomic_fadd",
 };
 };
 
 
 unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter,
 unsigned int rds_ib_stats_info_copy(struct rds_info_iterator *iter,

+ 0 - 2
net/rds/rds.h

@@ -566,8 +566,6 @@ struct rds_statistics {
 	uint64_t	s_cong_update_received;
 	uint64_t	s_cong_update_received;
 	uint64_t	s_cong_send_error;
 	uint64_t	s_cong_send_error;
 	uint64_t	s_cong_send_blocked;
 	uint64_t	s_cong_send_blocked;
-	uint64_t	s_atomic_cswp;
-	uint64_t	s_atomic_fadd;
 };
 };
 
 
 /* af_rds.c */
 /* af_rds.c */

+ 0 - 2
net/rds/stats.c

@@ -75,8 +75,6 @@ static const char *const rds_stat_names[] = {
 	"cong_update_received",
 	"cong_update_received",
 	"cong_send_error",
 	"cong_send_error",
 	"cong_send_blocked",
 	"cong_send_blocked",
-	"s_atomic_cswp",
-	"s_atomic_fadd",
 };
 };
 
 
 void rds_stats_info_copy(struct rds_info_iterator *iter,
 void rds_stats_info_copy(struct rds_info_iterator *iter,