Skip to content

Maintenance: move async and events code to libasync #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kinkie wants to merge 15 commits into from
Closed

Maintenance: move async and events code to libasync #1635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7a3db60
Move async code to async/libasync.la
kinkie Jan 13, 2024
965804c
Move many Async files from base/ to async/
kinkie Jan 13, 2024
594873c
adjust Makefile.am
kinkie Jan 13, 2024
4dc0fc9
add async/forward.h
kinkie Jan 13, 2024
f0f5f04
move DelayedAsyncCalls to async
kinkie Jan 13, 2024
f0a7c43
move JobWait to async/
kinkie Jan 13, 2024
218faef
move Subscription.h to async
kinkie Jan 13, 2024
2f02a25
Adjust forwards
kinkie Jan 13, 2024
e6a5240
event.h -> async/Event.h
kinkie Jan 13, 2024
c7a705e
move EventLoop to async/
kinkie Jan 13, 2024
916de6e
Source maintenance
kinkie Jan 13, 2024
becb4aa
fix header in DelayIdComposite.h
kinkie Jan 13, 2024
1f422bb
Revert "move EventLoop to async/"
kinkie Jan 14, 2024
8bffd02
Revert moving AsyncEngine
kinkie Jan 14, 2024
bd8de57
Source maintenance
kinkie Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2993,6 +2993,7 @@ AC_CONFIG_FILES([
src/adaptation/icap/Makefile
src/adaptation/ecap/Makefile
src/anyp/Makefile
src/async/Makefile
src/auth/Makefile
src/auth/basic/Makefile
src/auth/basic/DB/Makefile
Expand Down
1 change: 0 additions & 1 deletion src/AsyncEngine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@

#include "squid.h"
#include "AsyncEngine.h"

Copy link
Contributor

@yadij yadij Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

File should no longer be touched.

2 changes: 1 addition & 1 deletion src/BodyPipe.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

#include "squid.h"
#include "base/AsyncJobCalls.h"
#include "async/AsyncJobCalls.h"
#include "base/TextException.h"
#include "BodyPipe.h"

Expand Down
2 changes: 1 addition & 1 deletion src/BodyPipe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef SQUID_BODY_PIPE_H
#define SQUID_BODY_PIPE_H

#include "base/AsyncJob.h"
#include "async/AsyncJob.h"
#include "base/CbcPointer.h"
#include "MemBuf.h"

Expand Down
2 changes: 1 addition & 1 deletion src/CollapsedForwarding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/* DEBUG: section 17 Request Forwarding */

#include "squid.h"
#include "base/AsyncFunCalls.h"
#include "async/AsyncFunCalls.h"
#include "CollapsedForwarding.h"
#include "globals.h"
#include "ipc/mem/Segment.h"
Expand Down
4 changes: 2 additions & 2 deletions src/CommCalls.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef SQUID_COMMCALLS_H
#define SQUID_COMMCALLS_H

#include "base/AsyncCall.h"
#include "base/AsyncJobCalls.h"
#include "async/AsyncCall.h"
#include "async/AsyncJobCalls.h"
#include "comm/Flag.h"
#include "comm/forward.h"
#include "MasterXaction.h"
Expand Down
2 changes: 1 addition & 1 deletion src/CompositePoolNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#define COMPOSITEPOOLNODE_H

#if USE_DELAY_POOLS
#include "async/DelayedAsyncCalls.h"
#include "auth/UserRequest.h"
#include "base/DelayedAsyncCalls.h"
#include "DelayIdComposite.h"
#include "DelayPools.h"
#include "ip/Address.h"
Expand Down
2 changes: 1 addition & 1 deletion src/DelayId.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
#if USE_DELAY_POOLS
#include "acl/FilledChecklist.h"
#include "base/DelayedAsyncCalls.h"
#include "async/DelayedAsyncCalls.h"
#include "client_side_request.h"
#include "DelayId.h"
#include "DelayPool.h"
Expand Down
2 changes: 1 addition & 1 deletion src/DelayIdComposite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define DELAYIDCOMPOSITE_H

#if USE_DELAY_POOLS
#include "base/forward.h"
#include "async/forward.h"
#include "base/RefCount.h"
#include "fatal.h"

Expand Down
4 changes: 2 additions & 2 deletions src/DelayVector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#include "squid.h"

#if USE_DELAY_POOLS
#include "base/AsyncCall.h"
#include "base/DelayedAsyncCalls.h"
#include "async/AsyncCall.h"
#include "async/DelayedAsyncCalls.h"
#include "comm/Connection.h"
#include "DelayVector.h"

Expand Down
2 changes: 1 addition & 1 deletion src/DiskIO/IpcIo/IpcIoFile.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/* DEBUG: section 47 Store Directory Routines */

#include "squid.h"
#include "base/AsyncFunCalls.h"
#include "async/AsyncFunCalls.h"
#include "base/CodeContext.h"
#include "base/RunnersRegistry.h"
#include "base/TextException.h"
Expand Down
2 changes: 1 addition & 1 deletion src/DiskIO/IpcIo/IpcIoFile.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef SQUID_IPC_IOFILE_H
#define SQUID_IPC_IOFILE_H

#include "base/AsyncCall.h"
#include "async/AsyncCall.h"
#include "cbdata.h"
#include "DiskIO/DiskFile.h"
#include "DiskIO/IORequestor.h"
Expand Down
4 changes: 2 additions & 2 deletions src/Downloader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef SQUID_DOWNLOADER_H
#define SQUID_DOWNLOADER_H

#include "base/AsyncCallbacks.h"
#include "base/AsyncJob.h"
#include "async/AsyncCallbacks.h"
#include "async/AsyncJob.h"
#include "defines.h"
#include "http/forward.h"
#include "http/StatusCode.h"
Expand Down
2 changes: 1 addition & 1 deletion src/EventLoop.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
/* DEBUG: section 01 Main Loop */

#include "squid.h"
#include "async/AsyncCallQueue.h"
#include "AsyncEngine.h"
#include "base/AsyncCallQueue.h"
#include "debug/Stream.h"
#include "EventLoop.h"
#include "fatal.h"
Expand Down
6 changes: 3 additions & 3 deletions src/FwdState.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
#include "acl/FilledChecklist.h"
#include "acl/Gadgets.h"
#include "anyp/PortCfg.h"
#include "base/AsyncCallbacks.h"
#include "base/AsyncCbdataCalls.h"
#include "async/AsyncCallbacks.h"
#include "async/AsyncCbdataCalls.h"
#include "async/Event.h"
#include "CacheManager.h"
#include "CachePeer.h"
#include "client_side.h"
Expand All @@ -27,7 +28,6 @@
#include "comm/Loops.h"
#include "CommCalls.h"
#include "errorpage.h"
#include "event.h"
Copy link
Contributor

@yadij yadij Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This event.h and corresponding event.cc code is all part of the EventLoop mechanism. Not part of AsyncJob code, even though the two are similar and interact.

#include "fd.h"
#include "fde.h"
#include "FwdState.h"
Expand Down
2 changes: 1 addition & 1 deletion src/FwdState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#ifndef SQUID_FORWARD_H
#define SQUID_FORWARD_H

#include "async/JobWait.h"
#include "base/forward.h"
#include "base/JobWait.h"
#include "base/RefCount.h"
#include "clients/forward.h"
#include "comm.h"
Expand Down
2 changes: 1 addition & 1 deletion src/HappyConnOpener.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "squid.h"
#include "AccessLogEntry.h"
#include "base/AsyncCallbacks.h"
#include "async/AsyncCallbacks.h"
#include "base/CodeContext.h"
#include "CachePeer.h"
#include "errorpage.h"
Expand Down
4 changes: 2 additions & 2 deletions src/HappyConnOpener.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

#ifndef SQUID_HAPPYCONNOPENER_H
#define SQUID_HAPPYCONNOPENER_H
#include "base/AsyncCallbacks.h"
#include "base/JobWait.h"
#include "async/AsyncCallbacks.h"
#include "async/JobWait.h"
#include "base/RefCount.h"
#include "comm.h"
#include "comm/Connection.h"
Expand Down
2 changes: 1 addition & 1 deletion src/HttpControlMsg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef SQUID_HTTP_CONTROL_MSG_H
#define SQUID_HTTP_CONTROL_MSG_H

#include "base/AsyncCall.h"
#include "async/AsyncCall.h"
#include "HttpReply.h"

class CommIoCbParams;
Expand Down
27 changes: 15 additions & 12 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ LOADABLE_MODULES_SOURCES = \
LoadableModules.cc \
LoadableModules.h

SUBDIRS = mem time debug base anyp helper dns html ftp parser comm error eui acl format clients sbuf servers fs repl store DiskIO proxyp
SUBDIRS = async mem time debug base anyp helper dns html ftp parser comm error eui acl format clients sbuf servers fs repl store DiskIO proxyp

if ENABLE_AUTH
SUBDIRS += auth
AUTH_LIBS= auth/libauth.la
AUTH_ACL_LIBS= auth/libacls.la
endif

SUBDIRS += http ip icmp ident log ipc mgr
SUBDIRS += http ip icmp ident log ipc mgr
Copy link
Contributor

@yadij yadij Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo

Suggested change
SUBDIRS += http ip icmp ident log ipc mgr
SUBDIRS += http ip icmp ident log ipc mgr


SSL_LIBS=
if ENABLE_SSL
Expand Down Expand Up @@ -354,8 +354,6 @@ squid_SOURCES = \
enums.h \
errorpage.cc \
errorpage.h \
event.cc \
event.h \
external_acl.cc \
fatal.cc \
fatal.h \
Expand Down Expand Up @@ -490,6 +488,7 @@ squid_LDADD = \
helper/libhelper.la \
http/libhttp.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
libsquid.la \
ip/libip.la \
Expand Down Expand Up @@ -1072,7 +1071,6 @@ tests_testRock_SOURCES = \
tests/stub_client_side_request.cc \
tests/stub_debug.cc \
tests/stub_errorpage.cc \
event.cc \
fatal.cc \
fatal.h \
fd.cc \
Expand Down Expand Up @@ -1143,6 +1141,7 @@ tests_testRock_LDADD = \
eui/libeui.la \
$(SSL_LIBS) \
ipc/libipc.la \
async/libasync.la \
base/libbase.la \
mem/libmem.la \
store/libstore.la \
Expand Down Expand Up @@ -1240,7 +1239,6 @@ tests_testUfs_SOURCES = \
tests/stub_client_side_request.cc \
tests/stub_debug.cc \
tests/stub_errorpage.cc \
event.cc \
tests/stub_fatal.cc \
fatal.h \
fd.cc \
Expand Down Expand Up @@ -1319,6 +1317,7 @@ tests_testUfs_LDADD = \
ipc/libipc.la \
comm/libcomm.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
mem/libmem.la \
store/libstore.la \
Expand Down Expand Up @@ -1414,7 +1413,6 @@ tests_testStore_SOURCES = \
tests/stub_comm.cc \
tests/stub_debug.cc \
tests/stub_errorpage.cc \
event.cc \
tests/stub_fatal.cc \
fatal.h \
tests/stub_fd.cc \
Expand Down Expand Up @@ -1477,6 +1475,7 @@ tests_testStore_LDADD= \
acl/libstate.la \
acl/libapi.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
ip/libip.la \
fs/libfs.la \
Expand Down Expand Up @@ -1577,7 +1576,6 @@ tests_testDiskIO_SOURCES = \
client_side_request.h \
tests/stub_debug.cc \
tests/stub_errorpage.cc \
event.cc \
tests/stub_fatal.cc \
fatal.h \
fd.cc \
Expand Down Expand Up @@ -1660,6 +1658,7 @@ tests_testDiskIO_LDADD = \
$(SSL_LIBS) \
ipc/libipc.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
mem/libmem.la \
sbuf/libsbuf.la \
Expand Down Expand Up @@ -1715,6 +1714,7 @@ tests_testACLMaxUserIP_LDADD = \
ip/libip.la \
parser/libparser.la \
sbuf/libsbuf.la \
async/libasync.la \
base/libbase.la \
$(SSLLIB) \
$(LIBCPPUNIT_LIBS) \
Expand Down Expand Up @@ -1847,7 +1847,6 @@ tests_test_http_range_SOURCES = \
dlink.cc \
dlink.h \
errorpage.cc \
event.cc \
tests/stub_external_acl.cc \
tests/stub_fatal.cc \
fatal.h \
Expand Down Expand Up @@ -1959,6 +1958,7 @@ tests_test_http_range_LDADD = \
$(SSL_LIBS) \
ipc/libipc.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
mgr/libmgr.la \
html/libhtml.la \
Expand Down Expand Up @@ -2016,6 +2016,7 @@ tests_testHttp1Parser_LDADD= \
parser/libparser.la \
anyp/libanyp.la \
SquidConfig.o \
async/libasync.la \
base/libbase.la \
ip/libip.la \
sbuf/libsbuf.la \
Expand Down Expand Up @@ -2116,6 +2117,7 @@ tests_testHttpReply_LDADD=\
acl/libstate.la \
anyp/libanyp.la \
ip/libip.la \
async/libasync.la \
base/libbase.la \
ipc/libipc.la \
sbuf/libsbuf.la \
Expand Down Expand Up @@ -2230,7 +2232,6 @@ tests_testHttpRequest_SOURCES = \
dlink.cc \
dlink.h \
errorpage.cc \
event.cc \
external_acl.cc \
tests/stub_fatal.cc \
fatal.h \
Expand Down Expand Up @@ -2334,6 +2335,7 @@ tests_testHttpRequest_LDADD = \
proxyp/libproxyp.la \
parser/libparser.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
mgr/libmgr.la \
html/libhtml.la \
Expand Down Expand Up @@ -2525,7 +2527,6 @@ tests_testCacheManager_SOURCES = \
dlink.cc \
dlink.h \
errorpage.cc \
event.cc \
external_acl.cc \
tests/stub_fatal.cc \
fatal.h \
Expand Down Expand Up @@ -2623,6 +2624,7 @@ tests_testCacheManager_LDADD = \
acl/libstate.la \
acl/libapi.la \
dns/libdns.la \
async/libasync.la \
base/libbase.la \
ip/libip.la \
fs/libfs.la \
Expand Down Expand Up @@ -2731,11 +2733,11 @@ nodist_tests_testEvent_SOURCES = \
tests/stub_cache_manager.cc \
tests/stub_cbdata.cc \
tests/stub_debug.cc \
event.cc \
tests/stub_libmem.cc \
tests/stub_libtime.cc \
tests/stub_tools.cc
tests_testEvent_LDADD = \
async/libasync.la \
base/libbase.la \
$(LIBCPPUNIT_LIBS) \
$(COMPAT_LIB) \
Expand All @@ -2752,6 +2754,7 @@ nodist_tests_testEventLoop_SOURCES = \
tests/stub_fatal.cc \
tests/stub_libtime.cc
tests_testEventLoop_LDADD = \
async/libasync.la \
base/libbase.la \
$(LIBCPPUNIT_LIBS) \
$(COMPAT_LIB) \
Expand Down
2 changes: 1 addition & 1 deletion src/MemObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef SQUID_MEMOBJECT_H
#define SQUID_MEMOBJECT_H

#include "base/DelayedAsyncCalls.h"
#include "async/DelayedAsyncCalls.h"
#include "dlink.h"
#include "http/RequestMethod.h"
#include "HttpReply.h"
Expand Down
Loading