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

MXS-2004 Remove remaining dependency on maxscale/thread.h

Browse Source 
Replaced with explicit dependency on pthread.h. Acceptable since
this is effectively for debugging purposes and could at some point
be removed entirelly.
This commit is contained in:
Johan Wikman
2018-08-13 09:53:36 +03:00
parent f9ba8824d4
commit 2dd9e3e382
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/routing/binlogrouter/blr.h
View File

@ -34,7 +34,6 @@
#include <maxscale/secrets.h> #include <maxscale/secrets.h>
#include <maxscale/service.h> #include <maxscale/service.h>
#include <maxscale/sqlite3.h> #include <maxscale/sqlite3.h>
#include <maxscale/thread.h>
#include <maxscale/mysql_binlog.h> #include <maxscale/mysql_binlog.h>
MXS_BEGIN_DECLS MXS_BEGIN_DECLS
@ -535,7 +534,7 @@ typedef struct router_slave
/*< lsi: Last Sent Information */ /*< lsi: Last Sent Information */
blr_thread_role_t lsi_sender_role; blr_thread_role_t lsi_sender_role;
/*< Master or slave code sent */ /*< Master or slave code sent */
THREAD lsi_sender_tid; uint64_t lsi_sender_tid;
/*< Who sent */ /*< Who sent */
char lsi_binlog_name[BINLOG_FNAMELEN + 1]; char lsi_binlog_name[BINLOG_FNAMELEN + 1];
/*< Which binlog file */ /*< Which binlog file */

6
server/modules/routing/binlogrouter/blr_master.cc
View File

@ -36,6 +36,8 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <pthread.h>
#include <maxscale/alloc.h> #include <maxscale/alloc.h>
#include <maxscale/atomic.h> #include <maxscale/atomic.h>
#include <maxscale/buffer.h> #include <maxscale/buffer.h>
@ -1739,7 +1741,7 @@ bool blr_send_event(blr_thread_role_t role,
slave->serverid, slave->serverid,
binlog_name, binlog_name,
binlog_pos, binlog_pos,
(uint64_t)thread_self(), (uint64_t)pthread_self(),
ROLETOSTR(role), ROLETOSTR(role),
(uint64_t)slave->lsi_sender_tid, (uint64_t)slave->lsi_sender_tid,
ROLETOSTR(slave->lsi_sender_role), ROLETOSTR(slave->lsi_sender_role),
@ -1792,7 +1794,7 @@ bool blr_send_event(blr_thread_role_t role,
strcpy(slave->lsi_binlog_name, binlog_name); strcpy(slave->lsi_binlog_name, binlog_name);
slave->lsi_binlog_pos = binlog_pos; slave->lsi_binlog_pos = binlog_pos;
slave->lsi_sender_role = role; slave->lsi_sender_role = role;
slave->lsi_sender_tid = thread_self(); slave->lsi_sender_tid = pthread_self();
} }
else else
{ {