Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 27846200B27 for ; Wed, 22 Jun 2016 15:17:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 263CE160A35; Wed, 22 Jun 2016 13:17:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 446B4160A2E for ; Wed, 22 Jun 2016 15:17:46 +0200 (CEST) Received: (qmail 93618 invoked by uid 500); 22 Jun 2016 13:17:45 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 93608 invoked by uid 99); 22 Jun 2016 13:17:45 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jun 2016 13:17:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0413D1A0C7E for ; Wed, 22 Jun 2016 13:17:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.374 X-Spam-Level: X-Spam-Status: No, score=0.374 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id pYW3M9UNqL4n for ; Wed, 22 Jun 2016 13:17:42 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 659385FB06 for ; Wed, 22 Jun 2016 13:17:42 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 95AACE021C for ; Wed, 22 Jun 2016 13:17:41 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 94B9B3A031D for ; Wed, 22 Jun 2016 13:17:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1749693 - in /httpd/httpd/trunk: docs/log-message-tags/next-number modules/http2/h2_conn_io.c modules/http2/h2_mplx.c modules/http2/h2_ngn_shed.c modules/http2/h2_session.c modules/http2/h2_task.c Date: Wed, 22 Jun 2016 13:17:41 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160622131741.94B9B3A031D@svn01-us-west.apache.org> archived-at: Wed, 22 Jun 2016 13:17:47 -0000 Author: covener Date: Wed Jun 22 13:17:41 2016 New Revision: 1749693 URL: http://svn.apache.org/viewvc?rev=1749693&view=rev Log: assign IDs to new AH*'s Modified: httpd/httpd/trunk/docs/log-message-tags/next-number 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/docs/log-message-tags/next-number URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1749693&r1=1749692&r2=1749693&view=diff ============================================================================== --- httpd/httpd/trunk/docs/log-message-tags/next-number (original) +++ httpd/httpd/trunk/docs/log-message-tags/next-number Wed Jun 22 13:17:41 2016 @@ -1 +1 @@ -3386 +3408 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=1749693&r1=1749692&r2=1749693&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:17:41 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, 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_c } 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_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, 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 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 } 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 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 Modified: httpd/httpd/trunk/modules/http2/h2_mplx.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_mplx.c?rev=1749693&r1=1749692&r2=1749693&view=diff ============================================================================== --- httpd/httpd/trunk/modules/http2/h2_mplx.c (original) +++ httpd/httpd/trunk/modules/http2/h2_mplx.c Wed Jun 22 13:17:41 2016 @@ -486,7 +486,7 @@ static int task_print(void *ctx, void *v 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_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, 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=1749693&r1=1749692&r2=1749693&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:17:41 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, 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_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, 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_ng 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_ng } 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_ng 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_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, 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++; Modified: httpd/httpd/trunk/modules/http2/h2_session.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_session.c?rev=1749693&r1=1749692&r2=1749693&view=diff ============================================================================== --- httpd/httpd/trunk/modules/http2/h2_session.c (original) +++ httpd/httpd/trunk/modules/http2/h2_session.c Wed Jun 22 13:17:41 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, 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 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_sessi } 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_sessi } 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, Modified: httpd/httpd/trunk/modules/http2/h2_task.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_task.c?rev=1749693&r1=1749692&r2=1749693&view=diff ============================================================================== --- httpd/httpd/trunk/modules/http2/h2_task.c (original) +++ httpd/httpd/trunk/modules/http2/h2_task.c Wed Jun 22 13:17:41 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, 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 *tas { 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;