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
339c314c
Commit
339c314c
authored
Jul 05, 2017
by
Matthias Vallentin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Streamline default multiplexer logging
parent
acada7c5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
13 deletions
+10
-13
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+10
-13
No files found.
libcaf_io/src/default_multiplexer.cpp
View file @
339c314c
...
@@ -314,8 +314,8 @@ namespace network {
...
@@ -314,8 +314,8 @@ namespace network {
static_cast
<
int
>
(
shadow_
.
changes
.
size
()),
static_cast
<
int
>
(
shadow_
.
changes
.
size
()),
pollset_
.
data
(),
static_cast
<
int
>
(
pollset_
.
size
()),
pollset_
.
data
(),
static_cast
<
int
>
(
pollset_
.
size
()),
nullptr
);
nullptr
);
CAF_LOG_DEBUG
(
"kevent() on
"
<<
CAF_ARG
(
pollset_
.
size
())
CAF_LOG_DEBUG
(
"kevent() on"
<<
CAF_ARG
(
pollset_
.
size
())
<<
" sockets reported
"
<<
CAF_ARG
(
nev
)
<<
" sockets reported"
<<
CAF_ARG
(
nev
)
<<
" event(s)"
);
<<
" event(s)"
);
if
(
nev
<
0
)
if
(
nev
<
0
)
switch
(
errno
)
{
switch
(
errno
)
{
...
@@ -379,8 +379,7 @@ namespace network {
...
@@ -379,8 +379,7 @@ namespace network {
shadow_
.
changes
.
emplace_back
(
std
::
move
(
ke
));
shadow_
.
changes
.
emplace_back
(
std
::
move
(
ke
));
};
};
if
(
e
.
mask
==
0
)
{
if
(
e
.
mask
==
0
)
{
CAF_LOG_DEBUG
(
"attempt to remove socket"
<<
CAF_ARG
(
e
.
fd
)
CAF_LOG_DEBUG
(
"attempt to remove socket from kqueue:"
<<
CAF_ARG
(
e
.
fd
));
<<
"from kqueue"
);
if
(
old
&
output_mask
)
if
(
old
&
output_mask
)
kqueue_update
(
EV_DELETE
,
EVFILT_WRITE
);
kqueue_update
(
EV_DELETE
,
EVFILT_WRITE
);
if
(
old
&
input_mask
)
if
(
old
&
input_mask
)
...
@@ -389,7 +388,7 @@ namespace network {
...
@@ -389,7 +388,7 @@ namespace network {
if
(
i
!=
shadow_
.
fds
.
end
()
&&
*
i
==
e
.
fd
)
if
(
i
!=
shadow_
.
fds
.
end
()
&&
*
i
==
e
.
fd
)
shadow_
.
fds
.
erase
(
i
);
shadow_
.
fds
.
erase
(
i
);
}
else
if
(
old
==
0
)
{
}
else
if
(
old
==
0
)
{
CAF_LOG_DEBUG
(
"attempt to add socket
"
<<
CAF_ARG
(
e
.
fd
)
<<
"to kqueue"
);
CAF_LOG_DEBUG
(
"attempt to add socket
to kqueue:"
<<
CAF_ARG
(
e
.
fd
)
);
if
(
e
.
mask
&
output_mask
)
if
(
e
.
mask
&
output_mask
)
kqueue_update
(
EV_ADD
,
EVFILT_WRITE
);
kqueue_update
(
EV_ADD
,
EVFILT_WRITE
);
if
(
e
.
mask
&
input_mask
)
if
(
e
.
mask
&
input_mask
)
...
@@ -399,7 +398,7 @@ namespace network {
...
@@ -399,7 +398,7 @@ namespace network {
shadow_
.
fds
.
insert
(
i
,
e
.
fd
);
shadow_
.
fds
.
insert
(
i
,
e
.
fd
);
}
else
{
}
else
{
CAF_LOG_DEBUG
(
"modify kqueue event mask for socket"
<<
CAF_ARG
(
e
.
fd
)
CAF_LOG_DEBUG
(
"modify kqueue event mask for socket"
<<
CAF_ARG
(
e
.
fd
)
<<
": "
<<
CAF_ARG
(
old
)
<<
" ->
"
<<
CAF_ARG
(
e
.
mask
));
<<
": "
<<
CAF_ARG
(
old
)
<<
" ->"
<<
CAF_ARG
(
e
.
mask
));
if
(
!
(
old
&
output_mask
)
&&
(
e
.
mask
&
output_mask
))
if
(
!
(
old
&
output_mask
)
&&
(
e
.
mask
&
output_mask
))
kqueue_update
(
EV_ADD
,
EVFILT_WRITE
);
kqueue_update
(
EV_ADD
,
EVFILT_WRITE
);
if
((
old
&
output_mask
)
&&
!
(
e
.
mask
&
output_mask
))
if
((
old
&
output_mask
)
&&
!
(
e
.
mask
&
output_mask
))
...
@@ -453,8 +452,8 @@ namespace network {
...
@@ -453,8 +452,8 @@ namespace network {
while
(
shadow_
>
0
)
{
while
(
shadow_
>
0
)
{
int
presult
=
epoll_wait
(
loopfd_
,
pollset_
.
data
(),
int
presult
=
epoll_wait
(
loopfd_
,
pollset_
.
data
(),
static_cast
<
int
>
(
pollset_
.
size
()),
-
1
);
static_cast
<
int
>
(
pollset_
.
size
()),
-
1
);
CAF_LOG_DEBUG
(
"epoll_wait() on
"
<<
CAF_ARG
(
shadow_
)
CAF_LOG_DEBUG
(
"epoll_wait() on"
<<
CAF_ARG
(
shadow_
)
<<
" sockets reported
"
<<
CAF_ARG
(
presult
)
<<
" sockets reported"
<<
CAF_ARG
(
presult
)
<<
" event(s)"
);
<<
" event(s)"
);
if
(
presult
<
0
)
{
if
(
presult
<
0
)
{
switch
(
errno
)
{
switch
(
errno
)
{
...
@@ -484,8 +483,7 @@ namespace network {
...
@@ -484,8 +483,7 @@ namespace network {
}
}
void
default_multiplexer
::
handle
(
const
default_multiplexer
::
event
&
e
)
{
void
default_multiplexer
::
handle
(
const
default_multiplexer
::
event
&
e
)
{
CAF_LOG_TRACE
(
"e.fd = "
<<
CAF_ARG
(
e
.
fd
)
<<
", mask = "
CAF_LOG_TRACE
(
CAF_ARG
(
e
.
fd
)
<<
CAF_ARG
(
e
.
mask
));
<<
CAF_ARG
(
e
.
mask
));
// ptr is only allowed to nullptr if fd is our pipe
// ptr is only allowed to nullptr if fd is our pipe
// read handle which is only registered for input
// read handle which is only registered for input
CAF_ASSERT
(
e
.
ptr
!=
nullptr
||
e
.
fd
==
pipe_
.
first
);
CAF_ASSERT
(
e
.
ptr
!=
nullptr
||
e
.
fd
==
pipe_
.
first
);
...
@@ -502,12 +500,11 @@ namespace network {
...
@@ -502,12 +500,11 @@ namespace network {
ee
.
data
.
ptr
=
e
.
ptr
;
ee
.
data
.
ptr
=
e
.
ptr
;
int
op
;
int
op
;
if
(
e
.
mask
==
0
)
{
if
(
e
.
mask
==
0
)
{
CAF_LOG_DEBUG
(
"attempt to remove socket "
<<
CAF_ARG
(
e
.
fd
)
CAF_LOG_DEBUG
(
"attempt to remove socket from epoll:"
<<
CAF_ARG
(
e
.
fd
));
<<
" from epoll"
);
op
=
EPOLL_CTL_DEL
;
op
=
EPOLL_CTL_DEL
;
--
shadow_
;
--
shadow_
;
}
else
if
(
old
==
0
)
{
}
else
if
(
old
==
0
)
{
CAF_LOG_DEBUG
(
"attempt to add socket
"
<<
CAF_ARG
(
e
.
fd
)
<<
" to epoll"
);
CAF_LOG_DEBUG
(
"attempt to add socket
to epoll:"
<<
CAF_ARG
(
e
.
fd
)
);
op
=
EPOLL_CTL_ADD
;
op
=
EPOLL_CTL_ADD
;
++
shadow_
;
++
shadow_
;
}
else
{
}
else
{
...
...
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