Optimize getSendBuffer for large sends

This commit is contained in:
Alex Hultman
2021-09-19 01:19:29 +00:00
parent 6617e7bd5c
commit 069e66b31c
4 changed files with 39 additions and 36 deletions
+3 -3
View File
@@ -19,10 +19,10 @@ int main() {
.passphrase = "1234"
}).ws<PerSocketData>("/*", {
/* Settings */
.compression = uWS::SHARED_COMPRESSOR,
.maxPayloadLength = 16 * 1024 * 1024,
.compression = uWS::DEDICATED_COMPRESSOR_4KB,
.maxPayloadLength = 100 * 1024 * 1024,
.idleTimeout = 16,
.maxBackpressure = 1 * 1024 * 1024,
.maxBackpressure = 100 * 1024 * 1024,
.closeOnBackpressureLimit = false,
.resetIdleTimeoutOnSend = false,
.sendPingsAutomatically = true,
+25 -8
View File
@@ -34,6 +34,12 @@
namespace uWS {
enum SendBufferAttribute {
NEEDS_NOTHING,
NEEDS_DRAIN,
NEEDS_UNCORK
};
template <bool, bool, typename> struct WebSocketContext;
template <bool SSL>
@@ -102,16 +108,27 @@ protected:
}
/* Returns a suitable buffer for temporary assemblation of send data */
std::pair<char *, bool> getSendBuffer(size_t size) {
/* If we are corked and we have room, return the cork buffer itself */
std::pair<char *, SendBufferAttribute> getSendBuffer(size_t size) {
/* First step is to determine if we already have backpressure or not */
LoopData *loopData = getLoopData();
if (loopData->corkedSocket == this && loopData->corkOffset + size < LoopData::CORK_BUFFER_SIZE) {
char *sendBuffer = loopData->corkBuffer + loopData->corkOffset;
loopData->corkOffset += (unsigned int) size;
return {sendBuffer, false};
BackPressure &backPressure = getAsyncSocketData()->buffer;
size_t existingBackpressure = backPressure.length();
if ((!existingBackpressure) && (isCorked() || canCork()) && (loopData->corkOffset + size < LoopData::CORK_BUFFER_SIZE)) {
/* Cork automatically if we can */
if (isCorked()) {
char *sendBuffer = loopData->corkBuffer + loopData->corkOffset;
loopData->corkOffset += (unsigned int) size;
return {sendBuffer, SendBufferAttribute::NEEDS_NOTHING};
} else {
cork();
char *sendBuffer = loopData->corkBuffer + loopData->corkOffset;
loopData->corkOffset += (unsigned int) size;
return {sendBuffer, SendBufferAttribute::NEEDS_UNCORK};
}
} else {
/* Slow path for now, we want to always be corked if possible */
return {(char *) malloc(size), true};
/* Fallback is to use the backpressure as buffer */
backPressure.resize(existingBackpressure + size);
return {(char *) backPressure.data() + existingBackpressure, SendBufferAttribute::NEEDS_DRAIN};
}
}
+3
View File
@@ -50,6 +50,9 @@ struct BackPressure {
void reserve(size_t length) {
buffer.reserve(length + pendingRemoval);
}
void resize(size_t length) {
buffer.resize(length + pendingRemoval);
}
const char *data() {
return buffer.data() + pendingRemoval;
}
+8 -25
View File
@@ -107,38 +107,21 @@ public:
}
}
/* Check to see if we can cork for the user */
bool automaticallyCorked = false;
if (!Super::isCorked() && Super::canCork()) {
automaticallyCorked = true;
Super::cork();
}
/* Get size, alloate size, write if needed */
/* Get size, allocate size, write if needed */
size_t messageFrameSize = protocol::messageFrameSize(message.length());
auto [sendBuffer, requiresWrite] = Super::getSendBuffer(messageFrameSize);
auto [sendBuffer, sendBufferAttribute] = Super::getSendBuffer(messageFrameSize);
protocol::formatMessage<isServer>(sendBuffer, message.data(), message.length(), opCode, message.length(), compress);
/* This is the slow path, when we couldn't cork for the user */
if (requiresWrite) {
/* We tried corking for the user but in the end we did not even fit in the cork buffer */
if (automaticallyCorked) {
Super::uncork();
automaticallyCorked = false;
}
auto[written, failed] = Super::write(sendBuffer, (int) messageFrameSize);
/* For now, we are slow here */
free(sendBuffer);
/* Depending on size of message we have different paths */
if (sendBufferAttribute == SendBufferAttribute::NEEDS_DRAIN) {
/* This is a drain */
auto[written, failed] = Super::write(nullptr, 0);
if (failed) {
/* Return false for failure, skipping to reset the timeout below */
return BACKPRESSURE;
}
}
/* Uncork here if we automatically corked for the user */
if (automaticallyCorked) {
} else if (sendBufferAttribute == SendBufferAttribute::NEEDS_UNCORK) {
/* Uncork if we came here uncorked */
auto [written, failed] = Super::uncork();
if (failed) {
return BACKPRESSURE;