Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ycai
simbricks
Commits
088c846e
Commit
088c846e
authored
May 02, 2022
by
Antoine Kaufmann
Browse files
dist/sockets: disable racy debug checks
These are currently not correct and trigger randomly because of races.
parent
480a0631
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
40 deletions
+0
-40
dist/common/base.c
dist/common/base.c
+0
-40
No files found.
dist/common/base.c
View file @
088c846e
...
@@ -231,35 +231,6 @@ int BasePeerReport(struct Peer *peer, uint32_t written_pos, uint32_t clean_pos)
...
@@ -231,35 +231,6 @@ int BasePeerReport(struct Peer *peer, uint32_t written_pos, uint32_t clean_pos)
clean_pos
==
pos
)
clean_pos
==
pos
)
return
0
;
return
0
;
// make sure there are not suddenly fewer entries to be cleaned up
uint32_t
n_before
=
(
peer
->
cleanup_pos_reported
<=
peer
->
cleanup_pos_last
?
peer
->
cleanup_pos_last
-
peer
->
cleanup_pos_reported
:
peer
->
cleanup_enum
-
peer
->
cleanup_pos_reported
+
peer
->
cleanup_pos_last
);
uint32_t
n_after
=
(
peer
->
cleanup_pos_reported
<=
written_pos
?
written_pos
-
peer
->
cleanup_pos_reported
:
peer
->
cleanup_enum
-
peer
->
cleanup_pos_reported
+
written_pos
);
if
(
n_before
>
n_after
)
{
fprintf
(
stderr
,
"PeerReport: BUG fewer entries to clean up after report: "
"peer %s written %u -> %u, cleaned %u -> %u
\n
"
,
peer
->
sock_path
,
peer
->
cleanup_pos_last
,
written_pos
,
peer
->
local_pos_cleaned
,
clean_pos
);
abort
();
}
// make sure clean pos is between l_p_c and l_p_r
if
(((
peer
->
local_pos_cleaned
<=
peer
->
local_pos_reported
)
&&
(
clean_pos
<
peer
->
local_pos_cleaned
||
clean_pos
>
peer
->
local_pos_reported
))
||
((
peer
->
local_pos_cleaned
>
peer
->
local_pos_reported
)
&&
(
clean_pos
>
peer
->
local_pos_reported
&&
clean_pos
<
peer
->
local_pos_cleaned
)))
{
fprintf
(
stderr
,
"PeerReport: BUG invalid last clean position report: "
"peer %s written %u -> %u, cleaned %u -> %u (lpr=%u)
\n
"
,
peer
->
sock_path
,
peer
->
cleanup_pos_last
,
written_pos
,
peer
->
local_pos_cleaned
,
clean_pos
,
peer
->
local_pos_reported
);
abort
();
}
#ifdef DEBUG
#ifdef DEBUG
fprintf
(
stderr
,
"PeerReport: peer %s written %u -> %u, cleaned %u -> %u
\n
"
,
fprintf
(
stderr
,
"PeerReport: peer %s written %u -> %u, cleaned %u -> %u
\n
"
,
peer
->
sock_path
,
peer
->
cleanup_pos_last
,
written_pos
,
peer
->
sock_path
,
peer
->
cleanup_pos_last
,
written_pos
,
...
@@ -473,17 +444,6 @@ void BasePoll() {
...
@@ -473,17 +444,6 @@ void BasePoll() {
void
BaseEntryReceived
(
struct
Peer
*
peer
,
uint32_t
pos
,
void
*
data
)
void
BaseEntryReceived
(
struct
Peer
*
peer
,
uint32_t
pos
,
void
*
data
)
{
{
// validate position for debugging:
if
((
peer
->
cleanup_pos_reported
<=
peer
->
cleanup_pos_last
&&
(
pos
>=
peer
->
cleanup_pos_reported
&&
pos
<
peer
->
cleanup_pos_last
))
||
(
peer
->
cleanup_pos_reported
>
peer
->
cleanup_pos_last
&&
(
pos
>=
peer
->
cleanup_pos_reported
||
pos
<
peer
->
cleanup_pos_last
)))
{
fprintf
(
stderr
,
"NetEntryReceived: BUG position %u is in window to be "
"cleaned %u -> %u"
,
pos
,
peer
->
cleanup_pos_reported
,
peer
->
cleanup_pos_last
);
abort
();
}
uint64_t
off
=
(
uint64_t
)
pos
*
peer
->
cleanup_elen
;
uint64_t
off
=
(
uint64_t
)
pos
*
peer
->
cleanup_elen
;
void
*
entry
=
peer
->
cleanup_base
+
off
;
void
*
entry
=
peer
->
cleanup_base
+
off
;
...
...
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