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

Remove support for session specific log priorities

Browse Source 
No need to maintain information in thread local storage,
which just added complexity and also incurred a slight
performance penalty.
This commit is contained in:
Johan Wikman
2017-02-14 12:27:57 +02:00
parent d05a533611
commit 5f0346f5a9
7 changed files with 8 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/poll.c
View File

@ -920,10 +920,6 @@ process_pollq(int thread_id, struct epoll_event *event)
if (eno == 0)
{
ts_stats_increment(pollStats.n_write, thread_id);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "write_ready"))
{
@ -952,9 +948,6 @@ process_pollq(int thread_id, struct epoll_event *event)
pthread_self(),
dcb->fd);
ts_stats_increment(pollStats.n_accept, thread_id);
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "accept"))
{
@ -969,10 +962,6 @@ process_pollq(int thread_id, struct epoll_event *event)
dcb,
dcb->fd);
ts_stats_increment(pollStats.n_read, thread_id);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "read"))
{
@ -1005,10 +994,6 @@ process_pollq(int thread_id, struct epoll_event *event)
strerror_r(eno, errbuf, sizeof(errbuf)));
}
ts_stats_increment(pollStats.n_error, thread_id);
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "error"))
{
@ -1033,11 +1018,6 @@ process_pollq(int thread_id, struct epoll_event *event)
{
dcb->flags |= DCBF_HUNG;
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "hangup EPOLLHUP"))
{
dcb->func.hangup(dcb);
@ -1064,11 +1044,6 @@ process_pollq(int thread_id, struct epoll_event *event)
{
dcb->flags |= DCBF_HUNG;
/** Read session id to thread's local storage */
dcb_get_ses_log_info(dcb,
&mxs_log_tls.li_sesid,
&mxs_log_tls.li_enabled_priorities);
if (poll_dcb_session_check(dcb, "hangup EPOLLRDHUP"))
{
dcb->func.hangup(dcb);
@ -1091,9 +1066,6 @@ process_pollq(int thread_id, struct epoll_event *event)
ts_stats_set_max(queueStats.maxexectime, qtime, thread_id);
/** Reset session id from thread's local storage */
mxs_log_tls.li_sesid = 0;
return 1;
}