You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2021/07/22 15:04:26 UTC
svn commit: r1891718 - /httpd/httpd/trunk/server/mpm/event/event.c
Author: ylavic
Date: Thu Jul 22 15:04:26 2021
New Revision: 1891718
URL: http://svn.apache.org/viewvc?rev=1891718&view=rev
Log:
mpm_event: use apr_atomic_read32() to read queues' ->total instead of volatile access.
* server/mpm/event/event.c (listener_thread): Use apr_atomic_read32() instead
open coded *(volatile apr_uint32_t*)q->total.
No functional change.
Follow up to r1891716.
Github: #208
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1891718&r1=1891717&r2=1891718&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Thu Jul 22 15:04:26 2021
@@ -1895,8 +1895,8 @@ static void * APR_THREAD_FUNC listener_t
"keep-alive: %d lingering: %d suspended: %u)",
apr_atomic_read32(&connection_count),
apr_atomic_read32(&clogged_count),
- *(volatile apr_uint32_t*)write_completion_q->total,
- *(volatile apr_uint32_t*)keepalive_q->total,
+ apr_atomic_read32(write_completion_q->total),
+ apr_atomic_read32(keepalive_q->total),
apr_atomic_read32(&lingering_count),
apr_atomic_read32(&suspended_count));
if (dying) {
@@ -2260,14 +2260,14 @@ do_maintenance:
queues_next_expiry > now ? queues_next_expiry - now
: -1);
- ps->keep_alive = *(volatile apr_uint32_t*)keepalive_q->total;
- ps->write_completion = *(volatile apr_uint32_t*)write_completion_q->total;
+ ps->keep_alive = apr_atomic_read32(keepalive_q->total);
+ ps->write_completion = apr_atomic_read32(write_completion_q->total);
ps->connections = apr_atomic_read32(&connection_count);
ps->suspended = apr_atomic_read32(&suspended_count);
ps->lingering_close = apr_atomic_read32(&lingering_count);
}
else if ((workers_were_busy || dying)
- && *(volatile apr_uint32_t*)keepalive_q->total) {
+ && apr_atomic_read32(keepalive_q->total)) {
apr_thread_mutex_lock(timeout_mutex);
process_keepalive_queue(0); /* kill'em all \m/ */
apr_thread_mutex_unlock(timeout_mutex);