diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c index e67b09d..9a3b4e0 100644 --- a/modules/http2/h2_mplx.c +++ b/modules/http2/h2_mplx.c @@ -57,7 +57,7 @@ typedef struct { apr_size_t count; } stream_iter_ctx; -static apr_status_t mplx_be_happy(h2_mplx *m); +static apr_status_t mplx_be_happy(h2_mplx *m, h2_task *task); static apr_status_t mplx_be_annoyed(h2_mplx *m); apr_status_t h2_mplx_child_init(apr_pool_t *pool, server_rec *s) @@ -544,10 +544,10 @@ static apr_status_t out_open(h2_mplx *m, int stream_id, h2_bucket_beam *beam) stream->output = beam; if (APLOGctrace2(m->c)) { - h2_beam_log(beam, m->c, APLOG_TRACE2, "out_open"); + h2_beam_log(beam, stream->task->c, APLOG_TRACE2, "out_open"); } else { - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, status, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE1, status, stream->task->c, "h2_mplx(%s): out open", stream->task->id); } @@ -597,10 +597,10 @@ static apr_status_t out_close(h2_mplx *m, h2_task *task) return APR_ECONNABORTED; } - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, task->c, "h2_mplx(%s): close", task->id); status = h2_beam_close(task->output.beam); - h2_beam_log(task->output.beam, m->c, APLOG_TRACE2, "out_close"); + h2_beam_log(task->output.beam, task->c, APLOG_TRACE2, "out_close"); output_consumed_signal(m, task); check_data_for(m, stream, 0); return status; @@ -793,14 +793,14 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) /* this task was handed over to an engine for processing * and the original worker has finished. That means the * engine may start processing now. */ - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, task->c, "h2_mplx(%ld): task(%s) done (frozen)", m->id, task->id); h2_task_thaw(task); apr_thread_cond_broadcast(m->task_thawed); return; } - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, task->c, "h2_mplx(%ld): task(%s) done", m->id, task->id); out_close(m, task); @@ -820,7 +820,7 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) if (task->engine) { if (!m->aborted && !task->c->aborted && !h2_req_engine_is_shutdown(task->engine)) { - ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, m->c, APLOGNO(10022) + ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(10022) "h2_mplx(%ld): task(%s) has not-shutdown " "engine(%s)", m->id, task->id, h2_req_engine_get_id(task->engine)); @@ -830,12 +830,12 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) task->worker_done = 1; task->done_at = apr_time_now(); - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, task->c, "h2_mplx(%s): request done, %f ms elapsed", task->id, (task->done_at - task->started_at) / 1000.0); if (task->c && !task->c->aborted && task->started_at > m->last_mood_change) { - mplx_be_happy(m); + mplx_be_happy(m, task); } ap_assert(task->done_done == 0); @@ -848,13 +848,13 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) task->worker_done = 0; h2_task_redo(task); h2_iq_add(m->q, stream->id, NULL, NULL); - ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, task->c, H2_STRM_MSG(stream, "redo, added to q")); } else { /* stream not cleaned up, stay around */ task->done_done = 1; - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, task->c, H2_STRM_MSG(stream, "task_done, stream open")); if (stream->input) { h2_beam_leave(stream->input); @@ -867,7 +867,7 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) else if ((stream = h2_ihash_get(m->shold, task->stream_id)) != NULL) { /* stream is done, was just waiting for this. */ task->done_done = 1; - ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, task->c, H2_STRM_MSG(stream, "task_done, in hold")); if (stream->input) { h2_beam_leave(stream->input); @@ -875,12 +875,12 @@ static void task_done(h2_mplx *m, h2_task *task, h2_req_engine *ngn) stream_joined(m, stream); } else if ((stream = h2_ihash_get(m->spurge, task->stream_id)) != NULL) { - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, task->c, H2_STRM_LOG(APLOGNO(03517), stream, "already in spurge")); ap_assert("stream should not be in spurge" == NULL); } else { - ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03518) + ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, task->c, APLOGNO(03518) "h2_mplx(%s): task_done, stream not found", task->id); ap_assert("stream should still be available" == NULL); @@ -1005,7 +1005,7 @@ static apr_status_t unschedule_slow_tasks(h2_mplx *m) return rv; } -static apr_status_t mplx_be_happy(h2_mplx *m) +static apr_status_t mplx_be_happy(h2_mplx *m, h2_task *task) { apr_time_t now; @@ -1017,7 +1017,7 @@ static apr_status_t mplx_be_happy(h2_mplx *m) m->limit_active = H2MIN(m->limit_active * 2, m->max_active); m->last_mood_change = now; m->irritations_since = 0; - ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, m->c, + ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, task->c, "h2_mplx(%ld): mood update, increasing worker limit to %d", m->id, m->limit_active); }