This changes the design of the LogBackend class and its subclasses, now the main virtual method is addTaggedMessage(). The former virtual method addMessage() is now a regular non-virtual method forwarding to addTaggedMessage(). You can configure message limiting based on tags by passing a MessageLimiter to the configureMessageLimiter() method, which will then be used by the includeMessage() method. That method now takes an additional tag argument. The most user-visible part of this is that there are new overloads of the static methods OpmLog::warning(), OpmLog::error() etc, that take message tags. To tie things together the OpmLog and Logger classes have also gotten new addTaggedMessage() methods, but they should mostly be used through the convenience methods such as OpmLog::warning().
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
/*
|
|
Copyright 2014 Statoil ASA.
|
|
|
|
This file is part of the Open Porous Media project (OPM).
|
|
|
|
OPM is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OPM is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <stdexcept>
|
|
#include <cassert>
|
|
#include <iomanip>
|
|
|
|
#include <opm/common/OpmLog/OpmLog.hpp>
|
|
#include <opm/common/OpmLog/LogUtil.hpp>
|
|
#include <opm/common/OpmLog/TimerLog.hpp>
|
|
#include <opm/common/OpmLog/StreamLog.hpp>
|
|
|
|
|
|
|
|
namespace Opm {
|
|
|
|
TimerLog::TimerLog(const std::string& logFile) : StreamLog( logFile , StopTimer | StartTimer )
|
|
{
|
|
m_work.precision(8);
|
|
}
|
|
|
|
TimerLog::TimerLog(std::ostream& os) : StreamLog( os , StopTimer | StartTimer )
|
|
{
|
|
m_work.precision(8);
|
|
}
|
|
|
|
|
|
|
|
void TimerLog::addTaggedMessage(int64_t messageType, const std::string& messageTag, const std::string& msg ) {
|
|
if (messageType == StopTimer) {
|
|
clock_t stop = clock();
|
|
double secondsElapsed = 1.0 * (m_start - stop) / CLOCKS_PER_SEC ;
|
|
|
|
m_work.str("");
|
|
m_work << std::fixed << msg << ": " << secondsElapsed << " seconds ";
|
|
StreamLog::addTaggedMessage( messageType, messageTag, m_work.str());
|
|
} else {
|
|
if (messageType == StartTimer)
|
|
m_start = clock();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
} // namespace Opm
|