[master] f299ae8 Mark frametypes which get charged to the session as overhead
Poul-Henning Kamp
phk at FreeBSD.org
Thu Apr 6 11:28:06 CEST 2017
commit f299ae887704bad396fdeaa878b5b7ebad23b1b1
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Apr 6 09:24:04 2017 +0000
Mark frametypes which get charged to the session as overhead
diff --git a/bin/varnishd/http2/cache_http2.h b/bin/varnishd/http2/cache_http2.h
index 0550e15..f04fb0b 100644
--- a/bin/varnishd/http2/cache_http2.h
+++ b/bin/varnishd/http2/cache_http2.h
@@ -74,6 +74,7 @@ struct h2_frame_s {
int respect_window;
h2_frame continuation;
uint8_t final_flags;
+ int overhead;
};
#define H2_FRAME(l,U,...) extern const struct h2_frame_s H2_F_##U[1];
diff --git a/include/tbl/h2_frames.h b/include/tbl/h2_frames.h
index 4089d9e..8259082 100644
--- a/include/tbl/h2_frames.h
+++ b/include/tbl/h2_frames.h
@@ -38,6 +38,7 @@
* tx_flow-control // rfc7540,l,1265,1270
* tx_continuation
* tx_final-flags
+ * overhead
*/
H2_FRAME(data, DATA, 0x0, 0x09,
H2CE_PROTOCOL_ERROR, // rfc7540,l,1758,1761
@@ -45,7 +46,8 @@
H2CE_PROTOCOL_ERROR,
1,
H2_F_DATA,
- 0x01 // rfc7540,l,1750,1753
+ 0x01, // rfc7540,l,1750,1753
+ 0
)
H2_FRAME(headers, HEADERS, 0x1, 0x2d,
H2CE_PROTOCOL_ERROR, // rfc7540,l,1876,1879
@@ -53,7 +55,8 @@
0, // rfc7540,l,938,940
0,
H2_F_CONTINUATION,
- 0x04 // rfc7540,l,1855,1857
+ 0x04, // rfc7540,l,1855,1857
+ 0
)
H2_FRAME(priority, PRIORITY, 0x2, 0x00,
H2CE_PROTOCOL_ERROR, // rfc7540,l,1933,1936
@@ -61,7 +64,8 @@
0, // rfc7540,l,938,940
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(rst_stream, RST_STREAM, 0x3, 0x00,
H2CE_PROTOCOL_ERROR, // rfc7540,l,1993,1996
@@ -69,7 +73,8 @@
H2CE_PROTOCOL_ERROR,
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(settings, SETTINGS, 0x4, 0x01,
0,
@@ -77,7 +82,8 @@
H2CE_PROTOCOL_ERROR,
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(push_promise, PUSH_PROMISE, 0x5, 0x0c,
H2CE_PROTOCOL_ERROR, // rfc7540,l,2262,2263
@@ -85,7 +91,8 @@
H2CE_PROTOCOL_ERROR,
0,
H2_F_CONTINUATION,
- 0x04 // rfc7540,l,2249,2251
+ 0x04, // rfc7540,l,2249,2251
+ 2
)
H2_FRAME(ping, PING, 0x6, 0x01,
0,
@@ -93,7 +100,8 @@
H2CE_PROTOCOL_ERROR,
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(goaway, GOAWAY, 0x7, 0x00,
0,
@@ -101,7 +109,8 @@
H2CE_PROTOCOL_ERROR,
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(window_update, WINDOW_UPDATE, 0x8, 0x00,
0,
@@ -109,7 +118,8 @@
H2CE_PROTOCOL_ERROR,
0,
0,
- 0
+ 0,
+ 1
)
H2_FRAME(continuation, CONTINUATION, 0x9, 0x04,
H2CE_PROTOCOL_ERROR, // rfc7540,l,2764,2767
@@ -117,7 +127,8 @@
H2CE_PROTOCOL_ERROR,
0,
H2_F_CONTINUATION,
- 0x04 // rfc7540,l,2753,2754
+ 0x04, // rfc7540,l,2753,2754
+ 0
)
#undef H2_FRAME
#endif
More information about the varnish-commit
mailing list