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

Merge

Browse Source
This commit is contained in:
Jan Lindström
2013-08-19 08:48:33 +03:00
parent 9fe7a83675 b7d13af7f5
commit b6ba1954f5
4 changed files with 110 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/core/poll.c
View File

@ -195,13 +195,28 @@ bool no_op = FALSE;
{
DCB *dcb = (DCB *)events[i].data.ptr;
__uint32_t ev = events[i].events;
<<<<<<< TREE
skygw_log_write(
LOGFILE_TRACE,
"%lu [poll_waitevents] event %d",
pthread_self(),
ev);
=======
simple_mutex_t* mutex = &dcb->mutex;
>>>>>>> MERGE-SOURCE
<<<<<<< TREE
=======
simple_mutex_lock(mutex, TRUE);
skygw_log_write(
LOGFILE_TRACE,
"%lu [poll_waitevents] event %d",
pthread_self(),
ev);
>>>>>>> MERGE-SOURCE
if (DCB_ISZOMBIE(dcb))
<<<<<<< TREE
{
skygw_log_write(
LOGFILE_TRACE,
@ -209,12 +224,27 @@ bool no_op = FALSE;
pthread_self());
continue;
}
=======
{
skygw_log_write(
LOGFILE_TRACE,
"%lu [poll_waitevents] dcb is zombie",
pthread_self());
simple_mutex_unlock(mutex);
continue;
}
>>>>>>> MERGE-SOURCE
if (ev & EPOLLERR)
{
atomic_add(&pollStats.n_error, 1);
dcb->func.error(dcb);
<<<<<<< TREE
if (DCB_ISZOMBIE(dcb)) {
=======
if (DCB_ISZOMBIE(dcb)) {
simple_mutex_unlock(mutex);
>>>>>>> MERGE-SOURCE
continue;
}
}
@ -222,7 +252,12 @@ bool no_op = FALSE;
{
atomic_add(&pollStats.n_hup, 1);
dcb->func.hangup(dcb);
<<<<<<< TREE
if (DCB_ISZOMBIE(dcb)) {
=======
if (DCB_ISZOMBIE(dcb)) {
simple_mutex_unlock(mutex);
>>>>>>> MERGE-SOURCE
continue;
}
}
@ -261,8 +296,14 @@ bool no_op = FALSE;
dcb->func.read(dcb);
}
}
<<<<<<< TREE
} /**< for */
no_op = FALSE;
=======
simple_mutex_unlock(mutex);
} /**< for */
no_op = FALSE;
>>>>>>> MERGE-SOURCE
}
dcb_process_zombies(thread_id);
if (shutdown)