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
d05fb5d4
Commit
d05fb5d4
authored
Jan 10, 2020
by
Jakob Otto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup code
parent
78e185c8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
21 deletions
+34
-21
libcaf_net/caf/net/multiplexer.hpp
libcaf_net/caf/net/multiplexer.hpp
+4
-1
libcaf_net/src/multiplexer.cpp
libcaf_net/src/multiplexer.cpp
+8
-6
libcaf_net/src/net/backend/test.cpp
libcaf_net/src/net/backend/test.cpp
+2
-2
libcaf_net/src/pollset_updater.cpp
libcaf_net/src/pollset_updater.cpp
+20
-12
No files found.
libcaf_net/caf/net/multiplexer.hpp
View file @
d05fb5d4
...
@@ -71,7 +71,7 @@ public:
...
@@ -71,7 +71,7 @@ public:
/// @thread-safe
/// @thread-safe
void
register_writing
(
const
socket_manager_ptr
&
mgr
);
void
register_writing
(
const
socket_manager_ptr
&
mgr
);
/// Unregisters `mgr` for events.
/// Unregisters `mgr` for
read and write
events.
/// @thread-safe
/// @thread-safe
void
unregister_manager
(
const
socket_manager_ptr
&
mgr
);
void
unregister_manager
(
const
socket_manager_ptr
&
mgr
);
...
@@ -109,6 +109,9 @@ protected:
...
@@ -109,6 +109,9 @@ protected:
/// Deletes a known socket manager from the pollset.
/// Deletes a known socket manager from the pollset.
void
del
(
const
socket_manager_ptr
&
mgr
);
void
del
(
const
socket_manager_ptr
&
mgr
);
/// Deletes a known socket manager from the pollset.
void
del
(
ptrdiff_t
index
);
/// Writes `opcode` and pointer to `mgr` the the pipe for handling an event
/// Writes `opcode` and pointer to `mgr` the the pipe for handling an event
/// later via the pollset updater.
/// later via the pollset updater.
void
write_to_pipe
(
uint8_t
opcode
,
const
socket_manager_ptr
&
mgr
);
void
write_to_pipe
(
uint8_t
opcode
,
const
socket_manager_ptr
&
mgr
);
...
...
libcaf_net/src/multiplexer.cpp
View file @
d05fb5d4
...
@@ -29,7 +29,6 @@
...
@@ -29,7 +29,6 @@
#include "caf/net/pollset_updater.hpp"
#include "caf/net/pollset_updater.hpp"
#include "caf/net/socket_manager.hpp"
#include "caf/net/socket_manager.hpp"
#include "caf/sec.hpp"
#include "caf/sec.hpp"
#include "caf/span.hpp"
#include "caf/variant.hpp"
#include "caf/variant.hpp"
#ifndef CAF_WINDOWS
#ifndef CAF_WINDOWS
...
@@ -209,8 +208,7 @@ bool multiplexer::poll_once(bool blocking) {
...
@@ -209,8 +208,7 @@ bool multiplexer::poll_once(bool blocking) {
auto
new_events
=
handle
(
mgr
,
events
,
revents
);
auto
new_events
=
handle
(
mgr
,
events
,
revents
);
--
presult
;
--
presult
;
if
(
new_events
==
0
)
{
if
(
new_events
==
0
)
{
pollset_
.
erase
(
pollset_
.
begin
()
+
i
);
del
(
i
);
managers_
.
erase
(
managers_
.
begin
()
+
i
);
continue
;
continue
;
}
else
if
(
new_events
!=
events
)
{
}
else
if
(
new_events
!=
events
)
{
pollset_
[
i
].
events
=
new_events
;
pollset_
[
i
].
events
=
new_events
;
...
@@ -290,9 +288,13 @@ void multiplexer::add(socket_manager_ptr mgr) {
...
@@ -290,9 +288,13 @@ void multiplexer::add(socket_manager_ptr mgr) {
}
}
void
multiplexer
::
del
(
const
socket_manager_ptr
&
mgr
)
{
void
multiplexer
::
del
(
const
socket_manager_ptr
&
mgr
)
{
CAF_ASSERT
(
index_of
(
mgr
)
!=
-
1
);
del
(
index_of
(
mgr
));
pollset_
.
erase
(
pollset_
.
begin
()
+
index_of
(
mgr
));
}
managers_
.
erase
(
managers_
.
begin
()
+
index_of
(
mgr
));
void
multiplexer
::
del
(
ptrdiff_t
index
)
{
CAF_ASSERT
(
index
!=
-
1
);
pollset_
.
erase
(
pollset_
.
begin
()
+
index
);
managers_
.
erase
(
managers_
.
begin
()
+
index
);
}
}
void
multiplexer
::
write_to_pipe
(
uint8_t
opcode
,
const
socket_manager_ptr
&
mgr
)
{
void
multiplexer
::
write_to_pipe
(
uint8_t
opcode
,
const
socket_manager_ptr
&
mgr
)
{
...
...
libcaf_net/src/net/backend/test.cpp
View file @
d05fb5d4
...
@@ -45,8 +45,8 @@ error test::init() {
...
@@ -45,8 +45,8 @@ error test::init() {
}
}
void
test
::
stop
()
{
void
test
::
stop
()
{
for
(
const
auto
&
p
air
:
peers_
)
for
(
const
auto
&
p
:
peers_
)
proxies_
.
erase
(
p
air
.
first
);
proxies_
.
erase
(
p
.
first
);
peers_
.
clear
();
peers_
.
clear
();
}
}
...
...
libcaf_net/src/pollset_updater.cpp
View file @
d05fb5d4
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
#include <cstring>
#include <cstring>
#include "caf/logger.hpp"
#include "caf/net/multiplexer.hpp"
#include "caf/net/multiplexer.hpp"
#include "caf/sec.hpp"
#include "caf/sec.hpp"
#include "caf/span.hpp"
#include "caf/span.hpp"
...
@@ -50,18 +51,25 @@ bool pollset_updater::handle_read_event() {
...
@@ -50,18 +51,25 @@ bool pollset_updater::handle_read_event() {
intptr_t
value
;
intptr_t
value
;
memcpy
(
&
value
,
buf_
.
data
()
+
1
,
sizeof
(
intptr_t
));
memcpy
(
&
value
,
buf_
.
data
()
+
1
,
sizeof
(
intptr_t
));
if
(
auto
ptr
=
parent_
.
lock
())
{
if
(
auto
ptr
=
parent_
.
lock
())
{
if
(
opcode
==
0
)
{
switch
(
opcode
)
{
ptr
->
register_reading
(
case
0
:
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
ptr
->
register_reading
(
}
else
if
(
opcode
==
1
)
{
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
ptr
->
register_writing
(
break
;
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
case
1
:
}
else
if
(
opcode
==
4
)
{
ptr
->
register_writing
(
ptr
->
unregister_manager
(
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
break
;
}
else
{
case
4
:
CAF_ASSERT
(
opcode
==
5
);
ptr
->
unregister_manager
(
ptr
->
shutdown
();
{
reinterpret_cast
<
socket_manager
*>
(
value
),
false
});
break
;
case
5
:
ptr
->
shutdown
();
break
;
default:
CAF_LOG_DEBUG
(
"opcode not recognized: "
<<
CAF_ARG
(
opcode
));
break
;
}
}
}
}
}
}
...
...
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