Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenWalnut
OpenWalnut Core
Commits
24e0d0f0
Commit
24e0d0f0
authored
Sep 30, 2009
by
schurade
Browse files
[FIX] fixed the mutex error, now OW quits with a seg faul again :)
parent
e37e9b45
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
10 deletions
+8
-10
src/common/WLogger.cpp
src/common/WLogger.cpp
+2
-5
src/common/WLogger.h
src/common/WLogger.h
+0
-5
src/kernel/WKernel.cpp
src/kernel/WKernel.cpp
+6
-0
No files found.
src/common/WLogger.cpp
View file @
24e0d0f0
...
...
@@ -39,7 +39,7 @@ WLogger::WLogger( std::string fileName, LogLevel level ):
m_STDERRLevel
(
LL_ERROR
),
m_LogFileLevel
(
level
),
m_LogFileName
(
fileName
),
m_
FinishRequested
(
false
)
m_
QueueMutex
(
)
{
addLogMessage
(
"Initalizing Logger"
,
"Logger"
,
LL_DEBUG
);
addLogMessage
(
"==============================================================================="
,
"Logger"
,
LL_INFO
);
...
...
@@ -87,7 +87,7 @@ void WLogger::setLogFileName( std::string fileName )
void
WLogger
::
addLogMessage
(
std
::
string
message
,
std
::
string
source
,
LogLevel
level
)
{
if
(
m_LogLevel
>
level
)
if
(
m_LogLevel
>
level
||
m_FinishRequested
)
{
return
;
}
...
...
@@ -98,9 +98,6 @@ void WLogger::addLogMessage( std::string message, std::string source, LogLevel l
boost
::
mutex
::
scoped_lock
l
(
m_QueueMutex
);
m_LogQueue
.
push
(
entry
);
// TODO(schurade): this must be called from the kernel
// processQueue();
}
...
...
src/common/WLogger.h
View file @
24e0d0f0
...
...
@@ -138,11 +138,6 @@ private:
*
*/
boost
::
mutex
m_QueueMutex
;
/**
*
*/
bool
m_FinishRequested
;
};
#endif // WLOGGER_H
src/kernel/WKernel.cpp
View file @
24e0d0f0
...
...
@@ -63,6 +63,11 @@ WKernel::~WKernel()
{
// cleanup
m_Logger
->
addLogMessage
(
"Shutting down Kernel"
,
"Kernel"
,
LL_DEBUG
);
// finish running thread
m_Logger
->
wait
(
true
);
// write remaining log messages
m_Logger
->
processQueue
();
}
WKernel
::
WKernel
(
const
WKernel
&
other
)
...
...
@@ -163,6 +168,7 @@ void WKernel::init()
// initalize Logger
m_Logger
=
boost
::
shared_ptr
<
WLogger
>
(
new
WLogger
()
);
m_Logger
->
run
();
// initialize graphics engine
// this also includes initialization of WGEScene and OpenSceneGraph
...
...
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