Commit 10766c4d authored by Eric Covener's avatar Eric Covener
Browse files

Merge r1749693 from trunk: 

assign IDs to new AH*'s



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1749694 13f79535-47bb-0310-9956-ffa450edef68
parent 4b6199c9

modules/http2/h2_conn_io.c

+6 −6
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void append_scratch(h2_conn_io *io) 
                                               io->c->bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(io->output, b);

#if LOG_SCRATCH

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03386)

                      "h2_conn_io(%ld): append_scratch(%ld)", 

                      io->c->id, (long)io->slen);

#endif
@@ -223,7 +223,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b) 
        }

        status = apr_file_read(fd, io->scratch + io->slen, &len);

#if LOG_SCRATCH

        ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c, APLOGNO(03387)

                      "h2_conn_io(%ld): FILE_to_scratch(%ld)", 

                      io->c->id, (long)len); 

#endif
@@ -236,7 +236,7 @@ static apr_status_t read_to_scratch(h2_conn_io *io, apr_bucket *b) 
        status = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);

        if (status == APR_SUCCESS) {

#if LOG_SCRATCH

            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),

            ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03388)

                          "h2_conn_io(%ld): read_to_scratch(%ld)", 

                          io->c->id, (long)b->length); 

#endif
@@ -333,7 +333,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length) 
            remain = assure_scratch_space(io);

            if (remain >= length) {

#if LOG_SCRATCH

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03389)

                              "h2_conn_io(%ld): write_to_scratch(%ld)", 

                              io->c->id, (long)length); 

#endif
@@ -343,7 +343,7 @@ apr_status_t h2_conn_io_write(h2_conn_io *io, const char *data, size_t length) 
            }

            else {

#if LOG_SCRATCH

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),

                ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03390)

                              "h2_conn_io(%ld): write_to_scratch(%ld)", 

                              io->c->id, (long)remain); 

#endif
@@ -385,7 +385,7 @@ apr_status_t h2_conn_io_pass(h2_conn_io *io, apr_bucket_brigade *bb) 
                    APR_BUCKET_REMOVE(b);

                    APR_BRIGADE_INSERT_TAIL(io->output, b);

#if LOG_SCRATCH

                    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),

                    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(03391)

                                  "h2_conn_io(%ld): pass bucket(%ld)", 

                                  io->c->id, (long)b->length);

#endif

modules/http2/h2_mplx.c

+2 −2
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int task_print(void *ctx, void *val) 
                      task->worker_done);

    }

    else if (task) {

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */

        ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(03392) /* NO APLOGNO */

                      "->03198: h2_stream(%ld-%d): NULL", m->id, task->stream_id);

    }

    else {
@@ -739,7 +739,7 @@ static apr_status_t out_close(h2_mplx *m, h2_task *task) 
        h2_response *r = h2_response_die(task->stream_id, 500, 

                                         task->request, m->pool);

        status = out_open(m, task->stream_id, r);

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c, APLOGNO(03393)

                      "h2_mplx(%s): close, no response, no rst", task->id);

    }

    ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, m->c,

modules/http2/h2_ngn_shed.c

+7 −7
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ h2_ngn_shed *h2_ngn_shed_get_shed(h2_req_engine *ngn) 


void h2_ngn_shed_abort(h2_ngn_shed *shed)

{

    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),

    ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(03394)

                  "h2_ngn_shed(%ld): abort", shed->c->id);

    shed->aborted = 1;

}
@@ -204,7 +204,7 @@ apr_status_t h2_ngn_shed_push_task(h2_ngn_shed *shed, const char *ngn_type, 
        status = einit(newngn, newngn->id, newngn->type, newngn->pool,

                       shed->req_buffer_size, task->r, 

                       &newngn->out_consumed, &newngn->out_consumed_ctx);

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(03395)

                      "h2_ngn_shed(%ld): create engine %s (%s)", 

                      shed->c->id, newngn->id, newngn->type);

        if (status == APR_SUCCESS) {
@@ -247,11 +247,11 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed, 
    

    AP_DEBUG_ASSERT(ngn);

    *ptask = NULL;

    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),

    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(03396)

                  "h2_ngn_shed(%ld): pull task for engine %s, shutdown=%d", 

                  shed->c->id, ngn->id, want_shutdown);

    if (shed->aborted) {

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(03397)

                      "h2_ngn_shed(%ld): abort while pulling requests %s", 

                      shed->c->id, ngn->id);

        ngn->shutdown = 1;
