Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Trigger Distribution
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Trigger Distribution
Commits
c4e57572
Commit
c4e57572
authored
Jun 27, 2019
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw: remove unused root stats
parent
e8c07557
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
18 deletions
+7
-18
wrtd_definitions.svh
hdl/testbench/include/wrtd_definitions.svh
+1
-1
main.sv
hdl/testbench/wrtd_ref_svec_tdc_fd/main.sv
+3
-3
wrtd-rt-common.h
software/firmware/common/wrtd-rt-common.h
+3
-7
wrtd-common.h
software/include/wrtd-common.h
+0
-7
No files found.
hdl/testbench/include/wrtd_definitions.svh
View file @
c4e57572
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
`define
WRTD_IO_MSG_WORD_SIZE 2
`define
WRTD_IO_MSG_WORD_SIZE 2
`define
WRTD_CFG_MSG_WORD_SIZE 5
`define
WRTD_CFG_MSG_WORD_SIZE 5
`define
WRTD_ROOT_WORD_SIZE
12
`define
WRTD_ROOT_WORD_SIZE
9
`define
WRTD_RULE_WORD_SIZE 43
`define
WRTD_RULE_WORD_SIZE 43
`define
WRTD_ALRM_WORD_SIZE 15
`define
WRTD_ALRM_WORD_SIZE 15
...
...
hdl/testbench/wrtd_ref_svec_tdc_fd/main.sv
View file @
c4e57572
...
@@ -61,15 +61,15 @@ module main;
...
@@ -61,15 +61,15 @@ module main;
dev
.
init
()
;
dev
.
init
()
;
dev
.
add_rule
(
"rule0"
)
;
dev
.
add_rule
(
"rule0"
)
;
dev
.
set_rule
(
"rule0"
,
"NET0"
,
"LC-O1"
,
15
0000
)
;
dev
.
set_rule
(
"rule0"
,
"NET0"
,
"LC-O1"
,
20
0000
)
;
dev
.
enable_rule
(
"rule0"
)
;
dev
.
enable_rule
(
"rule0"
)
;
dev
.
add_rule
(
"rule1"
)
;
dev
.
add_rule
(
"rule1"
)
;
dev
.
set_rule
(
"rule1"
,
"NET1"
,
"LC-O2"
,
15
0000
)
;
dev
.
set_rule
(
"rule1"
,
"NET1"
,
"LC-O2"
,
20
0000
)
;
dev
.
enable_rule
(
"rule1"
)
;
dev
.
enable_rule
(
"rule1"
)
;
dev
.
add_rule
(
"rule2"
)
;
dev
.
add_rule
(
"rule2"
)
;
dev
.
set_rule
(
"rule2"
,
"NET2"
,
"LC-O3"
,
15
0000
)
;
dev
.
set_rule
(
"rule2"
,
"NET2"
,
"LC-O3"
,
20
0000
)
;
dev
.
enable_rule
(
"rule2"
)
;
dev
.
enable_rule
(
"rule2"
)
;
dev
.
add_rule
(
"rule3"
)
;
dev
.
add_rule
(
"rule3"
)
;
...
...
software/firmware/common/wrtd-rt-common.h
View file @
c4e57572
...
@@ -255,6 +255,9 @@ static void wrtd_log(uint32_t type, uint32_t reason,
...
@@ -255,6 +255,9 @@ static void wrtd_log(uint32_t type, uint32_t reason,
struct
trtl_fw_msg
msg
;
struct
trtl_fw_msg
msg
;
int
ret
;
int
ret
;
if
(
root
.
log_flags
==
0
)
return
;
/* First, handle statistics */
/* First, handle statistics */
if
((
type
==
WRTD_LOG_MSG_EV_DISCARDED
)
&&
(
rule
!=
NULL
))
{
if
((
type
==
WRTD_LOG_MSG_EV_DISCARDED
)
&&
(
rule
!=
NULL
))
{
rule
->
stat
.
miss_last
=
ev
->
ts
;
rule
->
stat
.
miss_last
=
ev
->
ts
;
...
@@ -276,14 +279,8 @@ static void wrtd_log(uint32_t type, uint32_t reason,
...
@@ -276,14 +279,8 @@ static void wrtd_log(uint32_t type, uint32_t reason,
}
}
}
}
if
(
!
(
root
.
log_flags
&
(
1
<<
type
)))
{
root
.
log_nbr_discarded
++
;
return
;
}
ret
=
mq_claim
(
TRTL_HMQ
,
WRTD_HMQ
);
ret
=
mq_claim
(
TRTL_HMQ
,
WRTD_HMQ
);
if
(
ret
==
-
EBUSY
)
{
if
(
ret
==
-
EBUSY
)
{
root
.
log_nbr_busy
++
;
return
;
return
;
}
}
...
@@ -308,7 +305,6 @@ static void wrtd_log(uint32_t type, uint32_t reason,
...
@@ -308,7 +305,6 @@ static void wrtd_log(uint32_t type, uint32_t reason,
mq_send
(
TRTL_HMQ
,
WRTD_HMQ
);
mq_send
(
TRTL_HMQ
,
WRTD_HMQ
);
root
.
log_nbr_sent
++
;
}
}
#if WRTD_NET_TX > 0
#if WRTD_NET_TX > 0
...
...
software/include/wrtd-common.h
View file @
c4e57572
...
@@ -192,13 +192,6 @@ struct wrtd_root {
...
@@ -192,13 +192,6 @@ struct wrtd_root {
uint32_t
rules_addr
;
uint32_t
rules_addr
;
uint32_t
alarms_addr
;
uint32_t
alarms_addr
;
/* Log stats. */
/* Number of entries discarded (because flag not set). */
uint32_t
log_nbr_discarded
;
/* Number of entries missed because rmq/fifo is full. */
uint32_t
log_nbr_busy
;
/* Number of entries sent. */
uint32_t
log_nbr_sent
;
};
};
struct
wrtd_config_msg
{
struct
wrtd_config_msg
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment