Commit 993ca79e authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Don't reembark h2 streams as http/1 requests

parent 5b849bfc
...@@ -362,7 +362,7 @@ SES_New(struct pool *pp) ...@@ -362,7 +362,7 @@ SES_New(struct pool *pp)
*/ */
int int
SES_Reschedule_Req(struct req *req) SES_Reschedule_Req(struct req *req, enum task_prio prio)
{ {
struct sess *sp; struct sess *sp;
struct pool *pp; struct pool *pp;
...@@ -372,10 +372,11 @@ SES_Reschedule_Req(struct req *req) ...@@ -372,10 +372,11 @@ SES_Reschedule_Req(struct req *req)
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
pp = sp->pool; pp = sp->pool;
CHECK_OBJ_NOTNULL(pp, POOL_MAGIC); CHECK_OBJ_NOTNULL(pp, POOL_MAGIC);
AN(TASK_QUEUE_CLIENT(prio));
AN(req->task.func); AN(req->task.func);
return (Pool_Task(pp, &req->task, TASK_QUEUE_REQ)); return (Pool_Task(pp, &req->task, prio));
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
......
...@@ -172,7 +172,7 @@ void SES_DestroyPool(struct pool *); ...@@ -172,7 +172,7 @@ void SES_DestroyPool(struct pool *);
void SES_Wait(struct sess *, const struct transport *); void SES_Wait(struct sess *, const struct transport *);
void SES_Ref(struct sess *sp); void SES_Ref(struct sess *sp);
void SES_Rel(struct sess *sp); void SES_Rel(struct sess *sp);
int SES_Reschedule_Req(struct req *); int SES_Reschedule_Req(struct req *, enum task_prio);
enum htc_status_e { enum htc_status_e {
HTC_S_JUNK = -5, HTC_S_JUNK = -5,
......
...@@ -188,7 +188,7 @@ http1_reembark(struct worker *wrk, struct req *req) ...@@ -188,7 +188,7 @@ http1_reembark(struct worker *wrk, struct req *req)
http1_setstate(sp, H1BUSY); http1_setstate(sp, H1BUSY);
if (!SES_Reschedule_Req(req)) if (!SES_Reschedule_Req(req, TASK_QUEUE_REQ))
return; return;
/* Couldn't schedule, ditch */ /* Couldn't schedule, ditch */
......
...@@ -357,7 +357,7 @@ h2_reembark(struct worker *wrk, struct req *req) ...@@ -357,7 +357,7 @@ h2_reembark(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL(sp, SESS_MAGIC); CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
assert(req->transport == &H2_transport); assert(req->transport == &H2_transport);
if (!SES_Reschedule_Req(req)) if (!SES_Reschedule_Req(req, TASK_QUEUE_STR))
return; return;
/* Couldn't schedule, ditch */ /* Couldn't schedule, ditch */
......
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