]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1705922, r1706523, r1738464, r1738466, r1738486 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 2 Dec 2016 11:44:57 +0000 (11:44 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 2 Dec 2016 11:44:57 +0000 (11:44 +0000)
commit15dc4248820cc80356d14030d9ba02f71c0ca722
tree7231705a45050f6672870ec7ef4ac86110b6b84c
parent92961f3c1306934d0b5f495d3d0b151b990c20d8
Merge r1705922, r1706523, r1738464, r1738466, r1738486 from trunk:

When shutting down a process, free resources early

Due to lingering connections, shutting down a process may take a very
long time. Free all recycled pools early in the hope that we can already
give some memory back to the OS.

rename some variables to be more descriptive

pid -> pslot
tid -> tslot
remove unused 'sd'

Terminate keep-alive connections when dying

When shutting down a process gracefully, terminate keep-alive connections so
that we don't get any new requests which may keep the dying process alive
longer.

Exit threads early during shutdown

During graceful shutdown, if there are more running worker threads than open
connections, terminate some threads. This frees resources faster, which may be
needed for new processes.

Exit threads early during shutdown, part 2

Follow up to r1738466: During graceful shutdown, when the listener thread is
closing a connection, it needs to wake up a worker thread so that it may
terminate.

Submitted by: sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1772334 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
server/mpm/event/event.c
server/mpm/event/fdqueue.c
server/mpm/event/fdqueue.h