@@ -270,7 +270,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed, 
    }

    

    if ((entry = pop_detached(ngn))) {

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c, APLOGNO(03398)

                      "h2_ngn_shed(%ld): pulled request %s for engine %s", 

                      shed->c->id, entry->task->id, ngn->id);

        ngn->no_live++;
@@ -293,7 +293,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed, 
    

    if (1) {

        h2_ngn_entry *entry = H2_REQ_ENTRIES_FIRST(&ngn->entries);

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(03399)

                      "h2_ngn_shed(%ld): pull task, nothing, first task %s", 

                      shed->c->id, entry->task->id);

    }
@@ -303,7 +303,7 @@ apr_status_t h2_ngn_shed_pull_task(h2_ngn_shed *shed, 
static apr_status_t ngn_done_task(h2_ngn_shed *shed, h2_req_engine *ngn, 

                                  h2_task *task, int waslive, int aborted)

{

    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),

    ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(03400)

                  "h2_ngn_shed(%ld): task %s %s by %s", 

                  shed->c->id, task->id, aborted? "aborted":"done", ngn->id);

    ngn->no_finished++;

modules/http2/h2_session.c

+4 −4
Original line number Diff line number Diff line
@@ -1785,7 +1785,7 @@ static void h2_session_ev_conn_error(h2_session *session, int arg, const char *m 
            break;

        

        default:

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03401)

                          "h2_session(%ld): conn error -> shutdown", session->id);

            h2_session_shutdown(session, arg, msg, 0);

            break;
@@ -1802,7 +1802,7 @@ static void h2_session_ev_proto_error(h2_session *session, int arg, const char * 
            break;

        

        default:

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),

            ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(03402)

                          "h2_session(%ld): proto error -> shutdown", session->id);

            h2_session_shutdown(session, arg, msg, 0);

            break;
@@ -2122,7 +2122,7 @@ apr_status_t h2_session_process(h2_session *session, int async) 
                    }

                    else {

                        ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, c,

				      APLOGNO(),

				      APLOGNO(03403)

                                      "h2_session(%ld): idle, no data, error", 

                                      session->id);

                        dispatch_event(session, H2_SESSION_EV_CONN_ERROR, 0, "timeout");
@@ -2289,7 +2289,7 @@ apr_status_t h2_session_process(h2_session *session, int async) 
                }

                else {

                    ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, c,

				  APLOGNO(),

				  APLOGNO(03404)

                                  "h2_session(%ld): waiting on conditional",

                                  session->id);

                    h2_session_shutdown(session, H2_ERR_INTERNAL_ERROR,

modules/http2/h2_task.c

+3 −3
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static apr_status_t output_write(h2_task *task, ap_filter_t* f, 
    

    /* If the passed brigade is not empty, save it before return */

    if (!APR_BRIGADE_EMPTY(bb)) {

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(03405)

                      "h2_task(%s): could not write all, saving brigade", 

                      task->id);

        if (!task->output.bb) {
@@ -806,7 +806,7 @@ apr_status_t h2_task_freeze(h2_task *task) 
{   

    if (!task->frozen) {

        task->frozen = 1;

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(), 

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(03406) 

                      "h2_task(%s), frozen", task->id);

    }

    return APR_SUCCESS;
@@ -816,7 +816,7 @@ apr_status_t h2_task_thaw(h2_task *task) 
{

    if (task->frozen) {

        task->frozen = 0;

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(), 

        ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(03407) 

                      "h2_task(%s), thawed", task->id);

    }

    task->detached = 1;