X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fdebug%2Flogstream.hxx;h=d3649a4a21b3cf5912dd20778d9daf39abb37b5b;hb=a668e47fa180ca6efb592a9406dcbe9909d69adf;hp=e2977bf6d412863efce066f4e65223ac35add37e;hpb=65fa6f2f0045a61896c3875d09519407e559aba7;p=simgear.git diff --git a/simgear/debug/logstream.hxx b/simgear/debug/logstream.hxx index e2977bf6..d3649a4a 100644 --- a/simgear/debug/logstream.hxx +++ b/simgear/debug/logstream.hxx @@ -16,49 +16,29 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Library General Public License for more details. // -// You should have received a copy of the GNU Library General Public -// License along with this library; if not, write to the -// Free Software Foundation, Inc., 59 Temple Place - Suite 330, -// Boston, MA 02111-1307, USA. +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // // $Id$ #ifndef _LOGSTREAM_H #define _LOGSTREAM_H -#ifdef HAVE_CONFIG_H -# include -#endif - #include -// At least Irix needs this -#ifdef SG_HAVE_NATIVE_SGI_COMPILERS -#include +#ifdef _WIN32 +# include #endif -#ifdef SG_HAVE_STD_INCLUDES -# include -# include -#else -# include -# include -#endif +#include +#include +#include #include -#ifndef SG_HAVE_NATIVE_SGI_COMPILERS -SG_USING_STD(streambuf); -SG_USING_STD(ostream); -SG_USING_STD(cerr); -SG_USING_STD(endl); -#else -SG_USING_STD(char_traits); -#endif - -#ifdef __MWERKS__ -SG_USING_STD(iostream); -#endif +using std::streambuf; +using std::ostream; // // TODO: @@ -73,23 +53,23 @@ SG_USING_STD(iostream); * messages at runtime. Only messages with priority >= logbuf::logPriority * and debugClass == logbuf::logClass are output. */ -class logbuf : public streambuf +#ifdef SG_NEED_STREAMBUF_HACK +class logbuf : public __streambuf +#else +class logbuf : public std::streambuf +#endif { public: - -#ifndef SG_HAVE_STD_INCLUDES - typedef char_traits traits_type; - typedef char_traits::int_type int_type; - // typedef char_traits::pos_type pos_type; - // typedef char_traits::off_type off_type; -#endif // logbuf( streambuf* sb ) : sbuf(sb) {} /** Constructor */ logbuf(); + /** Destructor */ ~logbuf(); - /** Is logging enabled? */ + /** + * Is logging enabled? + * @return true or false*/ bool enabled() { return logging_enabled; } /** @@ -99,6 +79,8 @@ public: */ void set_log_state( sgDebugClass c, sgDebugPriority p ); + bool would_log( sgDebugClass c, sgDebugPriority p ) const; + /** * Set the global logging level. * @param c debug class @@ -106,11 +88,44 @@ public: */ static void set_log_level( sgDebugClass c, sgDebugPriority p ); + + /** + * Set the allowed logging classes. + * @param c All enabled logging classes anded together. + */ + static void set_log_classes (sgDebugClass c); + + + /** + * Get the logging classes currently enabled. + * @return All enabled debug logging anded together. + */ + static sgDebugClass get_log_classes (); + + + /** + * Set the logging priority. + * @param c The priority cutoff for logging messages. + */ + static void set_log_priority (sgDebugPriority p); + + + /** + * Get the current logging priority. + * @return The priority cutoff for logging messages. + */ + static sgDebugPriority get_log_priority (); + + /** * Set the stream buffer * @param sb stream buffer */ - void set_sb( streambuf* sb ); + void set_sb( std::streambuf* sb ); + +#ifdef _WIN32 + static void has_no_console() { has_console = false; } +#endif protected: @@ -124,9 +139,12 @@ protected: private: // The streambuf used for actual output. Defaults to cerr.rdbuf(). - static streambuf* sbuf; + static std::streambuf* sbuf; static bool logging_enabled; +#ifdef _WIN32 + static bool has_console; +#endif static sgDebugClass logClass; static sgDebugPriority logPriority; @@ -140,11 +158,7 @@ private: inline int logbuf::sync() { -#ifdef SG_HAVE_STD_INCLUDES return sbuf->pubsync(); -#else - return sbuf->sync(); -#endif } inline void @@ -153,10 +167,31 @@ logbuf::set_log_state( sgDebugClass c, sgDebugPriority p ) logging_enabled = ((c & logClass) != 0 && p >= logPriority); } +inline bool +logbuf::would_log( sgDebugClass c, sgDebugPriority p ) const +{ + return ((c & logClass) != 0 && p >= logPriority); +} + inline logbuf::int_type logbuf::overflow( int c ) { +#ifdef _WIN32 + if ( logging_enabled ) { + if ( !has_console ) { + AllocConsole(); + freopen("conin$", "r", stdin); + freopen("conout$", "w", stdout); + freopen("conout$", "w", stderr); + has_console = true; + } + return sbuf->sputc(c); + } + else + return EOF == 0 ? 1: 0; +#else return logging_enabled ? sbuf->sputc(c) : (EOF == 0 ? 1: 0); +#endif } /** @@ -189,23 +224,23 @@ struct logstream_base /** * Class to manage the debug logging stream. */ -class logstream : private logstream_base, public ostream +class logstream : private logstream_base, public std::ostream { public: /** * The default is to send messages to cerr. * @param out output stream */ - logstream( ostream& out ) + logstream( std::ostream& out ) // : logstream_base(out.rdbuf()), : logstream_base(), - ostream(&lbuf) { lbuf.set_sb(out.rdbuf());} + std::ostream(&lbuf) { lbuf.set_sb(out.rdbuf());} /** * Set the output stream * @param out output stream */ - void set_output( ostream& out ) { lbuf.set_sb( out.rdbuf() ); } + void set_output( std::ostream& out ) { lbuf.set_sb( out.rdbuf() ); } /** * Set the global log class and priority level. @@ -214,31 +249,40 @@ public: */ void setLogLevels( sgDebugClass c, sgDebugPriority p ); + bool would_log( sgDebugClass c, sgDebugPriority p ) const + { + return lbuf.would_log( c, p ); + }; + /** * Output operator to capture the debug level and priority of a message. * @param l log level */ - inline ostream& operator<< ( const loglevel& l ); + inline std::ostream& operator<< ( const loglevel& l ); + friend logstream& sglog(); + static logstream *initGlobalLogstream(); +protected: + static logstream *global_logstream; }; -inline ostream& +inline std::ostream& logstream::operator<< ( const loglevel& l ) { lbuf.set_log_state( l.logClass, l.logPriority ); return *this; } - /** + * \relates logstream * Return the one and only logstream instance. * We use a function instead of a global object so we are assured that cerr * has been initialised. + * @return current logstream */ inline logstream& sglog() { - static logstream logstrm( cerr ); - return logstrm; + return *logstream::initGlobalLogstream(); } @@ -250,12 +294,15 @@ sglog() */ #ifdef FG_NDEBUG # define SG_LOG(C,P,M) -#elif defined( __MWERKS__ ) -# define SG_LOG(C,P,M) ::sglog() << ::loglevel(C,P) << M << std::endl #else -# define SG_LOG(C,P,M) sglog() << loglevel(C,P) << M << endl +# define SG_LOG(C,P,M) do { \ + logstream& __tmplogstreamref(sglog()); \ + if(__tmplogstreamref.would_log(C,P)) { \ + __tmplogstreamref << loglevel(C,P) << M << std::endl; } \ + } while(0) #endif +#define SG_ORIGIN __FILE__ ":" SG_STRINGIZE(__LINE__) #endif // _LOGSTREAM_H