Skip to content

cleanup: Remove CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX #11289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maskit merged 2 commits into from
Apr 30, 2024
Merged

cleanup: Remove CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX #11289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
455ab90
cleanup: Remove CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX
maskit Apr 25, 2024
83fbb7a
Merge branch 'master' into cleanup_first_read_buf_size
maskit Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/proxy/http/HttpSM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

// The default size for http header buffers when we don't
// need to include extra space for the document
static size_t const HTTP_HEADER_BUFFER_SIZE_INDEX = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
static size_t const HTTP_HEADER_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_4K;

// We want to use a larger buffer size when reading response
// headers from the origin server since we want to get
Expand Down
2 changes: 1 addition & 1 deletion include/proxy/http2/Http2CommonSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ enum class Http2SsnMilestone {
LAST_ENTRY,
};

size_t const HTTP2_HEADER_BUFFER_SIZE_INDEX = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
size_t const HTTP2_HEADER_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_4K;

/**
@startuml
Expand Down
2 changes: 1 addition & 1 deletion include/proxy/http2/Http2Stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class Http2Stream : public ProxyTransaction
int64_t _http_sm_id = -1;

HTTPHdr _receive_header;
MIOBuffer _receive_buffer = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
MIOBuffer _receive_buffer = BUFFER_SIZE_INDEX_4K;
VIO read_vio;
VIO write_vio;

Expand Down
2 changes: 1 addition & 1 deletion include/proxy/http3/Http3Transaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class HQTransaction : public ProxyTransaction

EThread *_thread = nullptr;

MIOBuffer _read_vio_buf = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
MIOBuffer _read_vio_buf = BUFFER_SIZE_INDEX_4K;
QUICStreamVCAdapter::IOInfo &_info;

size_t _sent_bytes = 0;
Expand Down
4 changes: 0 additions & 4 deletions src/iocore/net/P_Net.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,3 @@ static constexpr ts::ModuleVersion NET_SYSTEM_MODULE_INTERNAL_VERSION(NET_SYSTEM
#else
#define NetDbg(dbg_ctl, fmt, ...) Dbg(dbg_ctl, fmt, ##__VA_ARGS__)
#endif

/// Default amount of buffer space to use for the initial read on an incoming connection.
/// This is an IOBufferBlock index, not the size in bytes.
static size_t const CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX = BUFFER_SIZE_INDEX_4K;
2 changes: 1 addition & 1 deletion src/proxy/ProtocolProbeSessionAccept.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ proto_is_http2(IOBufferReader *reader)

struct ProtocolProbeTrampoline : public Continuation, public ProtocolProbeSessionAcceptEnums {
static const size_t minimum_read_size = 1;
static const unsigned buffer_size_index = CLIENT_CONNECTION_FIRST_READ_BUFFER_SIZE_INDEX;
static const unsigned buffer_size_index = BUFFER_SIZE_INDEX_4K;
IOBufferReader *reader;

explicit ProtocolProbeTrampoline(const ProtocolProbeSessionAccept *probe, Ptr<ProxyMutex> &mutex, MIOBuffer *buffer,
Expand Down