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
66043d56
Commit
66043d56
authored
19 years ago
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge
parents
41043bb3
ce6ffc3d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
14 deletions
+23
-14
ndb/src/common/logger/LogHandler.cpp
ndb/src/common/logger/LogHandler.cpp
+2
-2
ndb/src/kernel/main.cpp
ndb/src/kernel/main.cpp
+2
-10
ndb/src/kernel/vm/Emulator.cpp
ndb/src/kernel/vm/Emulator.cpp
+17
-1
ndb/src/kernel/vm/Emulator.hpp
ndb/src/kernel/vm/Emulator.hpp
+2
-1
No files found.
ndb/src/common/logger/LogHandler.cpp
View file @
66043d56
...
...
@@ -76,15 +76,15 @@ LogHandler::append_impl(const char* pCategory, Logger::LoggerLevel level,
const
char
*
pMsg
)
{
writeHeader
(
pCategory
,
level
);
if
(
m_count_repeated_messages
==
0
)
if
(
m_count_repeated_messages
<=
1
)
writeMessage
(
pMsg
);
else
{
BaseString
str
(
pMsg
);
str
.
appfmt
(
" - Repeated %d times"
,
m_count_repeated_messages
);
writeMessage
(
str
.
c_str
());
m_count_repeated_messages
=
0
;
}
m_count_repeated_messages
=
0
;
writeFooter
();
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/main.cpp
View file @
66043d56
...
...
@@ -187,11 +187,9 @@ int main(int argc, char** argv)
assert
(
"Illegal state globalData.theRestartFlag"
==
0
);
}
SocketServer
socket_server
;
globalTransporterRegistry
.
startSending
();
globalTransporterRegistry
.
startReceiving
();
if
(
!
globalTransporterRegistry
.
start_service
(
socket_server
)){
if
(
!
globalTransporterRegistry
.
start_service
(
*
globalEmulatorData
.
m_
socket_server
)){
ndbout_c
(
"globalTransporterRegistry.start_service() failed"
);
exit
(
-
1
);
}
...
...
@@ -203,7 +201,7 @@ int main(int argc, char** argv)
globalEmulatorData
.
theWatchDog
->
doStart
();
socket_server
.
startServer
();
globalEmulatorData
.
m_socket_server
->
startServer
();
struct
ndb_mgm_reply
mgm_reply
;
for
(
unsigned
int
i
=
0
;
i
<
globalTransporterRegistry
.
m_transporter_interface
.
size
();
i
++
)
...
...
@@ -215,18 +213,12 @@ int main(int argc, char** argv)
&
mgm_reply
);
// theConfig->closeConfiguration();
globalEmulatorData
.
theThreadConfig
->
ipControlLoop
();
NdbShutdown
(
NST_Normal
);
socket_server
.
stopServer
();
socket_server
.
stopSessions
();
globalTransporterRegistry
.
stop_clients
();
return
NRT_Default
;
}
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/vm/Emulator.cpp
View file @
66043d56
...
...
@@ -68,6 +68,7 @@ EmulatorData::EmulatorData(){
theThreadConfig
=
0
;
theSimBlockList
=
0
;
theShutdownMutex
=
0
;
m_socket_server
=
0
;
}
void
...
...
@@ -83,6 +84,7 @@ EmulatorData::create(){
theWatchDog
=
new
WatchDog
();
theThreadConfig
=
new
ThreadConfig
();
theSimBlockList
=
new
SimBlockList
();
m_socket_server
=
new
SocketServer
();
theShutdownMutex
=
NdbMutex_Create
();
...
...
@@ -99,7 +101,8 @@ EmulatorData::destroy(){
delete
theThreadConfig
;
theThreadConfig
=
0
;
if
(
theSimBlockList
)
delete
theSimBlockList
;
theSimBlockList
=
0
;
if
(
m_socket_server
)
delete
m_socket_server
;
m_socket_server
=
0
;
NdbMem_Destroy
();
}
...
...
@@ -195,9 +198,22 @@ NdbShutdown(NdbShutdownType type,
fclose
(
outputStream
);
#endif
/**
* Stop all transporter connection attempts and accepts
*/
globalEmulatorData
.
m_socket_server
->
stopServer
();
globalEmulatorData
.
m_socket_server
->
stopSessions
();
globalTransporterRegistry
.
stop_clients
();
/**
* Stop transporter communication with other nodes
*/
globalTransporterRegistry
.
stopSending
();
globalTransporterRegistry
.
stopReceiving
();
/**
* Remove all transporters
*/
globalTransporterRegistry
.
removeAll
();
#ifdef VM_TRACE
...
...
This diff is collapsed.
Click to expand it.
ndb/src/kernel/vm/Emulator.hpp
View file @
66043d56
...
...
@@ -55,7 +55,8 @@ struct EmulatorData {
class
WatchDog
*
theWatchDog
;
class
ThreadConfig
*
theThreadConfig
;
class
SimBlockList
*
theSimBlockList
;
class
SocketServer
*
m_socket_server
;
/**
* Constructor
*
...
...
This diff is collapsed.
Click to expand it.
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