Commit 27f24b57 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fix the dot graph of the request fsm

parent 1226479c
...@@ -767,7 +767,7 @@ void VBO_Free(struct busyobj **vbo); ...@@ -767,7 +767,7 @@ void VBO_Free(struct busyobj **vbo);
/* cache_http1_fsm.c [HTTP1] */ /* cache_http1_fsm.c [HTTP1] */
void HTTP1_Session(struct worker *, struct req *); void HTTP1_Session(struct worker *, struct req *);
/* cache_req_fsm.c [FSM] */ /* cache_req_fsm.c [CNT] */
int CNT_Request(struct worker *, struct req *); int CNT_Request(struct worker *, struct req *);
void CNT_Init(void); void CNT_Init(void);
......
...@@ -26,13 +26,8 @@ ...@@ -26,13 +26,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* This file contains the two central state machine for pushing * This file contains the two central state machine for pushing HTTP
* sessions and requests. * requests through their paces.
*
* The first part of the file, entrypoint CNT_Session() and down to
* the ==== separator, is concerned with sessions. When a session has
* a request to deal with, it calls into the second half of the file.
* This part is for all practical purposes HTTP/1.x specific.
* *
* The second part of the file, entrypoint CNT_Request() and below the * The second part of the file, entrypoint CNT_Request() and below the
* ==== separator, is intended to (over time) be(ome) protocol agnostic. * ==== separator, is intended to (over time) be(ome) protocol agnostic.
...@@ -46,7 +41,7 @@ ...@@ -46,7 +41,7 @@
* a dot(1) graph in the source code comments. So to see the big picture, * a dot(1) graph in the source code comments. So to see the big picture,
* extract the DOT lines and run though dot(1), for instance with the * extract the DOT lines and run though dot(1), for instance with the
* command: * command:
* sed -n '/^DOT/s///p' cache/cache_center.c | dot -Tps > /tmp/_.ps * sed -n '/^DOT/s///p' cache/cache_req_fsm.c | dot -Tps > /tmp/_.ps
*/ */
/* /*
...@@ -61,7 +56,7 @@ DOT label="Request received" ...@@ -61,7 +56,7 @@ DOT label="Request received"
DOT ] DOT ]
DOT ERROR [shape=plaintext] DOT ERROR [shape=plaintext]
DOT RESTART [shape=plaintext] DOT RESTART [shape=plaintext]
DOT acceptor -> first [style=bold,color=green] DOT acceptor -> start [style=bold,color=green]
*/ */
#include "config.h" #include "config.h"
...@@ -1284,7 +1279,7 @@ CNT_Request(struct worker *wrk, struct req *req) ...@@ -1284,7 +1279,7 @@ CNT_Request(struct worker *wrk, struct req *req)
assert( assert(
req->req_step == R_STP_LOOKUP || req->req_step == R_STP_LOOKUP ||
req->req_step == R_STP_START || req->req_step == R_STP_START ||
req->req_step == R_STP_RECV); req->req_step == R_STP_RECV); // from ESI
req->wrk = wrk; req->wrk = wrk;
......
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