Commit 4dd9f900 authored by octal's avatar octal

OnHoldWrite -> WriteEntry

parent a45d7557
...@@ -39,7 +39,7 @@ public: ...@@ -39,7 +39,7 @@ public:
return Async::Promise<ssize_t>([=](Async::Resolver& resolve, Async::Rejection& reject) { return Async::Promise<ssize_t>([=](Async::Resolver& resolve, Async::Rejection& reject) {
BufferHolder holder(buffer); BufferHolder holder(buffer);
auto detached = holder.detach(); 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; write.peerFd = fd;
auto *e = writesQueue.allocEntry(std::move(write)); auto *e = writesQueue.allocEntry(std::move(write));
writesQueue.push(e); writesQueue.push(e);
...@@ -149,8 +149,8 @@ private: ...@@ -149,8 +149,8 @@ private:
Type type; Type type;
}; };
struct OnHoldWrite { struct WriteEntry {
OnHoldWrite(Async::Resolver resolve, Async::Rejection reject, WriteEntry(Async::Resolver resolve, Async::Rejection reject,
BufferHolder buffer, int flags = 0) BufferHolder buffer, int flags = 0)
: resolve(std::move(resolve)) : resolve(std::move(resolve))
, reject(std::move(reject)) , reject(std::move(reject))
...@@ -214,8 +214,8 @@ private: ...@@ -214,8 +214,8 @@ private:
yet and some writes are still on-hold, writes should queue-up so that when the yet and some writes are still on-hold, writes should queue-up so that when the
fd becomes ready again, we can write everything fd becomes ready again, we can write everything
*/ */
PollableQueue<OnHoldWrite> writesQueue; PollableQueue<WriteEntry> writesQueue;
std::unordered_map<Fd, OnHoldWrite> toWrite; std::unordered_map<Fd, WriteEntry> toWrite;
PollableQueue<TimerEntry> timersQueue; PollableQueue<TimerEntry> timersQueue;
std::unordered_map<Fd, TimerEntry> timers; std::unordered_map<Fd, TimerEntry> timers;
...@@ -243,7 +243,7 @@ private: ...@@ -243,7 +243,7 @@ private:
void armTimerMsImpl(TimerEntry entry); void armTimerMsImpl(TimerEntry entry);
void asyncWriteImpl(Fd fd, OnHoldWrite& entry, WriteStatus status = FirstTry); void asyncWriteImpl(Fd fd, WriteEntry& entry, WriteStatus status = FirstTry);
void asyncWriteImpl( void asyncWriteImpl(
Fd fd, int flags, const BufferHolder& buffer, Fd fd, int flags, const BufferHolder& buffer,
Async::Resolver resolve, Async::Rejection reject, Async::Resolver resolve, Async::Rejection reject,
......
...@@ -163,7 +163,7 @@ Transport::handlePeerDisconnection(const std::shared_ptr<Peer>& peer) { ...@@ -163,7 +163,7 @@ Transport::handlePeerDisconnection(const std::shared_ptr<Peer>& peer) {
} }
void 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); asyncWriteImpl(fd, entry.flags, entry.buffer, std::move(entry.resolve), std::move(entry.reject), status);
} }
...@@ -200,7 +200,7 @@ Transport::asyncWriteImpl( ...@@ -200,7 +200,7 @@ Transport::asyncWriteImpl(
if (status == FirstTry) { if (status == FirstTry) {
toWrite.insert( toWrite.insert(
std::make_pair(fd, 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); io()->modifyFd(fd, NotifyOn::Read | NotifyOn::Write, Polling::Mode::Edge);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment