nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleaning & doc

Browse source
This commit is contained in:
LPTK 2013-06-12 11:58:38 +02:00
commit a0464934cb
3 changed files with 11 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

34
eo/src/utils/eoLogger.cpp
View file

@ -41,10 +41,6 @@ Caner Candan <caner.candan@thalesgroup.com>
#include "eoLogger.h"
/* TODO?
add a possibility to redirect to several streams
add_redirect/remove_redirect
*/
#ifdef USE_SET
typedef std::set<std::ostream*>::iterator StreamIter;
@ -85,7 +81,6 @@ eoLogger::eoLogger() :
eoLogger::~eoLogger()
{
//redirect(NULL);
if (_obuf._ownedFileStream != NULL) {
delete _obuf._ownedFileStream;
}
@ -187,7 +182,6 @@ void eoLogger::doRedirect(std::ostream* os)
}
_obuf._outStreams.clear();
if (os != NULL)
//_obuf._outStreams.push_back(os);
#ifdef USE_SET
_obuf._outStreams.insert(os);
#else
@ -197,13 +191,7 @@ void eoLogger::doRedirect(std::ostream* os)
void eoLogger::addRedirect(std::ostream& os)
{
/*
if (tryRemoveRedirect(&os))
//throw eoWrongParamTypeException("Cannot redirect the logger to a stream it is already redirected to");
//eo::log << eo::warnings << "Cannot redirect the logger to a stream it is already redirected to.";
{ eo::log << eo::warnings << "Cannot redirect the logger to a stream it is already redirected to."; std::cout << "OK!!!" << std::endl; }*/
bool already_there = tryRemoveRedirect(&os);
//_obuf._outStreams.push_back(&os);
#ifdef USE_SET
_obuf._outStreams.insert(&os);
#else
@ -216,33 +204,11 @@ void eoLogger::addRedirect(std::ostream& os)
void eoLogger::removeRedirect(std::ostream& os)
{
if (!tryRemoveRedirect(&os))
//throw eoWrongParamTypeException("Cannot remove from the logger a stream it was not redirected to");
//throw eoWrongParamTypeException(std::string("Cannot remove from the logger a stream it was not redirected to"));
eo::log << eo::warnings << "Cannot remove from the logger a stream it was not redirected to.";
}
bool eoLogger::tryRemoveRedirect(std::ostream* os)
{
/*
std::vector<std::ostream*>::iterator it = find(_obuf._outStreams.begin(), _obuf._outStreams.end(), os);
//std::cout << _obuf._outStreams.size() << " " << (void*)&*_obuf._outStreams.begin() << " " << (void*)&*_obuf._outStreams.end() << std::endl;
//std::cout << "it: " << (void*)&*it << " " << (void*)os << std::endl;
if (it == _obuf._outStreams.end())
return false;
_obuf._outStreams.erase(it);
return true;*/
/*
#ifdef USE_SET
std::set<std::ostream*>::iterator it = find(_obuf._outStreams.begin(), _obuf._outStreams.end(), os);
if (it == _obuf._outStreams.end())
return false;
_obuf._outStreams.erase(it);
#else
std::vector<std::ostream*>::iterator it = find(_obuf._outStreams.begin(), _obuf._outStreams.end(), os);
if (it == _obuf._outStreams.end())
return false;
_obuf._outStreams.erase(it);
#endif*/
StreamIter it = find(_obuf._outStreams.begin(), _obuf._outStreams.end(), os);
if (it == _obuf._outStreams.end())
return false;

18
eo/src/utils/eoLogger.h
View file

@ -48,8 +48,12 @@ Caner Candan <caner.candan@thalesgroup.com>
#include "eoObject.h"
#include "eoParser.h"
#define USE_SET
//#undef USE_SET
#define USE_SET // defines if a set is to be used instead of a vector for storing streams the logger is redirected to
#undef USE_SET
/* expriments have shown that here a vector is by far faster than a set even if O(n),
* because it needs less dynamic allocations, uses less memory and less instructions
*/
#ifdef USE_SET
#include <set>
@ -71,16 +75,6 @@ namespace eo
debug,
xdebug};
/**
* file
* this structure combined with the friend operator<< below is an easy way to select a file as output.
*
struct file
{
explicit file(const std::string f);
const std::string _f;
};*/
/**
* setlevel
* this structure combined with the friend operator<< below is an easy way to set a verbose level.