X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=422f0789cb11d939c6aa0517060a6c48222473cf;hb=ab3dc69a71af640fa49cbd917272d9ff7d1651b6;hp=a46a60bb6fb731bbe6de29edf8ad66d4a9f7777d;hpb=45047706a3b35c8ba3a09e032fa2bf25d4075793;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index a46a60bb..422f0789 100644 --- a/src/gdcmDebug.h +++ b/src/gdcmDebug.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDebug.h,v $ Language: C++ - Date: $Date: 2005/01/07 20:31:36 $ - Version: $Revision: 1.14 $ + Date: $Date: 2005/01/20 11:07:07 $ + Version: $Revision: 1.24 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,11 @@ #include "gdcmCommon.h" +#include +#include +#include +#include + namespace gdcm { //----------------------------------------------------------------------------- @@ -42,10 +47,25 @@ class GDCM_EXPORT Debug public: /// This is a global flag that controls whether any debug, warning /// messages are displayed. - static int GetDebugFlag (); - static void SetDebugFlag (int flag); - static void SetDebugOn () { SetDebugFlag(1); }; - static void SetDebugOff () { SetDebugFlag(0); }; + static bool GetDebugFlag (); + static void SetDebugFlag (bool flag); + static void SetDebugOn () { SetDebugFlag(true); }; + static void SetDebugOff () { SetDebugFlag(false); }; + + /// This is a global flag that controls if debug are redirected + /// to a file or not + static bool GetDebugToFile (); + static void SetDebugToFile (bool flag); + static void SetDebugToFileOn () { SetDebugToFile(true); }; + static void SetDebugToFileOff () { SetDebugToFile(false); }; + + /// Set the filename the debug stream should be redirect to + /// Settting a filename also set DebugToFile to true + static void SetDebugFilename (std::string const& filename); + + /// Internal use only. Allow us to retrieve the static from anywhere + /// in gdcm code + static std::ofstream & GetDebugFile (); }; } // end namespace gdcm @@ -57,58 +77,89 @@ public: // __FUNCTION is not always defined by preprocessor // In c++ we should use __PRETTY_FUNCTION__ instead... -#ifndef __GNUC__ -# define __FUNCTION__ "" +#ifdef GDCM_COMPILER_HAS_FUNCTION +// Handle particular case for GNU C++ which also defines __PRETTY_FUNCTION__ +// which is a lot nice in C++ +#ifdef __BORLANDC__ +# define __FUNCTION__ __FUNC__ #endif +#ifdef __GNUC__ +# define GDCM_FUNCTION __PRETTY_FUNCTION__ +#else +# define GDCM_FUNCTION __FUNCTION__ +#endif //__GNUC__ +#else +# define GDCM_FUNCTION "" +#endif //GDCM_COMPILER_HAS_FUNCTION /** * \brief Debug * @param msg message part */ -#define gdcmDebugMacro(msg) \ -{ \ - if( gdcm::Debug::GetDebugFlag() ) \ - { \ - std::ostringstream osmacro; \ - osmacro << "Debug: In " __FILE__ ", line " << __LINE__ \ - << ", function " << __FUNCTION__ << '\n' \ - << msg << "\n\n"; \ - std::cerr << osmacro.str() << std::endl; \ - } \ +#ifdef NDEBUG +#define gdcmDebugMacro(msg) +#else +#define gdcmDebugMacro(msg) \ +{ \ + if( Debug::GetDebugFlag() ) \ + { \ + std::ostringstream osmacro; \ + osmacro << "Debug: In " __FILE__ ", line " << __LINE__ \ + << ", function " << GDCM_FUNCTION << '\n' \ + << "Last system error was: " << strerror(errno) \ + << '\n' << msg << "\n\n"; \ + if( Debug::GetDebugToFile() ) \ + Debug::GetDebugFile() << osmacro.str() << std::endl; \ + else \ + std::cerr << osmacro.str() << std::endl; \ + } \ } +#endif //NDEBUG /** * \brief Verbose * @param msg message part */ +#ifdef NDEBUG +#define gdcmVerboseMacro(msg) \ +{ \ +} +#else #define gdcmVerboseMacro(msg) \ { \ - if( gdcm::Debug::GetDebugFlag() ) \ + if( Debug::GetDebugFlag() ) \ { \ std::ostringstream osmacro; \ osmacro << "Verbose: In " __FILE__ ", line " << __LINE__ \ - << ", function " << __FUNCTION__ << "\n" \ + << ", function " << GDCM_FUNCTION << "\n" \ << msg << "\n\n"; \ - std::cerr << osmacro.str() << std::endl; \ + if( Debug::GetDebugToFile() ) \ + Debug::GetDebugFile() << osmacro.str() << std::endl; \ + else \ + std::cerr << osmacro.str() << std::endl; \ } \ } +#endif //NDEBUG /** * \brief Error * @param msg second message part */ -#define gdcmErrorMacro(msg) \ -{ \ - if( gdcm::Debug::GetDebugFlag() ) \ - { \ - std::ostringstream osmacro; \ - osmacro << "Error: In " __FILE__ ", line " << __LINE__ \ - << ", function " << __FUNCTION__ << '\n' \ - << msg << "\n\n"; \ - std::cerr << osmacro.str() << std::endl; \ - exit(1); \ - } \ +#ifdef NDEBUG +#define gdcmErrorMacro(msg) +#else +#define gdcmErrorMacro(msg) \ +{ \ + std::ostringstream osmacro; \ + osmacro << "Error: In " __FILE__ ", line " << __LINE__ \ + << ", function " << GDCM_FUNCTION << '\n' \ + << msg << "\n\n"; \ + if( Debug::GetDebugToFile() ) \ + Debug::GetDebugFile() << osmacro.str() << std::endl; \ + else \ + std::cerr << osmacro.str() << std::endl; \ } +#endif //NDEBUG /** * \brief Assert @@ -116,17 +167,24 @@ public: * An easy solution to pass also a message is to do: * gdcmAssertMacro( "my message" && 2 < 3 ) */ -#define gdcmAssertMacro(arg) \ -{ \ - if( arg ) \ - { \ - std::ostringstream osmacro; \ - osmacro << "Assert: In " __FILE__ ", line " << __LINE__ \ - << ", function " << __FUNCTION__ \ - << "\n\n"; \ - std::cerr << osmacro.str() << std::endl; \ - assert ( arg ); \ - } \ +#ifdef NDEBUG +#define gdcmAssertMacro(arg) +#else +#define gdcmAssertMacro(arg) \ +{ \ + if( !(arg) ) \ + { \ + std::ostringstream osmacro; \ + osmacro << "Assert: In " __FILE__ ", line " << __LINE__ \ + << ", function " << GDCM_FUNCTION \ + << "\n\n"; \ + if( Debug::GetDebugToFile() ) \ + Debug::GetDebugFile() << osmacro.str() << std::endl; \ + else \ + std::cerr << osmacro.str() << std::endl; \ + assert ( arg ); \ + } \ } +#endif //NDEBUG #endif