Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6d1bd029
Commit
6d1bd029
authored
Jul 27, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes
parent
6cc3eee4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
storage/ndb/src/common/portlib/NdbThread.c
storage/ndb/src/common/portlib/NdbThread.c
+2
-2
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/common/transporter/TransporterRegistry.cpp
+2
-2
storage/ndb/src/ndbapi/TransporterFacade.cpp
storage/ndb/src/ndbapi/TransporterFacade.cpp
+3
-3
No files found.
storage/ndb/src/common/portlib/NdbThread.c
View file @
6d1bd029
...
@@ -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
;
...
...
storage/ndb/src/common/transporter/TransporterRegistry.cpp
View file @
6d1bd029
...
@@ -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
;
...
...
storage/ndb/src/ndbapi/TransporterFacade.cpp
View file @
6d1bd029
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment