diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 8ad88c48..62f03539 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -111,6 +111,7 @@ The full set of tests is only run for tagged releases. - use unique_ptr instead of free pointers, avoid explicit `delete` - add and use move semantic in RlinkCommandExpect - use c++ style casts (gcc/clang -Wold-style-cast) + - use std::boolalpha; add and use Rprintf(bool); - completely replace boost with std - use std::unique_ptr instead of boost::scoped_ptr - use std::shared_ptr instead of boost diff --git a/tools/src/librlink/ReventLoop.cpp b/tools/src/librlink/ReventLoop.cpp index b4d56d8a..9d2a8822 100644 --- a/tools/src/librlink/ReventLoop.cpp +++ b/tools/src/librlink/ReventLoop.cpp @@ -1,4 +1,4 @@ -// $Id: ReventLoop.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: ReventLoop.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.2.6 use RosPrintf(bool) // 2018-12-18 1089 1.2.5 use c++ style casts // 2018-12-17 1085 1.2.4 use std::lock_guard instead of boost // 2018-12-15 1083 1.2.3 AddPollHandler(): use rval ref and move @@ -191,8 +192,8 @@ void ReventLoop::Dump(std::ostream& os, int ind, const char* text, { RosFill bl(ind); os << bl << (text?text:"--") << "ReventLoop @ " << this << endl; - os << bl << " fStopPending: " << fStopPending << endl; - os << bl << " fUpdatePoll: " << fUpdatePoll << endl; + os << bl << " fStopPending: " << RosPrintf(fStopPending) << endl; + os << bl << " fUpdatePoll: " << RosPrintf(fUpdatePoll) << endl; { lock_guard lock(const_cast(this)->fPollDscMutex); os << bl << " fPollDsc.size: " << fPollDsc.size() << endl; diff --git a/tools/src/librlink/RlinkCommand.cpp b/tools/src/librlink/RlinkCommand.cpp index e47e27ca..9459eab8 100644 --- a/tools/src/librlink/RlinkCommand.cpp +++ b/tools/src/librlink/RlinkCommand.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkCommand.cpp 1076 2018-12-02 12:45:49Z mueller $ +// $Id: RlinkCommand.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2011-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.4.1 use RosPrintf(bool) // 2018-12-01 1076 1.4 use unique_ptr // 2017-04-07 868 1.3.2 Dump(): add detail arg // 2017-03-11 859 1.3.1 add CommandInfo() @@ -528,6 +529,7 @@ void RlinkCommand::Dump(std::ostream& os, int ind, const char* text, } os << endl; } + os << bl << " fExpectStatusSet:" << RosPrintf(fExpectStatusSet) << endl; os << bl << " fExpectStatusVal:" << RosPrintBvi(fExpectStatusVal,0) << endl; os << bl << " fExpectStatusMsk:" << RosPrintBvi(fExpectStatusMsk,0) << endl; if (fupExpect) fupExpect->Dump(os, ind+2, "fupExpect: ", detail); diff --git a/tools/src/librlink/RlinkConnect.cpp b/tools/src/librlink/RlinkConnect.cpp index 2ec13f2d..82a634a9 100644 --- a/tools/src/librlink/RlinkConnect.cpp +++ b/tools/src/librlink/RlinkConnect.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkConnect.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: RlinkConnect.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2011-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 2.8.3 use RosPrintf(bool) // 2018-12-18 1089 2.8.2 use c++ style casts // 2018-12-17 1085 2.8.1 use std::lock_guard instead of boost // 2018-12-08 1079 2.8 add HasPort(); return ref for Port() @@ -689,15 +690,16 @@ void RlinkConnect::Dump(std::ostream& os, int ind, const char* text, os << bl << (text?text:"--") << "RlinkConnect @ " << this << endl; if (HasPort()) { - Port().Dump(os, ind+2, "fupPort: ", detail); + Port().Dump(os, ind+2, "fupPort: ", detail); } else { - os << bl << " fupPort: " << fupPort.get() << endl; + os << bl << " fupPort: " << fupPort.get() << endl; } - os << bl << " fLinkInitDone: " << fLinkInitDone << endl; + os << bl << " fLinkInitDeferred:" << RosPrintf(fLinkInitDeferred) << endl; + os << bl << " fLinkInitDone: " << RosPrintf(fLinkInitDone) << endl; - os << bl << " fpServ: " << fpServ << endl; - os << bl << " fSeqNumber: "; + os << bl << " fpServ: " << fpServ << endl; + os << bl << " fSeqNumber: "; for (auto& o: fSeqNumber) os << RosPrintBvi(o,16) << " "; os << endl; @@ -706,18 +708,18 @@ void RlinkConnect::Dump(std::ostream& os, int ind, const char* text, fContext.Dump(os, ind+2, "fContext: ", detail); fAddrMap.Dump(os, ind+2, "fAddrMap: ", detail-1); fStats.Dump(os, ind+2, "fStats: ", detail-1); - os << bl << " fLogBaseAddr: " << fLogBaseAddr << endl; - os << bl << " fLogBaseData: " << fLogBaseData << endl; - os << bl << " fLogBaseStat: " << fLogBaseStat << endl; - os << bl << " fPrintLevel: " << fPrintLevel << endl; - os << bl << " fDumpLevel " << fDumpLevel << endl; - os << bl << " fTraceLevel " << fTraceLevel << endl; + os << bl << " fLogBaseAddr: " << fLogBaseAddr << endl; + os << bl << " fLogBaseData: " << fLogBaseData << endl; + os << bl << " fLogBaseStat: " << fLogBaseStat << endl; + os << bl << " fPrintLevel: " << fPrintLevel << endl; + os << bl << " fDumpLevel " << fDumpLevel << endl; + os << bl << " fTraceLevel " << fTraceLevel << endl; fspLog->Dump(os, ind+2, "fspLog: "); - os << bl << " fAttnNotiPatt: " << RosPrintBvi(fAttnNotiPatt,16) << endl; - os << bl << " fTsLastAttnNoti: " << fTsLastAttnNoti << endl; - os << bl << " fSysId: " << RosPrintBvi(fSysId,16) << endl; - os << bl << " fUsrAcc: " << RosPrintBvi(fUsrAcc,16) << endl; - os << bl << " fRbufSize: " << RosPrintf(fRbufSize,"d",6) << endl; + os << bl << " fAttnNotiPatt: " << RosPrintBvi(fAttnNotiPatt,16) << endl; + os << bl << " fTsLastAttnNoti: " << fTsLastAttnNoti << endl; + os << bl << " fSysId: " << RosPrintBvi(fSysId,16) << endl; + os << bl << " fUsrAcc: " << RosPrintBvi(fUsrAcc,16) << endl; + os << bl << " fRbufSize: " << RosPrintf(fRbufSize,"d",6) << endl; return; } diff --git a/tools/src/librlink/RlinkPacketBufSnd.cpp b/tools/src/librlink/RlinkPacketBufSnd.cpp index 8f03426b..6c21a734 100644 --- a/tools/src/librlink/RlinkPacketBufSnd.cpp +++ b/tools/src/librlink/RlinkPacketBufSnd.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkPacketBufSnd.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: RlinkPacketBufSnd.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2014-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.2.2 use RosPrintf(bool) // 2018-12-18 1089 1.2.1 use c++ style casts // 2018-12-08 1079 1.2 use ref not ptr for RlinkPort // 2017-04-07 868 1.1.1 Dump(): add detail arg @@ -219,7 +220,7 @@ void RlinkPacketBufSnd::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPacketBufSnd @ " << this << endl; - os << bl << " fXonEscape: " << fXonEscape << endl; + os << bl << " fXonEscape: " << RosPrintf(fXonEscape) << endl; size_t rawbufsize = fRawBuf.size(); os << bl << " fRawBuf(size): " << RosPrintf(rawbufsize,"d",4); diff --git a/tools/src/librlink/RlinkPort.cpp b/tools/src/librlink/RlinkPort.cpp index e0ca8e97..134726be 100644 --- a/tools/src/librlink/RlinkPort.cpp +++ b/tools/src/librlink/RlinkPort.cpp @@ -1,4 +1,4 @@ -// $Id: RlinkPort.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: RlinkPort.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2011-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.4.4 use RosPrintf(bool) // 2018-12-18 1089 1.4.3 use c++ style casts // 2017-04-29 888 1.4.2 BUGFIX: RawRead(): proper irc for exactsize=false // 2017-04-07 868 1.4.1 Dump(): add detail arg @@ -300,9 +301,9 @@ void RlinkPort::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "RlinkPort @ " << this << endl; - os << bl << " fIsOpen: " << int(fIsOpen) << endl; + os << bl << " fIsOpen: " << RosPrintf(fIsOpen) << endl; fUrl.Dump(os, ind+2, "fUrl: "); - os << bl << " fXon: " << fXon << endl; + os << bl << " fXon: " << RosPrintf(fXon) << endl; os << bl << " fFdRead: " << fFdRead << endl; os << bl << " fFdWrite: " << fFdWrite << endl; os << bl << " fspLog: " << fspLog.get() << endl; diff --git a/tools/src/librtools/RlogFile.cpp b/tools/src/librtools/RlogFile.cpp index b8607551..50f4ae4e 100644 --- a/tools/src/librtools/RlogFile.cpp +++ b/tools/src/librtools/RlogFile.cpp @@ -1,4 +1,4 @@ -// $Id: RlogFile.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: RlogFile.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2011-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.2.4 use RosPrintf(bool) // 2018-12-18 1089 1.2.3 use c++ style casts // 2018-12-17 1085 1.2.2 use std::lock_guard instead of boost // 2017-03-04 858 2.2.1 use clock_gettime instead of gettimeofday @@ -180,7 +181,7 @@ void RlogFile::Dump(std::ostream& os, int ind, const char* text) const os << bl << (text?text:"--") << "RlogFile @ " << this << endl; os << bl << " fpExtStream: " << fpExtStream << endl; os << bl << " fIntStream.isopen " << fIntStream.is_open() << endl; - os << bl << " fNew " << fNew << endl; + os << bl << " fNew " << RosPrintf(fNew) << endl; os << bl << " fName " << fName << endl; os << bl << " fTagYr,Mo,Dy " << fTagYear << ", " << fTagMonth << ", " << fTagDay << endl; diff --git a/tools/src/librtools/RosPrintf.hpp b/tools/src/librtools/RosPrintf.hpp index 0ca4a450..9bf0f835 100644 --- a/tools/src/librtools/RosPrintf.hpp +++ b/tools/src/librtools/RosPrintf.hpp @@ -1,6 +1,6 @@ -// $Id: RosPrintf.hpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: RosPrintf.hpp 1088 2018-12-17 17:37:00Z mueller $ // -// Copyright 2000-2011 by Walter F.J. Mueller +// Copyright 2000-2018 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-17 1088 1.1 add bool specialization (use c++11 std::boolalpha) // 2011-01-30 357 1.0 Adopted from CTBprintf // 2000-12-18 - - Last change on CTBprintf // --------------------------------------------------------------------------- @@ -32,6 +33,9 @@ namespace Retro { + RosPrintfS RosPrintf(bool value, const char* form=0, + int width=0, int prec=0); + RosPrintfS RosPrintf(char value, const char* form=0, int width=0, int prec=0); diff --git a/tools/src/librtools/RosPrintf.ipp b/tools/src/librtools/RosPrintf.ipp index d2ab6561..11126a76 100644 --- a/tools/src/librtools/RosPrintf.ipp +++ b/tools/src/librtools/RosPrintf.ipp @@ -1,6 +1,6 @@ -// $Id: RosPrintf.ipp 983 2018-01-02 20:35:59Z mueller $ +// $Id: RosPrintf.ipp 1088 2018-12-17 17:37:00Z mueller $ // -// Copyright 2000-2011 by Walter F.J. Mueller +// Copyright 2000-2018 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-17 1088 1.1 add bool specialization (use c++11 std::boolalpha) // 2011-01-30 357 1.0 Adopted from CTBprintf // 2000-12-18 - - Last change on CTBprintf // --------------------------------------------------------------------------- @@ -29,6 +30,26 @@ namespace Retro { /*! \defgroup RosPrintf RosPrintf -- print format object creators */ +//------------------------------------------+----------------------------------- +//! Creates a print object for the formatted output of a \c bool value. +/*! + \ingroup RosPrintf + + For a full description of the of the \c RosPrintf system look into + \ref using_rosprintf. + + \param value variable or expression to be printed + \param form format descriptor string + \param width field width + \param prec precision +*/ + +inline RosPrintfS + RosPrintf(bool value, const char* form, int width, int prec) +{ + return RosPrintfS(value, form, width, prec); +} + //------------------------------------------+----------------------------------- //! Creates a print object for the formatted output of a \c char value. /*! diff --git a/tools/src/librtools/RosPrintfS.cpp b/tools/src/librtools/RosPrintfS.cpp index 7fd6ef8f..95cfcee5 100644 --- a/tools/src/librtools/RosPrintfS.cpp +++ b/tools/src/librtools/RosPrintfS.cpp @@ -1,6 +1,6 @@ -// $Id: RosPrintfS.cpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: RosPrintfS.cpp 1089 2018-12-19 10:45:41Z mueller $ // -// Copyright 2000-2011 by Walter F.J. Mueller +// Copyright 2000-2018 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,8 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-18 1089 1.1.1 use c++ style casts +// 2018-12-17 1088 1.1 add bool specialization (use c++11 std::boolalpha) // 2011-02-25 364 1.0.1 allow NULL ptr for const char*, output // 2011-01-30 357 1.0 Adopted from CTBprintfS // 2000-10-29 - - Last change on CTBprintfS @@ -62,6 +64,14 @@ void RosPrintfS::ToStream(std::ostream& os) const os << setw(fWidth) << fValue; } +//------------------------------------------+----------------------------------- +template <> +void RosPrintfS::ToStream(std::ostream& os) const +{ + RiosState iostate(os, fForm, fPrec); + os << std::boolalpha << fValue; +} + //------------------------------------------+----------------------------------- template <> void RosPrintfS::ToStream(std::ostream& os) const @@ -73,7 +83,7 @@ void RosPrintfS::ToStream(std::ostream& os) const if (ctype == 0 || ctype == 'c') { os << fValue; } else { - os << (int) fValue; + os << int(fValue); } } @@ -86,7 +96,7 @@ void RosPrintfS::ToStream(std::ostream& os) const os.width(fWidth); if (ctype == 'c') { - os << (char) fValue; + os << char(fValue); } else { os << fValue; } @@ -101,7 +111,7 @@ void RosPrintfS::ToStream(std::ostream& os) const os.width(fWidth); if (ctype == 'p') { - os << (const void*) fValue; + os << reinterpret_cast(fValue); } else { os << (fValue?fValue:""); } @@ -118,7 +128,7 @@ void RosPrintfS::ToStream(std::ostream& os) const if (ctype == 0 || ctype == 'p') { os << fValue; } else { - os << (unsigned long) fValue; + os << reinterpret_cast(fValue); } } @@ -128,6 +138,7 @@ void RosPrintfS::ToStream(std::ostream& os) const // finally do an explicit instantiation of the required RosPrintfS +template class RosPrintfS; template class RosPrintfS; template class RosPrintfS; template class RosPrintfS; diff --git a/tools/src/librtools/RosPrintfS.hpp b/tools/src/librtools/RosPrintfS.hpp index 6d42602b..8e20ab52 100644 --- a/tools/src/librtools/RosPrintfS.hpp +++ b/tools/src/librtools/RosPrintfS.hpp @@ -1,6 +1,6 @@ -// $Id: RosPrintfS.hpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: RosPrintfS.hpp 1088 2018-12-17 17:37:00Z mueller $ // -// Copyright 2000-2011 by Walter F.J. Mueller +// Copyright 2000-2018 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-17 1088 1.1 add bool specialization (use c++11 std::boolalpha) // 2011-01-30 357 1.0 Adopted from CTBprintfS // 2000-10-29 - - Last change on CTBprintfS // --------------------------------------------------------------------------- @@ -40,6 +41,8 @@ namespace Retro { T fValue; //!< value to be printed }; + template <> + void RosPrintfS::ToStream(std::ostream& os) const; template <> void RosPrintfS::ToStream(std::ostream& os) const; template <> diff --git a/tools/src/librw11/Rw11.cpp b/tools/src/librw11/Rw11.cpp index 1b08cf9e..72aaf53e 100644 --- a/tools/src/librw11/Rw11.cpp +++ b/tools/src/librw11/Rw11.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.4 use RosPrintf(bool) // 2018-12-15 1082 1.1.3 use lambda instead of bind // 2018-12-09 1080 1.1.2 use std::shared_ptr instead of boost and range loop // 2017-04-07 868 1.1.1 Dump(): add detail arg @@ -27,8 +28,8 @@ */ #include "librtools/Rexception.hpp" - #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "Rw11Cpu.hpp" #include "Rw11.hpp" @@ -130,7 +131,7 @@ void Rw11::Dump(std::ostream& os, int ind, const char* text, int /*detail*/) con os << bl << " fspCpu[4]: "; for (auto& o: fspCpu) os << o.get() << " "; os << endl; - os << bl << " fStarted: " << fStarted << endl; + os << bl << " fStarted: " << RosPrintf(fStarted) << endl; return; } diff --git a/tools/src/librw11/Rw11Cntl.cpp b/tools/src/librw11/Rw11Cntl.cpp index 561ca9e1..7823ea5d 100644 --- a/tools/src/librw11/Rw11Cntl.cpp +++ b/tools/src/librw11/Rw11Cntl.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Cntl.cpp 1049 2018-09-22 13:56:52Z mueller $ +// $Id: Rw11Cntl.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.3 use RosPrintf(bool) // 2017-04-15 874 1.1.2 remove NUnit() // 2017-04-02 865 1.1.1 use Dump(detail) for PrimClist // 2014-12-30 625 1.1 adopt to Rlink V4 attn logic @@ -132,8 +133,8 @@ void Rw11Cntl::Dump(std::ostream& os, int ind, const char* text, os << bl << " fName: " << fName << endl; os << bl << " fBase: " << RosPrintf(fBase,"o0",6) << endl; os << bl << " fLam: " << fLam << endl; - os << bl << " fEnable: " << fEnable << endl; - os << bl << " fStarted: " << fStarted << endl; + os << bl << " fEnable: " << RosPrintf(fEnable) << endl; + os << bl << " fStarted: " << RosPrintf(fStarted) << endl; fProbe.Dump(os, ind+2, "fProbe: "); os << bl << " fTraceLevel: " << fTraceLevel << endl; fPrimClist.Dump(os, ind+2, "fPrimClist: ", detail-1); diff --git a/tools/src/librw11/Rw11CntlDEUNA.cpp b/tools/src/librw11/Rw11CntlDEUNA.cpp index 9442a0bb..a3736bbf 100644 --- a/tools/src/librw11/Rw11CntlDEUNA.cpp +++ b/tools/src/librw11/Rw11CntlDEUNA.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlDEUNA.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11CntlDEUNA.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2014-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 0.5.7 use RosPrintf(bool) // 2018-12-17 1087 0.5.6 use std::lock_guard instead of boost // 2018-12-15 1082 0.5.5 use lambda instead of bind // 2018-12-09 1080 0.5.4 use HasVirt(); Virt() returns ref @@ -609,13 +610,13 @@ void Rw11CntlDEUNA::Dump(std::ostream& os, int ind, const char* text, os << bl << " fPC_rdrxdsccur: " << fPC_rdrxdsccur << endl; os << bl << " fPC_larxdsccur: " << fPC_larxdsccur << endl; os << bl << " fPC_rdrxdscnxt: " << fPC_rdrxdscnxt << endl; - os << bl << " fPcbbValid: " << fPcbbValid << endl; + os << bl << " fPcbbValid: " << RosPrintf(fPcbbValid) << endl; os << bl << " fPcbb: " << RosPrintf(fPcbb,"o0", 6) << endl; os << bl << " fPcb: "; for (auto& v : fPcb) os << " " << RosPrintf(v,"o0", 6); os << endl; - os << bl << " fRingValid: " << fRingValid << endl; + os << bl << " fRingValid: " << RosPrintf(fRingValid) << endl; os << bl << " fTxRing format: " << RosPrintf(fTxRingBase,"o0", 7) << "," << RosPrintf(fTxRingSize,"d", 3) << "," << RosPrintf(fTxRingELen,"d", 3) << endl; @@ -641,11 +642,11 @@ void Rw11CntlDEUNA::Dump(std::ostream& os, int ind, const char* text, os << bl << " fPr0Last*: " << RosPrintf(fPr0Last,"o0", 6) << endl; os << bl << " fPr1*: " - << " Pcto=" << fPr1Pcto - << " Delua=" << fPr1Delua + << " Pcto=" << RosPrintf(fPr1Pcto) + << " Delua=" << RosPrintf(fPr1Delua) << " State=" << RosPrintf(fPr1State,"o0", 2) << ":" << MnemoState(fPr1State) << " GetPr1()=" << RosPrintf(GetPr1(),"o0", 6) << endl; - os << bl << " fRunning: " << fRunning << endl; + os << bl << " fRunning: " << RosPrintf(fRunning) << endl; os << bl << " fMode: " << RosPrintf(fMode,"o0", 6) << endl; os << bl << " fStatus: " << RosPrintf(fStatus,"o0", 6) << endl; diff --git a/tools/src/librw11/Rw11CntlRHRP.cpp b/tools/src/librw11/Rw11CntlRHRP.cpp index 46a21f28..eb2f2b91 100644 --- a/tools/src/librw11/Rw11CntlRHRP.cpp +++ b/tools/src/librw11/Rw11CntlRHRP.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlRHRP.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11CntlRHRP.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2015-2018 by Walter F.J. Mueller // Other credits: @@ -15,6 +15,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.9 use RosPrintf(bool) // 2018-12-15 1082 1.0.8 use std::bind or lambda instead of bind // 2018-12-09 1080 1.0.7 use HasVirt(); Virt() returns ref // 2018-10-28 1062 1.0.6 replace boost/foreach @@ -393,7 +394,7 @@ void Rw11CntlRHRP::Dump(std::ostream& os, int ind, const char* text, os << bl << " fRd_lba: " << RosPrintf(fRd_lba,"d",6) << endl; os << bl << " fRd_nwrd: " << RosPrintf(fRd_nwrd,"d",6) << endl; os << bl << " fRd_fu: " << RosPrintf(fRd_fu,"d",6) << endl; - os << bl << " fRd_ovr: " << fRd_ovr << endl; + os << bl << " fRd_ovr: " << RosPrintf(fRd_ovr) << endl; fRdma.Dump(os, ind+2, "fRdma: ", detail); Rw11CntlBase::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11CntlRK11.cpp b/tools/src/librw11/Rw11CntlRK11.cpp index 2330ccc6..12bcd4f7 100644 --- a/tools/src/librw11/Rw11CntlRK11.cpp +++ b/tools/src/librw11/Rw11CntlRK11.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlRK11.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11CntlRK11.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // Other credits: @@ -15,6 +15,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 2.0.9 use RosPrintf(bool) // 2018-12-15 1082 2.0.8 use std::bind or lambda instead of boost // 2018-12-09 1080 2.0.7 use HasVirt(); Virt() returns ref // 2018-10-28 1062 2.0.6 replace boost/foreach @@ -310,8 +311,8 @@ void Rw11CntlRK11::Dump(std::ostream& os, int ind, const char* text, os << bl << " fRd_addr: " << fRd_addr << endl; os << bl << " fRd_lba: " << fRd_lba << endl; os << bl << " fRd_nwrd: " << fRd_nwrd << endl; - os << bl << " fRd_fu: " << fRd_fu << endl; - os << bl << " fRd_ovr: " << fRd_ovr << endl; + os << bl << " fRd_fu: " << fRd_fu << endl; + os << bl << " fRd_ovr: " << RosPrintf(fRd_ovr) << endl; fRdma.Dump(os, ind+2, "fRdma: ", detail); Rw11CntlBase::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11CntlRL11.cpp b/tools/src/librw11/Rw11CntlRL11.cpp index e3993a83..cbfb48f3 100644 --- a/tools/src/librw11/Rw11CntlRL11.cpp +++ b/tools/src/librw11/Rw11CntlRL11.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlRL11.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11CntlRL11.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2014-2018 by Walter F.J. Mueller // Other credits: @@ -16,6 +16,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.9 use RosPrintf(bool) // 2018-12-15 1082 1.0.8 use std::bind or lambda instead of bind // 2018-12-09 1080 1.0.7 use HasVirt(); Virt() returns ref // 2018-10-28 1062 1.0.6 replace boost/foreach @@ -379,7 +380,7 @@ void Rw11CntlRL11::Dump(std::ostream& os, int ind, const char* text, os << bl << " fRd_lba: " << RosPrintf(fRd_lba,"d",6) << endl; os << bl << " fRd_nwrd: " << RosPrintf(fRd_nwrd,"d",6) << endl; os << bl << " fRd_fu: " << RosPrintf(fRd_fu,"d",6) << endl; - os << bl << " fRd_ovr: " << fRd_ovr << endl; + os << bl << " fRd_ovr: " << RosPrintf(fRd_ovr) << endl; fRdma.Dump(os, ind+2, "fRdma: ", detail); Rw11CntlBase::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11Cpu.cpp b/tools/src/librw11/Rw11Cpu.cpp index 36031873..9d0379f2 100644 --- a/tools/src/librw11/Rw11Cpu.cpp +++ b/tools/src/librw11/Rw11Cpu.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Cpu.cpp 1088 2018-12-17 17:37:00Z mueller $ +// $Id: Rw11Cpu.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.2.18 use RosPrintf(bool) // 2018-12-17 1085 1.2.17 use std::mutex,condition_variable instead of boost // 2018-12-07 1078 1.2.16 use std::shared_ptr instead of boost // 2018-11-16 1070 1.2.15 use auto; use emplace,make_pair; use range loop @@ -873,12 +874,15 @@ void Rw11Cpu::Dump(std::ostream& os, int ind, const char* text, os << bl << " fIndex: " << fIndex << endl; os << bl << " fBase: " << RosPrintf(fBase,"$x0",4) << endl; os << bl << " fIBase: " << RosPrintf(fIBase,"$x0",4) << endl; - os << bl << " fHasScnt: " << fHasScnt << endl; - os << bl << " fHasPcnt: " << fHasPcnt << endl; - os << bl << " fHasCmon: " << fHasCmon << endl; + os << bl << " fHasScnt: " << RosPrintf(fHasScnt) << endl; + os << bl << " fHasPcnt: " << RosPrintf(fHasPcnt) << endl; + os << bl << " fHasCmon: " << RosPrintf(fHasCmon) << endl; os << bl << " fHasHbpt: " << fHasHbpt << endl; - os << bl << " fHasIbmon: " << fHasIbmon << endl; - os << bl << " fCpuAct: " << fCpuAct << endl; + os << bl << " fHasIbmon: " << RosPrintf(fHasIbmon) << endl; + os << bl << " fHasKw11l: " << RosPrintf(fHasKw11l) << endl; + os << bl << " fHasKw11p: " << RosPrintf(fHasKw11p) << endl; + os << bl << " fHasIist: " << RosPrintf(fHasIist) << endl; + os << bl << " fCpuAct: " << RosPrintf(fCpuAct) << endl; os << bl << " fCpuStat: " << RosPrintf(fCpuStat,"$x0",4) << endl; os << bl << " fCntlMap: " << endl; for (auto& o: fCntlMap) { diff --git a/tools/src/librw11/Rw11Probe.cpp b/tools/src/librw11/Rw11Probe.cpp index 4f736cf5..651aae89 100644 --- a/tools/src/librw11/Rw11Probe.cpp +++ b/tools/src/librw11/Rw11Probe.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Probe.cpp 1049 2018-09-22 13:56:52Z mueller $ +// $Id: Rw11Probe.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.2 use RosPrintf(bool) // 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-02-04 848 1.1 Keep probe data; add DataInt(), DataRem() // 2013-03-05 495 1.0 Initial version @@ -95,9 +96,11 @@ void Rw11Probe::Dump(std::ostream& os, int ind, const char* text, os << bl << (text?text:"--") << "Rw11Probe @ " << this << endl; os << bl << " fAddr: " << RosPrintf(fAddr,"o0",6) << endl; - os << bl << " fProbeInt,Rem: " << fProbeInt << ", " << fProbeInt<< endl; - os << bl << " fProbeDone: " << fProbeDone << endl; - os << bl << " fFoundInt,Rem: " << fFoundInt << ", " << fFoundInt<< endl; + os << bl << " fProbeInt,Rem: " << RosPrintf(fProbeInt) << ", " + << RosPrintf(fProbeInt) << endl; + os << bl << " fProbeDone: " << RosPrintf(fProbeDone) << endl; + os << bl << " fFoundInt,Rem: " << RosPrintf(fFoundInt) << ", " + << RosPrintf(fFoundInt) << endl; os << bl << " fDataInt,Rem: " << RosPrintf(fDataInt,"o0",6)<< ", " << RosPrintf(fDataRem,"o0",6) << endl; return; diff --git a/tools/src/librw11/Rw11Rdma.cpp b/tools/src/librw11/Rw11Rdma.cpp index cf3b8d27..f0a7cfb2 100644 --- a/tools/src/librw11/Rw11Rdma.cpp +++ b/tools/src/librw11/Rw11Rdma.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11Rdma.cpp 1083 2018-12-15 19:19:16Z mueller $ +// $Id: Rw11Rdma.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2015-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.4 use RosPrintf(bool) // 2018-12-15 1083 1.1.3 for std::function setups: use rval ref and move // 2018-12-15 1082 1.1.2 use lambda instead of bind // 2017-04-02 865 1.1.1 Dump(): add detail arg @@ -122,7 +123,7 @@ void Rw11Rdma::Dump(std::ostream& os, int ind, const char* text, os << bl << " fChunkSize: " << RosPrintf(fChunksize,"d",4) << endl; os << bl << " fStatus: " << fStatus << endl; - os << bl << " fIsWMem: " << fIsWMem << endl; + os << bl << " fIsWMem: " << RosPrintf(fIsWMem) << endl; os << bl << " fAddr: " << RosPrintBvi(fAddr,8,22) << endl; os << bl << " fMode: " << RosPrintBvi(fAddr,16,16) << endl; os << bl << " fNWordMax: " << RosPrintf(fNWordMax,"d",4) << endl; diff --git a/tools/src/librw11/Rw11UnitDisk.cpp b/tools/src/librw11/Rw11UnitDisk.cpp index 5b57f6bb..7ad45b1a 100644 --- a/tools/src/librw11/Rw11UnitDisk.cpp +++ b/tools/src/librw11/Rw11UnitDisk.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitDisk.cpp 1080 2018-12-09 20:30:33Z mueller $ +// $Id: Rw11UnitDisk.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.4 use RosPrintf(bool) // 2018-12-09 1080 1.0.3 use HasVirt(); Virt() returns ref // 2017-04-07 868 1.0.2 Dump(): add detail arg // 2015-03-21 659 1.0.1 add fEnabled, Enabled() @@ -26,6 +27,8 @@ */ #include "librtools/Rexception.hpp" +#include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "Rw11UnitDisk.hpp" @@ -104,13 +107,13 @@ void Rw11UnitDisk::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitDisk @ " << this << endl; os << bl << " fType: " << fType << endl; - os << bl << " fEnabled: " << fEnabled << endl; + os << bl << " fEnabled: " << RosPrintf(fEnabled) << endl; os << bl << " fNCyl: " << fNCyl << endl; os << bl << " fNHead: " << fNHead << endl; os << bl << " fNSect: " << fNSect << endl; os << bl << " fBlksize: " << fBlksize << endl; os << bl << " fNBlock: " << fNBlock << endl; - os << bl << " fWProt: " << fWProt << endl; + os << bl << " fWProt: " << RosPrintf(fWProt) << endl; Rw11UnitVirt::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11UnitTape.cpp b/tools/src/librw11/Rw11UnitTape.cpp index 0031b4d6..7c778bba 100644 --- a/tools/src/librw11/Rw11UnitTape.cpp +++ b/tools/src/librw11/Rw11UnitTape.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitTape.cpp 1080 2018-12-09 20:30:33Z mueller $ +// $Id: Rw11UnitTape.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2015-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.3 use RosPrintf(bool) // 2018-12-09 1080 1.0.2 use HasVirt(); Virt() returns ref // 2017-04-07 868 1.0.1 Dump(): add detail arg // 2015-06-04 686 1.0 Initial version @@ -26,6 +27,9 @@ #include "librtools/Rexception.hpp" +#include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" + #include "Rw11UnitTape.hpp" using namespace std; @@ -238,8 +242,8 @@ void Rw11UnitTape::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTape @ " << this << endl; os << bl << " fType: " << fType << endl; - os << bl << " fEnabled: " << fEnabled << endl; - os << bl << " fWProt: " << fWProt << endl; + os << bl << " fEnabled: " << RosPrintf(fEnabled) << endl; + os << bl << " fWProt: " << RosPrintf(fWProt) << endl; os << bl << " fCapacity: " << fCapacity << endl; Rw11UnitVirt::Dump(os, ind, " ^", detail); diff --git a/tools/src/librw11/Rw11UnitTerm.cpp b/tools/src/librw11/Rw11UnitTerm.cpp index 9fc66f1f..345590c9 100644 --- a/tools/src/librw11/Rw11UnitTerm.cpp +++ b/tools/src/librw11/Rw11UnitTerm.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitTerm.cpp 1085 2018-12-16 14:11:16Z mueller $ +// $Id: Rw11UnitTerm.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.7 use RosPrintf(bool) // 2018-12-17 1085 1.1.6 use std::lock_guard instead of boost // 2018-12-14 1081 1.1.5 use std::bind instead of boost // 2018-12-09 1080 1.1.4 use HasVirt(); Virt() returns ref @@ -30,6 +31,7 @@ */ #include "librtools/RparseUrl.hpp" +#include "librtools/RosFill.hpp" #include "librtools/RosPrintf.hpp" #include "librtools/Rexception.hpp" @@ -250,9 +252,9 @@ void Rw11UnitTerm::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "Rw11UnitTerm @ " << this << endl; - os << bl << " fTo7bit: " << fTo7bit << endl; - os << bl << " fToEnpc: " << fToEnpc << endl; - os << bl << " fTi7bit: " << fTi7bit << endl; + os << bl << " fTo7bit: " << RosPrintf(fTo7bit) << endl; + os << bl << " fToEnpc: " << RosPrintf(fToEnpc) << endl; + os << bl << " fTi7bit: " << RosPrintf(fTi7bit) << endl; { lock_guard lock(Connect()); size_t size = fRcvQueue.size(); @@ -279,10 +281,10 @@ void Rw11UnitTerm::Dump(std::ostream& os, int ind, const char* text, } os << bl << " fLogFname: " << fLogFname << endl; - os << bl << " fLogStream.is_open: " << fLogStream.is_open() << endl; - os << bl << " fLogOptCrlf: " << fLogOptCrlf << endl; - os << bl << " fLogCrPend: " << fLogCrPend << endl; - os << bl << " fLogLfLast: " << fLogLfLast << endl; + os << bl << " fLogStream.is_open: " << RosPrintf(fLogStream.is_open())<::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11Virt.cpp b/tools/src/librw11/Rw11Virt.cpp index 1bcd67af..d5841546 100644 --- a/tools/src/librw11/Rw11Virt.cpp +++ b/tools/src/librw11/Rw11Virt.cpp @@ -1,6 +1,6 @@ -// $Id: Rw11Virt.cpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: Rw11Virt.cpp 1090 2018-12-21 12:17:35Z mueller $ // -// Copyright 2013-2017 by Walter F.J. Mueller +// Copyright 2013-2018 by Walter F.J. Mueller // // This program is free software; you may redistribute and/or modify it under // the terms of the GNU General Public License as published by the Free @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.2 use RosPrintf(bool) // 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 add fWProt,WProt() // 2013-03-06 495 1.0 Initial version @@ -25,6 +26,7 @@ */ #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "Rw11Virt.hpp" @@ -73,7 +75,7 @@ void Rw11Virt::Dump(std::ostream& os, int ind, const char* text, os << bl << " fpUnit: " << fpUnit << endl; fUrl.Dump(os, ind+2, "fUrl: "); - os << bl << " fWProt: " << fWProt << endl; + os << bl << " fWProt: " << RosPrintf(fWProt) << endl; fStats.Dump(os, ind+2, "fStats: ", detail-1); return; } diff --git a/tools/src/librw11/Rw11VirtStream.cpp b/tools/src/librw11/Rw11VirtStream.cpp index 94a0e7e6..2b44a819 100644 --- a/tools/src/librw11/Rw11VirtStream.cpp +++ b/tools/src/librw11/Rw11VirtStream.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtStream.cpp 1076 2018-12-02 12:45:49Z mueller $ +// $Id: Rw11VirtStream.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.1.1 use RosPrintf(bool) // 2018-12-02 1076 1.1 use unique_ptr for New() // 2017-04-07 868 1.0.3 Dump(): add detail arg // 2017-04-02 864 1.0.2 signal for input streams WProt @@ -31,6 +32,7 @@ #include "librtools/Rexception.hpp" #include "librtools/RparseUrl.hpp" #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "Rw11VirtStream.hpp" @@ -219,8 +221,8 @@ void Rw11VirtStream::Dump(std::ostream& os, int ind, const char* text, RosFill bl(ind); os << bl << (text?text:"--") << "Rw11VirtStream @ " << this << endl; - os << bl << " fIStream: " << fIStream << endl; - os << bl << " fOStream: " << fOStream << endl; + os << bl << " fIStream: " << RosPrintf(fIStream) << endl; + os << bl << " fOStream: " << RosPrintf(fOStream) << endl; os << bl << " fFile: " << fFile << endl; Rw11Virt::Dump(os, ind, " ^", detail); return; diff --git a/tools/src/librw11/Rw11VirtTape.cpp b/tools/src/librw11/Rw11VirtTape.cpp index f8728cd0..8973aa8e 100644 --- a/tools/src/librw11/Rw11VirtTape.cpp +++ b/tools/src/librw11/Rw11VirtTape.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTape.cpp 1076 2018-12-02 12:45:49Z mueller $ +// $Id: Rw11VirtTape.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2015-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.2.1 use RosPrintf(bool) // 2018-12-02 1076 1.2 use unique_ptr for New() // 2017-04-07 868 1.1.1 Dump(): add detail arg // 2017-04-02 864 1.1 move fWProt,WProt() to Rw11Virt base @@ -27,6 +28,7 @@ #include #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "librtools/RparseUrl.hpp" #include "librtools/Rexception.hpp" #include "Rw11VirtTapeTap.hpp" @@ -160,9 +162,9 @@ void Rw11VirtTape::Dump(std::ostream& os, int ind, const char* text, os << bl << (text?text:"--") << "Rw11VirtTape @ " << this << endl; os << bl << " fCapacity: " << fCapacity << endl; - os << bl << " fBot: " << fBot << endl; - os << bl << " fEot: " << fEot << endl; - os << bl << " fEom: " << fEom << endl; + os << bl << " fBot: " << RosPrintf(fBot) << endl; + os << bl << " fEot: " << RosPrintf(fEot) << endl; + os << bl << " fEom: " << RosPrintf(fEom) << endl; os << bl << " fPosFile: " << fPosFile << endl; os << bl << " fPosRecord: " << fPosRecord << endl; Rw11Virt::Dump(os, ind, " ^", detail); diff --git a/tools/src/librw11/Rw11VirtTapeTap.cpp b/tools/src/librw11/Rw11VirtTapeTap.cpp index bf1ac257..e8ca157e 100644 --- a/tools/src/librw11/Rw11VirtTapeTap.cpp +++ b/tools/src/librw11/Rw11VirtTapeTap.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTapeTap.cpp 1048 2018-09-22 07:41:46Z mueller $ +// $Id: Rw11VirtTapeTap.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2015-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.4 use RosPrintf(bool) // 2018-09-22 1048 1.0.3 BUGFIX: coverity (resource leak; bad expression) // 2017-04-15 875 1.0.2 Open(): set default scheme // 2017-04-07 868 1.0.1 Dump(): add detail arg @@ -31,6 +32,7 @@ #include #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "librtools/Rtools.hpp" #include "Rw11VirtTapeTap.hpp" @@ -451,8 +453,9 @@ void Rw11VirtTapeTap::Dump(std::ostream& os, int ind, const char* text, os << bl << " fFd: " << fFd << endl; os << bl << " fSize: " << fSize << endl; os << bl << " fPos: " << fPos << endl; - os << bl << " fBad: " << fBad << endl; - os << bl << " fPadOdd: " << fPadOdd << endl; + os << bl << " fBad: " << RosPrintf(fBad) << endl; + os << bl << " fPadOdd: " << RosPrintf(fPadOdd) << endl; + os << bl << " fTruncPend: " << RosPrintf(fTruncPend) << endl; Rw11VirtTape::Dump(os, ind, " ^", detail); return; } diff --git a/tools/src/librw11/Rw11VirtTermTcp.cpp b/tools/src/librw11/Rw11VirtTermTcp.cpp index 0f276f3d..fe86cf4e 100644 --- a/tools/src/librw11/Rw11VirtTermTcp.cpp +++ b/tools/src/librw11/Rw11VirtTermTcp.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTermTcp.cpp 1089 2018-12-19 10:45:41Z mueller $ +// $Id: Rw11VirtTermTcp.cpp 1090 2018-12-21 12:17:35Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,6 +13,7 @@ // // Revision History: // Date Rev Version Comment +// 2018-12-19 1090 1.0.12 use RosPrintf(bool) // 2018-12-18 1089 1.0.11 use c++ style casts // 2018-12-15 1082 1.0.10 use lambda instead of bind // 2018-11-30 1075 1.0.9 use list-init @@ -41,6 +42,7 @@ #include #include "librtools/RosFill.hpp" +#include "librtools/RosPrintf.hpp" #include "librtools/RlogMsg.hpp" #include "librtools/Rtools.hpp" @@ -260,7 +262,7 @@ void Rw11VirtTermTcp::Dump(std::ostream& os, int ind, const char* text, default: t_state = "???"; } os << bl << " fState: " << t_state << endl; - os << bl << " fTcpTrace: " << fTcpTrace << endl; + os << bl << " fTcpTrace: " << RosPrintf(fTcpTrace) << endl; os << bl << " fSndPreConQue.size:" << fSndPreConQue.size() << endl; Rw11VirtTerm::Dump(os, ind, " ^", detail); return;