You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2016/06/22 13:15:57 UTC
svn commit: r1749688 - in /httpd/httpd/trunk/modules/http2: h2_conn_io.c
h2_mplx.c h2_ngn_shed.c h2_session.c h2_task.c
Author: covener
Date: Wed Jun 22 13:15:57 2016
New Revision: 1749688
URL: http://svn.apache.org/viewvc?rev=1749688&view=rev
Log:
spatch some AH* IDs to pick up the new INFO level messages,
also hit old DEBUG messages.
Modified:
httpd/httpd/trunk/modules/http2/h2_conn_io.c
httpd/httpd/trunk/modules/http2/h2_mplx.c
httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
httpd/httpd/trunk/modules/http2/h2_session.c
httpd/httpd/trunk/modules/http2/h2_task.c
Modified: httpd/httpd/trunk/modules/http2/h2_conn_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_conn_io.c?rev=1749688&r1=1749687&r2=1749688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_conn_io.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_conn_io.c Wed Jun 22 13:15:57 2016
@@ -171,7 +171,7 @@ static void append_scratch(h2_conn_io *i
io->c->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(io->output, b);
#if LOG_SCRATCH
- ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
"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_c
}
status = apr_file_read(fd, io->scratch + io->slen, &len);
#if LOG_SCRATCH
- ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, status, io->c, APLOGNO(),
"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_c
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,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
"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
remain = assure_scratch_space(io);
if (remain >= length) {
#if LOG_SCRATCH
- ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
"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
}
else {
#if LOG_SCRATCH
- ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
"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
APR_BUCKET_REMOVE(b);
APR_BRIGADE_INSERT_TAIL(io->output, b);
#if LOG_SCRATCH
- ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, io->c, APLOGNO(),
"h2_conn_io(%ld): pass bucket(%ld)",
io->c->id, (long)b->length);
#endif
Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1749688&r1=1749687&r2=1749688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_mplx.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_mplx.c Wed Jun 22 13:15:57 2016
@@ -486,11 +486,11 @@ static int task_print(void *ctx, void *v
task->worker_done);
}
else if (task) {
- ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */
+ ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */
"->03198: h2_stream(%ld-%d): NULL", m->id, task->stream_id);
}
else {
- ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, /* NO APLOGNO */
+ ap_log_cerror(APLOG_MARK, APLOG_WARNING, 0, m->c, APLOGNO(), /* NO APLOGNO */
"->03198: h2_stream(%ld-NULL): NULL", m->id);
}
return 1;
@@ -739,7 +739,7 @@ static apr_status_t out_close(h2_mplx *m
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,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, m->c, APLOGNO(),
"h2_mplx(%s): close, no response, no rst", task->id);
}
ap_log_cerror(APLOG_MARK, APLOG_TRACE2, status, m->c,
Modified: httpd/httpd/trunk/modules/http2/h2_ngn_shed.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_ngn_shed.c?rev=1749688&r1=1749687&r2=1749688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_ngn_shed.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_ngn_shed.c Wed Jun 22 13:15:57 2016
@@ -139,7 +139,7 @@ h2_ngn_shed *h2_ngn_shed_get_shed(h2_req
void h2_ngn_shed_abort(h2_ngn_shed *shed)
{
- ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),
"h2_ngn_shed(%ld): abort", shed->c->id);
shed->aborted = 1;
}
@@ -204,7 +204,7 @@ apr_status_t h2_ngn_shed_push_task(h2_ng
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,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),
"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_ng
AP_DEBUG_ASSERT(ngn);
*ptask = NULL;
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
"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,
+ ap_log_cerror(APLOG_MARK, APLOG_INFO, 0, shed->c, APLOGNO(),
"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_ng
}
if ((entry = pop_detached(ngn))) {
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, entry->task->c, APLOGNO(),
"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_ng
if (1) {
h2_ngn_entry *entry = H2_REQ_ENTRIES_FIRST(&ngn->entries);
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
"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_ng
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,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, shed->c, APLOGNO(),
"h2_ngn_shed(%ld): task %s %s by %s",
shed->c->id, task->id, aborted? "aborted":"done", ngn->id);
ngn->no_finished++;
Modified: httpd/httpd/trunk/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1749688&r1=1749687&r2=1749688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_session.c Wed Jun 22 13:15:57 2016
@@ -1785,7 +1785,7 @@ static void h2_session_ev_conn_error(h2_
break;
default:
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),
"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
break;
default:
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, session->c, APLOGNO(),
"h2_session(%ld): proto error -> shutdown", session->id);
h2_session_shutdown(session, arg, msg, 0);
break;
@@ -2122,6 +2122,7 @@ apr_status_t h2_session_process(h2_sessi
}
else {
ap_log_cerror( APLOG_MARK, APLOG_DEBUG, status, c,
+ APLOGNO(),
"h2_session(%ld): idle, no data, error",
session->id);
dispatch_event(session, H2_SESSION_EV_CONN_ERROR, 0, "timeout");
@@ -2288,6 +2289,7 @@ apr_status_t h2_session_process(h2_sessi
}
else {
ap_log_cerror(APLOG_MARK, APLOG_WARNING, status, c,
+ APLOGNO(),
"h2_session(%ld): waiting on conditional",
session->id);
h2_session_shutdown(session, H2_ERR_INTERNAL_ERROR,
Modified: httpd/httpd/trunk/modules/http2/h2_task.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?rev=1749688&r1=1749687&r2=1749688&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_task.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_task.c Wed Jun 22 13:15:57 2016
@@ -442,7 +442,7 @@ static apr_status_t output_write(h2_task
/* 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,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, task->c, APLOGNO(),
"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 *tas
{
if (!task->frozen) {
task->frozen = 1;
- ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(),
"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,
+ ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, task->c, APLOGNO(),
"h2_task(%s), thawed", task->id);
}
task->detached = 1;