Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
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
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
Libraries
pistache
Commits
4dd9f900
Commit
4dd9f900
authored
Feb 09, 2016
by
octal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OnHoldWrite -> WriteEntry
parent
a45d7557
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
include/transport.h
include/transport.h
+6
-6
src/common/transport.cc
src/common/transport.cc
+2
-2
No files found.
include/transport.h
View file @
4dd9f900
...
...
@@ -39,7 +39,7 @@ public:
return
Async
::
Promise
<
ssize_t
>
([
=
](
Async
::
Resolver
&
resolve
,
Async
::
Rejection
&
reject
)
{
BufferHolder
holder
(
buffer
);
auto
detached
=
holder
.
detach
();
OnHoldWrite
write
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
detached
,
flags
);
WriteEntry
write
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
detached
,
flags
);
write
.
peerFd
=
fd
;
auto
*
e
=
writesQueue
.
allocEntry
(
std
::
move
(
write
));
writesQueue
.
push
(
e
);
...
...
@@ -149,8 +149,8 @@ private:
Type
type
;
};
struct
OnHoldWrite
{
OnHoldWrite
(
Async
::
Resolver
resolve
,
Async
::
Rejection
reject
,
struct
WriteEntry
{
WriteEntry
(
Async
::
Resolver
resolve
,
Async
::
Rejection
reject
,
BufferHolder
buffer
,
int
flags
=
0
)
:
resolve
(
std
::
move
(
resolve
))
,
reject
(
std
::
move
(
reject
))
...
...
@@ -214,8 +214,8 @@ private:
yet and some writes are still on-hold, writes should queue-up so that when the
fd becomes ready again, we can write everything
*/
PollableQueue
<
OnHoldWrite
>
writesQueue
;
std
::
unordered_map
<
Fd
,
OnHoldWrite
>
toWrite
;
PollableQueue
<
WriteEntry
>
writesQueue
;
std
::
unordered_map
<
Fd
,
WriteEntry
>
toWrite
;
PollableQueue
<
TimerEntry
>
timersQueue
;
std
::
unordered_map
<
Fd
,
TimerEntry
>
timers
;
...
...
@@ -243,7 +243,7 @@ private:
void
armTimerMsImpl
(
TimerEntry
entry
);
void
asyncWriteImpl
(
Fd
fd
,
OnHoldWrite
&
entry
,
WriteStatus
status
=
FirstTry
);
void
asyncWriteImpl
(
Fd
fd
,
WriteEntry
&
entry
,
WriteStatus
status
=
FirstTry
);
void
asyncWriteImpl
(
Fd
fd
,
int
flags
,
const
BufferHolder
&
buffer
,
Async
::
Resolver
resolve
,
Async
::
Rejection
reject
,
...
...
src/common/transport.cc
View file @
4dd9f900
...
...
@@ -163,7 +163,7 @@ Transport::handlePeerDisconnection(const std::shared_ptr<Peer>& peer) {
}
void
Transport
::
asyncWriteImpl
(
Fd
fd
,
Transport
::
OnHoldWrite
&
entry
,
WriteStatus
status
)
{
Transport
::
asyncWriteImpl
(
Fd
fd
,
Transport
::
WriteEntry
&
entry
,
WriteStatus
status
)
{
asyncWriteImpl
(
fd
,
entry
.
flags
,
entry
.
buffer
,
std
::
move
(
entry
.
resolve
),
std
::
move
(
entry
.
reject
),
status
);
}
...
...
@@ -200,7 +200,7 @@ Transport::asyncWriteImpl(
if
(
status
==
FirstTry
)
{
toWrite
.
insert
(
std
::
make_pair
(
fd
,
OnHoldWrite
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
buffer
.
detach
(
totalWritten
),
flags
)));
WriteEntry
(
std
::
move
(
resolve
),
std
::
move
(
reject
),
buffer
.
detach
(
totalWritten
),
flags
)));
}
io
()
->
modifyFd
(
fd
,
NotifyOn
::
Read
|
NotifyOn
::
Write
,
Polling
::
Mode
::
Edge
);
}
...
...
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