Skip to content

W
White Rabbit Switch - Software
Commit 950856e1 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk Committed by Adam Wujek
Browse files
Options

pstats: adding support for NIC TX Frames counter

parent 8fa85648
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 43 deletions
kernel/wr_pstats/wr_pstats.c
View file @ 950856e1
...@@ -100,7 +100,8 @@ static struct pstats_version_description pstats_desc[] = { ...@@ -100,7 +100,8 @@ static struct pstats_version_description pstats_desc[] = {
"FastMatch: Resp Valid\n" /* 35 */ "FastMatch: Resp Valid\n" /* 35 */
"FullMatch: Resp Valid\n" /* 36 */ "FullMatch: Resp Valid\n" /* 36 */
"Forwarded\n" /* 37 */ "Forwarded\n" /* 37 */
"TRU Resp Valid", /* 38 */ "TRU Resp Valid\n" /* 38 */
"NIC TX Frames", /* 39 */
.rx_packets = 19, /* RX Frames */ .rx_packets = 19, /* RX Frames */
.tx_packets = 18, /* TX Frames */ .tx_packets = 18, /* TX Frames */
.rx_errors = 6, /* RX PCS Errors */ .rx_errors = 6, /* RX PCS Errors */
......
kernel/wr_pstats/wr_pstats.h
View file @ 950856e1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define WRVIC_BASE_IRQ (NR_AIC_IRQS + (5 * 32)) #define WRVIC_BASE_IRQ (NR_AIC_IRQS + (5 * 32))
/*****/ /*****/
#define PSTATS_MAX_NUM_OF_COUNTERS 39 /* Maximum number of counters #define PSTATS_MAX_NUM_OF_COUNTERS 40 /* Maximum number of counters
* supported by the driver */ * supported by the driver */
#define PSTATS_MAX_NPORTS 18 /* Maximum number of ports #define PSTATS_MAX_NPORTS 18 /* Maximum number of ports
......
userspace/tools/wrs_pstats.c
View file @ 950856e1
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
static void parse_sysfs(void); static void parse_sysfs(void);
#define NPORTS 18 #define NPORTS 18
#define CNT_PP 39 #define CNT_PP 40
struct cnt_word { struct cnt_word {
uint64_t cnt; uint64_t cnt;
...@@ -35,44 +35,45 @@ struct p_cnt cnt_pp[NPORTS]; ...@@ -35,44 +35,45 @@ struct p_cnt cnt_pp[NPORTS];
int use_ports; int use_ports;
char info[][20] = {{"Tu-run|"}, // 0 char info[][20] = {{"Tu-run|"}, // 0
{"Ro-run|"}, // 1 {"Ro-run|"}, // 1
{"Riv-cd|"}, // 2 {"Riv-cd|"}, // 2
{"Rsyn-l|"}, // 3 {"Rsyn-l|"}, // 3
{"Rpause|"}, // 4 {"Rpause|"}, // 4
{"Rpf-dp|"}, // 5 {"Rpf-dp|"}, // 5
{"Rpcs-e|"}, // 6 {"Rpcs-e|"}, // 6
{"Rgiant|"}, // 7 {"Rgiant|"}, // 7
{"Rrunt |"}, // 8 {"Rrunt |"}, // 8
{"Rcrc_e|"}, // 9 {"Rcrc_e|"}, // 9
{"Rpcl_0|"}, // 10 {"Rpcl_0|"}, // 10
{"Rpcl_1|"}, // 11 {"Rpcl_1|"}, // 11
{"Rpcl_2|"}, // 12 {"Rpcl_2|"}, // 12
{"Rpcl_3|"}, // 13 {"Rpcl_3|"}, // 13
{"Rpcl_4|"}, // 14 {"Rpcl_4|"}, // 14
{"Rpcl_5|"}, // 15 {"Rpcl_5|"}, // 15
{"Rpcl_6|"}, // 16 {"Rpcl_6|"}, // 16
{"Rpcl_7|"}, // 17 {"Rpcl_7|"}, // 17
{"Tframe|"}, // 18 {"Tframe|"}, // 18
{"Rframe|"}, // 19 {"Rframe|"}, // 19
{"Rrtu_f|"}, // 20 {"Rrtu_f|"}, // 20
{"Rpri_0|"}, // 21 -> p0 {"Rpri_0|"}, // 21 -> p0
{"Rpri_1|"}, // 22 -> p1 {"Rpri_1|"}, // 22 -> p1
{"Rpri_2|"}, // 23 -> p2 {"Rpri_2|"}, // 23 -> p2
{"Rpri_3|"}, // 24 -> p3 {"Rpri_3|"}, // 24 -> p3
{"Rpri_4|"}, // 25 -> p4 {"Rpri_4|"}, // 25 -> p4
{"Rpri_5|"}, // 26 -> p5 {"Rpri_5|"}, // 26 -> p5
{"Rpri_6|"}, // 27 -> p6 {"Rpri_6|"}, // 27 -> p6
{"Rpri_7|"}, // 28 -> p7 {"Rpri_7|"}, // 28 -> p7
{"RTUreq|"}, // 29 {"RTUreq|"}, // 29
{"RTUrsp|"}, // 30 {"RTUrsp|"}, // 30
{"RTUdrp|"}, // 31 {"RTUdrp|"}, // 31
{"RTUhp |"}, // 32 {"RTUhp |"}, // 32
{"RTUf-f|"}, // 33 {"RTUf-f|"}, // 33
{"RTUn-f|"}, // 34 {"RTUn-f|"}, // 34
{"RTUfst|"}, // 35 {"RTUfst|"}, // 35
{"RTUful|"}, // 36 {"RTUful|"}, // 36
{"RTUfwd|"}, // 37 --- {"RTUfwd|"}, // 37 ---
{"TRUrsp|"} // 38 {"TRUrsp|"}, // 38
{"NIC_Tx|"} // 39
}; };
int pstats_init(int init) int pstats_init(int init)
...@@ -206,7 +207,7 @@ void print_info(char *prgname) ...@@ -206,7 +207,7 @@ void print_info(char *prgname)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int prio_cnts[] = {21,22,23,24,25,26,27,28}; //8 int prio_cnts[] = {21,22,23,24,25,26,27,28}; //8
int def_cnts[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,29,30,31,32,33,34,35,36,37}; //30 int def_cnts[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,29,30,31,32,33,34,35,36,37,39}; //31
int rtu_cnts[] = {29,30,31,32,33,34,35,36,37,38}; //10 int rtu_cnts[] = {29,30,31,32,33,34,35,36,37,38}; //10
int ep_cnts[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28}; //29 int ep_cnts[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28}; //29
int traffic[] = {18,19};//2 int traffic[] = {18,19};//2
...@@ -260,7 +261,7 @@ int main(int argc, char **argv) ...@@ -260,7 +261,7 @@ int main(int argc, char **argv)
print_first_n_cnts(CNT_PP); print_first_n_cnts(CNT_PP);
break; break;
default: default:
print_chosen_cnts(def_cnts, 30); print_chosen_cnts(def_cnts, 31);
} }
sleep(1); sleep(1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment