Commit 6d1bd029 authored by unknown's avatar unknown

Fixes

parent 6cc3eee4
...@@ -38,7 +38,7 @@ struct NdbThread ...@@ -38,7 +38,7 @@ struct NdbThread
#ifdef NDB_SHM_TRANSPORTER #ifdef NDB_SHM_TRANSPORTER
void NdbThread_set_shm_sigmask(bool block) void NdbThread_set_shm_sigmask(my_bool block)
{ {
DBUG_ENTER("NdbThread_set_shm_sigmask"); DBUG_ENTER("NdbThread_set_shm_sigmask");
if (g_ndb_shm_signum) if (g_ndb_shm_signum)
...@@ -64,7 +64,7 @@ ndb_thread_wrapper(void* _ss){ ...@@ -64,7 +64,7 @@ ndb_thread_wrapper(void* _ss){
{ {
DBUG_ENTER("ndb_thread_wrapper"); DBUG_ENTER("ndb_thread_wrapper");
#ifdef NDB_SHM_TRANSPORTER #ifdef NDB_SHM_TRANSPORTER
NdbThread_set_shm_sigmask(true); NdbThread_set_shm_sigmask(TRUE);
#endif #endif
{ {
void *ret; void *ret;
......
...@@ -457,7 +457,7 @@ TransporterRegistry::createSHMTransporter(TransporterConfiguration *config) { ...@@ -457,7 +457,7 @@ TransporterRegistry::createSHMTransporter(TransporterConfiguration *config) {
* Make sure to block g_ndb_shm_signum * Make sure to block g_ndb_shm_signum
* TransporterRegistry::init is run from "main" thread * TransporterRegistry::init is run from "main" thread
*/ */
NdbThread_set_shm_sigmask(true); NdbThread_set_shm_sigmask(TRUE);
} }
if(config->shm.signum != g_ndb_shm_signum) if(config->shm.signum != g_ndb_shm_signum)
...@@ -1487,7 +1487,7 @@ TransporterRegistry::startReceiving() ...@@ -1487,7 +1487,7 @@ TransporterRegistry::startReceiving()
DBUG_PRINT("info",("Install signal handler for signum %d", DBUG_PRINT("info",("Install signal handler for signum %d",
g_ndb_shm_signum)); g_ndb_shm_signum));
struct sigaction sa; struct sigaction sa;
NdbThread_set_shm_sigmask(false); NdbThread_set_shm_sigmask(FALSE);
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_handler = shm_sig_handler; sa.sa_handler = shm_sig_handler;
sa.sa_flags = 0; sa.sa_flags = 0;
......
...@@ -462,7 +462,7 @@ void TransporterFacade::threadMainReceive(void) ...@@ -462,7 +462,7 @@ void TransporterFacade::threadMainReceive(void)
{ {
theTransporterRegistry->startReceiving(); theTransporterRegistry->startReceiving();
#ifdef NDB_SHM_TRANSPORTER #ifdef NDB_SHM_TRANSPORTER
NdbThread_set_shm_sigmask(true); NdbThread_set_shm_sigmask(TRUE);
#endif #endif
NdbMutex_Lock(theMutexPtr); NdbMutex_Lock(theMutexPtr);
theTransporterRegistry->update_connections(); theTransporterRegistry->update_connections();
...@@ -1384,7 +1384,7 @@ void PollGuard::wait_for_input(int wait_time) ...@@ -1384,7 +1384,7 @@ void PollGuard::wait_for_input(int wait_time)
such that we wake up also on interrupts on the shared memory such that we wake up also on interrupts on the shared memory
interrupt signal. interrupt signal.
*/ */
NdbThread_set_shm_sigmask(false); NdbThread_set_shm_sigmask(FALSE);
#endif #endif
m_tp->set_poll_owner(m_waiter); m_tp->set_poll_owner(m_waiter);
m_waiter->set_poll_owner(true); m_waiter->set_poll_owner(true);
...@@ -1417,7 +1417,7 @@ void PollGuard::unlock_and_signal() ...@@ -1417,7 +1417,7 @@ void PollGuard::unlock_and_signal()
If shared memory transporters are used we need to reset our sigmask If shared memory transporters are used we need to reset our sigmask
since we are no longer the thread to receive interrupts. since we are no longer the thread to receive interrupts.
*/ */
NdbThread_set_shm_sigmask(true); NdbThread_set_shm_sigmask(TRUE);
#endif #endif
m_waiter->set_poll_owner(false); m_waiter->set_poll_owner(false);
t_signal_cond_waiter= m_tp->rem_last_from_cond_wait_queue(); t_signal_cond_waiter= m_tp->rem_last_from_cond_wait_queue();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment