Commit e78889fc authored by Stefan Eissing's avatar Stefan Eissing
Browse files

On the trunk: 

mod_http2: h2 workers with improved scalability for better scheduling
     performance. There are H2MaxWorkers threads created at start and the
     number is kept constant. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1788672 13f79535-47bb-0310-9956-ffa450edef68
parent 1bc93843

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.5.0



  *) mod_http2: h2 workers with improved scalability for better scheduling

     performance. There are H2MaxWorkers threads created at start and the

     number is kept constant. [Stefan Eissing]

     

  *) mod_http2: obsoleted option H2SessionExtraFiles, will be ignored and

     just log a warning. [Stefan Eissing]

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ SET(mod_http2_extra_sources 
  modules/http2/h2_session.c         modules/http2/h2_stream.c 

  modules/http2/h2_switch.c          modules/http2/h2_ngn_shed.c 

  modules/http2/h2_task.c            modules/http2/h2_util.c

  modules/http2/h2_worker.c          modules/http2/h2_workers.c

  modules/http2/h2_workers.c

)

SET(mod_ldap_extra_defines           LDAP_DECLARE_EXPORT)

SET(mod_ldap_extra_libs              wldap32)

modules/http2/NWGNUmod_http2

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/h2_switch.o \

	$(OBJDIR)/h2_task.o \

	$(OBJDIR)/h2_util.o \

	$(OBJDIR)/h2_worker.o \

	$(OBJDIR)/h2_workers.o \

	$(OBJDIR)/mod_http2.o \

	$(EOLIST)

modules/http2/config2.m4

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ h2_stream.lo dnl 
h2_switch.lo dnl

h2_task.lo dnl

h2_util.lo dnl

h2_worker.lo dnl

h2_workers.lo dnl

"

modules/http2/h2_conn.c

+4 −7
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include "h2_stream.h"

#include "h2_h2.h"

#include "h2_task.h"

#include "h2_worker.h"

#include "h2_workers.h"

#include "h2_conn.h"

#include "h2_version.h"
@@ -129,13 +128,11 @@ apr_status_t h2_conn_child_init(apr_pool_t *pool, server_rec *s) 
        maxw = minw;

    }

    

    ap_log_error(APLOG_MARK, APLOG_TRACE3, 0, s,

                 "h2_workers: min=%d max=%d, mthrpchild=%d", 

                 minw, maxw, max_threads_per_child);

    workers = h2_workers_create(s, pool, minw, maxw);

    

    idle_secs = h2_config_geti(config, H2_CONF_MAX_WORKER_IDLE_SECS);

    h2_workers_set_max_idle_secs(workers, idle_secs);

    ap_log_error(APLOG_MARK, APLOG_TRACE3, 0, s,

                 "h2_workers: min=%d max=%d, mthrpchild=%d, idle_secs=%d", 

                 minw, maxw, max_threads_per_child, idle_secs);

    workers = h2_workers_create(s, pool, minw, maxw, idle_secs);

 

    ap_register_input_filter("H2_IN", h2_filter_core_input,

                             NULL, AP_FTYPE_CONNECTION);