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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-03-27 12:16:54 +02:00
parent c6ce4c2234 04f70879d2
commit a78f0fbe25
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/dcb.h
View File

@ -228,6 +228,8 @@ typedef struct dcb
} thread; } thread;
uint32_t n_close; /** How many times dcb_close has been called. */ uint32_t n_close; /** How many times dcb_close has been called. */
char* path; /** If a Unix socket, the path it was bound to. */ char* path; /** If a Unix socket, the path it was bound to. */
uint64_t m_uid; /**< Unique identifier for this DCB */
} DCB; } DCB;
/** /**

8
server/core/dcb.cc
View File

@ -52,6 +52,8 @@
#include <maxscale/utils.h> #include <maxscale/utils.h>
#include <maxscale/routingworker.hh> #include <maxscale/routingworker.hh>
#include <atomic>
#include "internal/modules.h" #include "internal/modules.h"
#include "internal/session.h" #include "internal/session.h"
@ -79,6 +81,7 @@ static struct
DCB dcb_initialized; /** A DCB with null values, used for initialization. */ DCB dcb_initialized; /** A DCB with null values, used for initialization. */
DCB** all_dcbs; /** #workers sized array of pointers to DCBs where dcbs are listed. */ DCB** all_dcbs; /** #workers sized array of pointers to DCBs where dcbs are listed. */
bool check_timeouts; /** Should session timeouts be checked. */ bool check_timeouts; /** Should session timeouts be checked. */
std::atomic<uint64_t> uid_generator {0};
} this_unit; } this_unit;
static thread_local struct static thread_local struct
@ -201,6 +204,7 @@ DCB* dcb_alloc(dcb_role_t role, SERV_LISTENER* listener)
newdcb->last_read = mxs_clock(); newdcb->last_read = mxs_clock();
newdcb->low_water = config_writeq_low_water(); newdcb->low_water = config_writeq_low_water();
newdcb->high_water = config_writeq_high_water(); newdcb->high_water = config_writeq_high_water();
newdcb->m_uid = this_unit.uid_generator.fetch_add(1, std::memory_order_relaxed);
if (role == DCB_ROLE_SERVICE_LISTENER) if (role == DCB_ROLE_SERVICE_LISTENER)
{ {
@ -3282,6 +3286,7 @@ public:
: m_dcb(dcb) : m_dcb(dcb)
, m_buffer(buf) , m_buffer(buf)
, m_ev(ev) , m_ev(ev)
, m_uid(dcb->m_uid)
{ {
} }
@ -3290,7 +3295,7 @@ public:
mxb_assert(&worker == RoutingWorker::get_current()); mxb_assert(&worker == RoutingWorker::get_current());
RoutingWorker& rworker = static_cast<RoutingWorker&>(worker); RoutingWorker& rworker = static_cast<RoutingWorker&>(worker);
if (dcb_is_still_valid(m_dcb, rworker.id())) if (dcb_is_still_valid(m_dcb, rworker.id()) && m_dcb->m_uid == m_uid)
{ {
m_dcb->fakeq = m_buffer; m_dcb->fakeq = m_buffer;
dcb_handler(m_dcb, m_ev); dcb_handler(m_dcb, m_ev);
@ -3305,6 +3310,7 @@ private:
DCB* m_dcb; DCB* m_dcb;
GWBUF* m_buffer; GWBUF* m_buffer;
uint32_t m_ev; uint32_t m_ev;
uint64_t m_uid; /**< DCB UID guarantees we deliver the event to the correct DCB */
}; };
static void poll_add_event_to_dcb(DCB* dcb, GWBUF* buf, uint32_t ev) static void poll_add_event_to_dcb(DCB* dcb, GWBUF* buf, uint32_t ev)