projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.3
[fms.git]
/
src
/
logfile.cpp
diff --git
a/src/logfile.cpp
b/src/logfile.cpp
index
ab5b86f
..
7e632f9
100644
(file)
--- a/
src/logfile.cpp
+++ b/
src/logfile.cpp
@@
-36,7
+36,8
@@
LogFile::~LogFile()
\r
bool LogFile::CloseFile()
\r
{
\r
\r
bool LogFile::CloseFile()
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r
@@
-51,7
+52,8
@@
bool LogFile::OpenFile()
{
\r
CloseFile();
\r
\r
{
\r
CloseFile();
\r
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
\r
m_fileptr=fopen(m_filename.c_str(),"a+b");
\r
\r
\r
m_fileptr=fopen(m_filename.c_str(),"a+b");
\r
\r
@@
-91,7
+93,8
@@
void LogFile::WriteLog(const char *format, ...)
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
@@
-117,7
+120,8
@@
void LogFile::WriteLog(const std::string &text)
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
@@
-146,7
+150,8
@@
void LogFile::WriteLog(const LogLevel level, const char *format, ...)
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
@@
-178,7
+183,8
@@
void LogFile::WriteLog(const LogLevel level, const std::string &text)
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
if(m_writedate)
\r
{
\r
WriteDate();
\r
@@
-227,7
+233,8
@@
void LogFile::WriteLogLevel(LogLevel level)
\r
void LogFile::WriteNewLine()
\r
{
\r
\r
void LogFile::WriteNewLine()
\r
{
\r
- ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ //ZThread::Guard<ZThread::Mutex> g(m_logmutex);
\r
+ PThread::Guard g(m_logmutex);
\r
\r
if(m_fileptr)
\r
{
\r
\r
if(m_fileptr)
\r
{
\r