cache_req

From phk at FreeBSD.org Thu Sep 1 07:34:11 2016 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Thu, 01 Sep 2016 09:34:11 +0200 Subject: [master] f9eec3b Respect remote MAX_FRAME_SIZE Message-ID: commit f9eec3b3cb52ba6a31ba13f95cd1fb7f1c4f0dd5 Author: Poul-Henning Kamp Date: Thu Sep 1 07:33:17 2016 +0000 Respect remote MAX_FRAME_SIZE diff --git a/bin/varnishd/http2/cache_http2.h b/bin/varnishd/http2/cache_http2.h index 1378ef8..3bf1fdc 100644 --- a/bin/varnishd/http2/cache_http2.h +++ b/bin/varnishd/http2/cache_http2.h @@ -50,7 +50,12 @@ enum h2_stream_e { #define H2_FRAME_FLAGS(l,u,v) extern const uint8_t H2FF_##u; #include "tbl/h2_frames.h" -#define H2_SETTINGS_N 7 +enum h2setting { +#define H2_SETTINGS(n,v,d) H2S_##n = v, +#include "tbl/h2_settings.h" +#undef H2_SETTINGS + H2_SETTINGS_N +}; struct h2_req { unsigned magic; diff --git a/bin/varnishd/http2/cache_http2_deliver.c b/bin/varnishd/http2/cache_http2_deliver.c index 14b3d8a..f205e23 100644 --- a/bin/varnishd/http2/cache_http2_deliver.c +++ b/bin/varnishd/http2/cache_http2_deliver.c @@ -44,7 +44,6 @@ #include "../cache/cache_filter.h" #include "../cache/cache_transport.h" -#include "../http1/cache_http1.h" #include "../http2/cache_http2.h" #include "vct.h" diff --git a/bin/varnishd/http2/cache_http2_panic.c b/bin/varnishd/http2/cache_http2_panic.c index 085c5c4..0605862 100644 --- a/bin/varnishd/http2/cache_http2_panic.c +++ b/bin/varnishd/http2/cache_http2_panic.c @@ -47,8 +47,6 @@ #include "vend.h" #include "vsb.h" -#include "vtcp.h" -#include "vtim.h" void h2_sess_panic(struct vsb *vsb, const struct sess *sp) diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c index e013b6d..4175367 100644 --- a/bin/varnishd/http2/cache_http2_proto.c +++ b/bin/varnishd/http2/cache_http2_proto.c @@ -55,12 +55,6 @@ enum h2frame { #include "tbl/h2_frames.h" }; -enum h2setting { -#define H2_SETTINGS(n,v,d) H2S_##n = v, -#include "tbl/h2_settings.h" -#undef H2_SETTINGS -}; - static const char * h2_framename(enum h2frame h2f) { diff --git a/bin/varnishd/http2/cache_http2_send.c b/bin/varnishd/http2/cache_http2_send.c index 70f48bf..0ea2690 100644 --- a/bin/varnishd/http2/cache_http2_send.c +++ b/bin/varnishd/http2/cache_http2_send.c @@ -100,15 +100,36 @@ H2_Send(struct worker *wrk, struct h2_req *r2, int flush, { int retval; struct h2_sess *h2; + uint32_t mfs, tf; + const char *p; (void)flush; + AN(ptr); CHECK_OBJ_NOTNULL(r2, H2_REQ_MAGIC); h2 = r2->h2sess; CHECK_OBJ_NOTNULL(h2, H2_SESS_MAGIC); Lck_Lock(&h2->sess->mtx); - retval = H2_Send_Frame(wrk, h2, type, flags, len, r2->stream, ptr); + mfs = h2->their_settings[H2S_MAX_FRAME_SIZE]; + if (len < mfs) { + retval = H2_Send_Frame(wrk, h2, + type, flags, len, r2->stream, ptr); + } else if (type == H2_FRAME_DATA) { + p = ptr; + do { + tf = mfs; + if (tf > len) + tf = len; + retval = H2_Send_Frame(wrk, h2, type, + tf == len ? flags : 0, + tf, r2->stream, p); + p += tf; + len -= tf; + } while (len > 0); + } else { + INCOMPL(); + } Lck_Unlock(&h2->sess->mtx); return (retval); } From phk at FreeBSD.org Thu Sep 1 10:05:11 2016 From: phk at FreeBSD.org (Poul-Henning Kamp) Date: Thu, 01 Sep 2016 12:05:11 +0200 Subject: [master] b2eb0a4 Flush our own random generator, not libcs. Message-ID: commit b2eb0a4d36de1d0b345c559b03a20c331082a8e0 Author: Poul-Henning Kamp Date: Thu Sep 1 10:04:24 2016 +0000 Flush our own random generator, not libcs. diff --git a/bin/varnishtest/tests/d00004.vtc b/bin/varnishtest/tests/d00004.vtc index 32506c4..5b9037d 100644 --- a/bin/varnishtest/tests/d00004.vtc +++ b/bin/varnishtest/tests/d00004.vtc @@ -3,6 +3,8 @@ varnishtest "Deeper test of random director" server s1 { rxreq txresp -body "1" + rxreq + txresp -body "1" } -start server s2 { @@ -10,10 +12,6 @@ server s2 { txresp -body "22" rxreq txresp -body "22" - rxreq - txresp -body "22" - rxreq - txresp -body "22" } -start server s3 { @@ -30,6 +28,8 @@ server s3 { server s4 { rxreq txresp -body "4444" + rxreq + txresp -body "4444" } -start varnish v1 -vcl+backend { @@ -57,19 +57,19 @@ varnish v1 -cliok "debug.srandom" client c1 { txreq rxresp - expect resp.bodylen == 2 + expect resp.bodylen == 3 txreq rxresp - expect resp.bodylen == 2 + expect resp.bodylen == 4 txreq rxresp expect resp.bodylen == 1 txreq rxresp - expect resp.bodylen == 2 + expect resp.bodylen == 1 txreq rxresp - expect resp.bodylen == 3 + expect resp.bodylen == 2 txreq rxresp expect resp.bodylen == 2 diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc index 0f5ade5..e0bc560 100644 --- a/bin/varnishtest/tests/m00002.vtc +++ b/bin/varnishtest/tests/m00002.vtc @@ -21,8 +21,8 @@ varnish v1 -cliok "debug.srandom" client c1 { txreq rxresp - expect resp.http.rnd1 == 0.256 - expect resp.http.rnd2 == 1.643 - expect resp.http.rnd3 == 9.011 - expect resp.http.rnd4 == 99.654 + expect resp.http.rnd1 == 0.656 + expect resp.http.rnd2 == 0.390 + expect resp.http.rnd3 == 8.585 + expect resp.http.rnd4 == 99.636 } -run diff --git a/lib/libvarnish/vrnd.c b/lib/libvarnish/vrnd.c index c55d73e..d586b08 100644 --- a/lib/libvarnish/vrnd.c +++ b/lib/libvarnish/vrnd.c @@ -106,7 +106,7 @@ VRND_SeedTestable(unsigned int x) rptr = &state[0]; lim = 10 * rand_deg; for (i = 0; i < lim; i++) - (void)random(); + (void)VRND_RandomTestable(); } long From document at varnish-cache.org Thu Sep 1 11:53:51 2016 From: document at varnish-cache.org (document at varnish-cache.org) Date: Thu, 01 Sep 2016 17:23:51 +0530 Subject: Please find attached invoice no: 83081085 Message-ID: <7120-526ee8-9b7844-78ac-42D23@varnish-cache.org> Attached is a Print Manager form. Format = Portable Document Format File (PDF) ________________________________ Disclaimer This email/fax transmission is confidential and intended solely for the person or organisation to whom it is addressed. If you are not the intended recipient, you must not copy, distribute or disseminate the information, or take any action in reliance of it. Any views expressed in this message are those of the individual sender, except where the sender specifically states them to be the views of any organisation or employer. If you have received this message in error, do not open any attachment but please notify the sender (above) deleting this message from your system. For email transmissions please rely on your own virus check no responsibility is taken by the sender for any damage rising out of any bug or virus infection. -------------- next part -------------- A non-text attachment was scrubbed... Name: 5f11.zip Type: application/zip Size: 8368 bytes Desc: not available URL: From dridi.boukelmoune at gmail.com Thu Sep 1 17:04:10 2016 From: dridi.boukelmoune at gmail.com (Dridi Boukelmoune) Date: Thu, 01 Sep 2016 19:04:10 +0200 Subject: [master] 2d98cc5 Add VCL labels to the request state machine Message-ID: commit 2d98cc5f29a82d7651b3680f4608dbf8e4747307 Author: Dridi Boukelmoune Date: Thu Sep 1 18:54:31 2016 +0200 Add VCL labels to the request state machine diff --git a/doc/graphviz/cache_req_fsm.dot b/doc/graphviz/cache_req_fsm.dot index 183d603..a9bc854 100644 --- a/doc/graphviz/cache_req_fsm.dot +++ b/doc/graphviz/cache_req_fsm.dot @@ -47,16 +47,16 @@ digraph cache_req_fsm { fini:ok -> ok */ - acceptor [ - shape=hexagon - label="Request received" - ] - ESI_REQ [ shape=hexagon ] + acceptor [shape=hexagon label="Request received"] + label_select [shape=hexagon label="Label selected"] + ESI_REQ [shape=hexagon label="ESI request"] RESTART [shape=plaintext] ESI_REQ -> recv SYNTH [shape=plaintext] + LABEL [shape=plaintext] acceptor -> recv [style=bold] + label_select -> recv [style=bold] subgraph xcluster_deliver { /* cnt_deliver() */ @@ -187,7 +187,7 @@ digraph cache_req_fsm { subgraph xcluster_recv { recv [ shape=record - label="{cnt_recv:|{vcl_recv\{\}|req.*}|{hash|purge|pass|pipe|synth}}" + label="{cnt_recv:|{vcl_recv\{\}|req.*}|{hash|purge|pass|pipe|synth|vcl}}" ] recv:hash -> hash [style=bold,color=green] hash [ @@ -204,6 +204,9 @@ digraph cache_req_fsm { recv:purge:s -> hash [style=bold,color=purple] + recv:vcl:s -> vcl_label + vcl_label [label="LABEL",shape=plaintext] + /* cnt_purge */ subgraph xcluster_purge { purge [ @@ -211,4 +214,4 @@ digraph cache_req_fsm { label="{cnt_purge:|{vcl_purge\{\}|req.*}|{synth|restart}}" ] } -} \ No newline at end of file +} diff --git a/doc/graphviz/cache_req_fsm.svg b/doc/graphviz/cache_req_fsm.svg index 21828c8..26d4564 100644 --- a/doc/graphviz/cache_req_fsm.svg +++ b/doc/graphviz/cache_req_fsm.svg @@ -4,445 +4,470 @@ -