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

MXS-2004 Remove additional dependencies on maxscale/thread.h

Browse Source
This commit is contained in:
Johan Wikman
2018-08-10 15:42:30 +03:00
parent 5d6b05af1f
commit f9ba8824d4
8 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/maxscale/monitor.hh
View File

@ -15,7 +15,6 @@
#include <maxscale/ccdefs.hh> #include <maxscale/ccdefs.hh>
#include <maxscale/monitor.h> #include <maxscale/monitor.h>
#include <maxscale/semaphore.hh> #include <maxscale/semaphore.hh>
#include <maxscale/thread.h>
#include <maxscale/worker.hh> #include <maxscale/worker.hh>
namespace maxscale namespace maxscale

1
include/maxscale/worker.h
View File

@ -14,7 +14,6 @@
#include <maxscale/cdefs.h> #include <maxscale/cdefs.h>
#include <maxscale/poll.h> #include <maxscale/poll.h>
#include <maxscale/thread.h>
#include <maxscale/jansson.h> #include <maxscale/jansson.h>
MXS_BEGIN_DECLS MXS_BEGIN_DECLS

8
server/core/dcb.cc
View File

@ -3377,16 +3377,16 @@ static inline void dcb_sanity_check(DCB* dcb)
if (dcb->state == DCB_STATE_DISCONNECTED || dcb->state == DCB_STATE_UNDEFINED) if (dcb->state == DCB_STATE_DISCONNECTED || dcb->state == DCB_STATE_UNDEFINED)
{ {
MXS_ERROR("%lu [poll_add_dcb] Error : existing state of dcb %p " MXS_ERROR("[poll_add_dcb] Error : existing state of dcb %p "
"is %s, but this should be impossible, crashing.", "is %s, but this should be impossible, crashing.",
thread_self(), dcb, STRDCBSTATE(dcb->state)); dcb, STRDCBSTATE(dcb->state));
raise(SIGABRT); raise(SIGABRT);
} }
else if (dcb->state == DCB_STATE_POLLING || dcb->state == DCB_STATE_LISTENING) else if (dcb->state == DCB_STATE_POLLING || dcb->state == DCB_STATE_LISTENING)
{ {
MXS_ERROR("%lu [poll_add_dcb] Error : existing state of dcb %p " MXS_ERROR("[poll_add_dcb] Error : existing state of dcb %p "
"is %s, but this is probably an error, not crashing.", "is %s, but this is probably an error, not crashing.",
thread_self(), dcb, STRDCBSTATE(dcb->state)); dcb, STRDCBSTATE(dcb->state));
} }
} }

2
server/core/internal/admin.hh
View File

@ -17,8 +17,6 @@
#include <string> #include <string>
#include <microhttpd.h> #include <microhttpd.h>
#include <maxscale/thread.h>
class Client class Client
{ {
Client(const Client&); Client(const Client&);

2
server/modules/monitor/mariadbmon/cluster_manipulation.cc
View File

@ -836,7 +836,7 @@ bool MariaDBMonitor::wait_cluster_stabilization(MariaDBServer* new_master, const
{ {
if (!first_round) if (!first_round)
{ {
thread_millisleep(500); std::this_thread::sleep_for(std::chrono::milliseconds(500));
} }
// Erasing elements from an array, so iterate from last to first // Erasing elements from an array, so iterate from last to first

1
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -20,7 +20,6 @@
#include <vector> #include <vector>
#include <maxscale/monitor.hh> #include <maxscale/monitor.hh>
#include <maxscale/thread.h>
#include "mariadbserver.hh" #include "mariadbserver.hh"

1
server/modules/monitor/mmmon/mmmon.hh
View File

@ -14,7 +14,6 @@
#include <maxscale/ccdefs.hh> #include <maxscale/ccdefs.hh>
#include <maxscale/monitor.hh> #include <maxscale/monitor.hh>
#include <maxscale/thread.h>
/** /**
* @file mmmon.hh - The Multi-Master monitor * @file mmmon.hh - The Multi-Master monitor

1
server/modules/monitor/ndbclustermon/ndbclustermon.hh
View File

@ -14,7 +14,6 @@
#include <maxscale/ccdefs.hh> #include <maxscale/ccdefs.hh>
#include <maxscale/monitor.hh> #include <maxscale/monitor.hh>
#include <maxscale/thread.h>
/** /**
* @file ndbcclustermon.hh A NDBC cluster monitor * @file ndbcclustermon.hh A NDBC cluster monitor