Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
f6fbd101
Commit
f6fbd101
authored
Nov 18, 2016
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove debug output
parent
262def62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
11 deletions
+1
-11
libcaf_io/caf/io/network/default_multiplexer.hpp
libcaf_io/caf/io/network/default_multiplexer.hpp
+0
-10
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+1
-1
No files found.
libcaf_io/caf/io/network/default_multiplexer.hpp
View file @
f6fbd101
...
...
@@ -377,20 +377,16 @@ private:
CAF_LOG_TRACE
(
CAF_ARG
(
op
)
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
old_bf
));
auto
last
=
events_
.
end
();
auto
i
=
std
::
lower_bound
(
events_
.
begin
(),
last
,
fd
,
event_less
{});
// std::cerr << "Events: " << std::distance(events_.begin(), i) << std::endl;
if
(
i
!=
last
&&
i
->
fd
==
fd
)
{
CAF_ASSERT
(
ptr
==
i
->
ptr
);
// squash events together
CAF_LOG_DEBUG
(
"squash events:"
<<
CAF_ARG
(
i
->
mask
)
<<
CAF_ARG
(
fun
(
op
,
i
->
mask
)));
//std::cerr << "[NE] Squash events:" << std::ios::hex << i->mask
// << " --> " << std::ios::hex << fun(op, i->mask) << std::endl;
auto
bf
=
i
->
mask
;
i
->
mask
=
fun
(
op
,
bf
);
if
(
i
->
mask
==
bf
)
{
// didn't do a thing
CAF_LOG_DEBUG
(
"squashing did not change the event"
);
//std::cerr << "[NE] Squashing did not change the event" << std::endl;
}
else
if
(
i
->
mask
==
old_bf
)
{
// just turned into a nop
CAF_LOG_DEBUG
(
"squashing events resulted in a NOP"
);
...
...
@@ -402,14 +398,8 @@ private:
if
(
bf
==
old_bf
)
{
CAF_LOG_DEBUG
(
"[NE] Event has no effect (discarded): "
<<
CAF_ARG
(
bf
)
<<
", "
<<
CAF_ARG
(
old_bf
));
//std::cerr << "[NE] Event has no effect (discarded): "
// << std::ios::hex << bf << ", "
// << std::ios::hex << old_bf << std::endl;
}
else
{
CAF_LOG_DEBUG
(
"added handler:"
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
op
));
//std::cerr << "[NE] Added handler: "
// << std::ios::hex << bf << ", "
// << std::ios::hex << to_string(op) << std::endl;
events_
.
insert
(
i
,
event
{
fd
,
bf
,
ptr
});
}
}
...
...
libcaf_io/src/default_multiplexer.cpp
View file @
f6fbd101
...
...
@@ -1266,7 +1266,7 @@ bool receive_datagram(size_t& result, native_socket fd, void* buf, size_t len,
sockaddr_storage
&
sender_addr
,
socklen_t
&
sender_len
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
fd
));
sender_len
=
sizeof
(
sockaddr
);
auto
sres
=
::
recvfrom
(
fd
,
buf
,
len
,
0
,
auto
sres
=
::
recvfrom
(
fd
,
buf
,
len
,
0
,
reinterpret_cast
<
struct
sockaddr
*>
(
&
sender_addr
),
&
sender_len
);
// TODO: Check if sres > len and do some error handling ...
...
...
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