hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2196: Store listener reference in DCB

Browse Source 
By storing the reference in the DCB, the two-way dependency between the
listeners and services is severed. Now the services have no direct link to
listeners and after the destruction of a listener it will be freed once
all connections through it have closed.

Due to the fact that a listener itself has a DCB that must point to a
valid listener, a self-reference is stored in the listener DCB. This is
extremely confusing and is only here to keep the code functional until the
DCB part of the listener can be factored out.
This commit is contained in:
Markus Mäkelä
2018-11-30 17:48:32 +02:00
parent 7a87ff9ce1
commit 45827dd433
12 changed files with 39 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/maxscale/dcb.hh
View File

@ -26,8 +26,11 @@
#include <maxscale/protocol.h>
#include <maxscale/ssl.h>
#include <memory>
class SERVICE;
class Listener;
using SListener = std::shared_ptr<Listener>;
MXS_BEGIN_DECLS
@ -174,7 +177,7 @@ typedef enum
*/
struct DCB : public MXB_POLL_DATA
{
DCB(dcb_role_t role, Listener* listener, SERVICE* service);
DCB(dcb_role_t role, const SListener& listener, SERVICE* service);
~DCB();
bool dcb_errhandle_called = false; /**< this can be called only once */
@ -189,7 +192,7 @@ struct DCB : public MXB_POLL_DATA
size_t protocol_packet_length = 0; /**< protocol packet length */
size_t protocol_bytes_processed = 0; /**< How many bytes have been read */
struct session* session = nullptr; /**< The owning session */
Listener* listener = nullptr; /**< For a client DCB, the listener data */
SListener listener; /**< The origin of the connection */
MXS_PROTOCOL func = {}; /**< Protocol functions for the DCB */
MXS_AUTHENTICATOR authfunc = {}; /**< Authenticator functions for the DCB */
uint64_t writeqlen = 0; /**< Bytes in writeq */
@ -260,8 +263,8 @@ typedef enum
void dcb_global_init();
int dcb_write(DCB*, GWBUF*);
DCB* dcb_accept(Listener* listener);
DCB* dcb_alloc(dcb_role_t, Listener*, SERVICE* service);
DCB* dcb_accept(const SListener& listener);
DCB* dcb_alloc(dcb_role_t, const SListener&, SERVICE* service);
DCB* dcb_connect(struct server*, struct session*, const char*);
int dcb_read(DCB*, GWBUF**, int);
int dcb_drain_writeq(DCB*);

4
include/maxscale/listener.hh
View File

@ -78,7 +78,7 @@ public:
*
* @return True if the listener was able to start listening
*/
bool listen();
bool listen(const SListener& self);
/**
* Stop the listener
@ -220,7 +220,7 @@ private:
const std::string& protocol, const std::string& authenticator,
const std::string& auth_opts, void* auth_instance, SSL_LISTENER* ssl);
friend DCB* dcb_accept(Listener* listener);
friend DCB* dcb_accept(const SListener& listener);
};
/**