code cosmetics

doc/CHANGELOG.md

@@ -17,6 +17,17 @@ software or firmware builds or that the documentation is consistent.
 The full set of tests is only run for tagged releases._
 
 ### Summary
+- more compact dumps, add Dump(..,detail); trace output with cntl name
+  - RlinkCommand: add CommandInfo()
+  - RtclCmdBase: add GetArgsDump()
+  - RlinkCommandList: Dump(): add detail arg
+  - Rstats: add NameMaxLength(); Print(): add counter name
+  - Rw11Cntl: use Dump(detail) for PrimClist ect
+  - Rw11CntlBase,Rw11Rdma*: Dump(): add detail arg
+  - Rw11Cntl*: Dump(): add detail arg; use cntl name as message prefix
+- RtclRw11Cntl: M_dump: use GetArgsDump and Dump detail
+- RtimerFd: first practical version
+- use clock_gettime instead of gettimeofday
 - add Rw11VirtDiskOver (simple overlay file container)
   - Rw11VirtDiskBuffer: added, disk buffer representation
   - Rw11VirtDiskOver: added, a 'keep changes in memory' overlay file container

tools/src/librtcltools/RtclContext.cpp

@@ -1,6 +1,6 @@
-// $Id: RtclContext.cpp 492 2013-02-24 22:14:47Z mueller $
+// $Id: RtclContext.cpp 866 2017-04-02 17:20:13Z mueller $
 //
-// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 //
 // 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
+// 2017-02-04   866   1.0.4  rename fMapContext -> fContextMap
 // 2013-02-03   481   1.0.3  use Rexception
 // 2013-01-12   474   1.0.2  add FindProxy() method
 // 2011-03-12   368   1.0.1  drop fExitSeen, get exit handling right
@@ -22,7 +23,7 @@
 
 /*!
   \file
-  \version $Id: RtclContext.cpp 492 2013-02-24 22:14:47Z mueller $
+  \version $Id: RtclContext.cpp 866 2017-04-02 17:20:13Z mueller $
   \brief   Implemenation of RtclContext.
 */
 
@@ -45,7 +46,7 @@ namespace Retro {
 typedef std::pair<RtclContext::cset_it_t, bool>  cset_ins_t;
 typedef std::pair<RtclContext::pset_it_t, bool>  pset_ins_t;
 
-RtclContext::xmap_t RtclContext::fMapContext;
+RtclContext::xmap_t RtclContext::fContextMap;
 
 //------------------------------------------+-----------------------------------
 //! Default constructor
@@ -159,12 +160,12 @@ RtclProxyBase* RtclContext::FindProxy(const std::string& type,
 RtclContext& RtclContext::Find(Tcl_Interp* interp)
 {
   RtclContext* pcntx = 0;
-  xmap_it_t it = fMapContext.find(interp);
+  xmap_it_t it = fContextMap.find(interp);
-  if (it != fMapContext.end()) {
+  if (it != fContextMap.end()) {
     pcntx = it->second;
   } else {
     pcntx = new RtclContext(interp);
-    fMapContext.insert(xmap_val_t(interp, pcntx));
+    fContextMap.insert(xmap_val_t(interp, pcntx));
     Tcl_CreateExitHandler((Tcl_ExitProc*) ThunkTclExitProc, (ClientData) pcntx);
 
   }

tools/src/librtcltools/RtclContext.hpp

@@ -1,6 +1,6 @@
-// $Id: RtclContext.hpp 490 2013-02-22 18:43:26Z mueller $
+// $Id: RtclContext.hpp 866 2017-04-02 17:20:13Z mueller $
 //
-// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
+// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 //
 // 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
+// 2017-02-04   866   1.0.4  rename fMapContext -> fContextMap
 // 2013-01-12   474   1.0.3  add FindProxy() method
 // 2011-04-24   380   1.0.2  use boost::noncopyable (instead of private dcl's)
 // 2011-03-12   368   1.0.1  drop fExitSeen, get exit handling right
@@ -22,7 +23,7 @@
 
 /*!
   \file
-  \version $Id: RtclContext.hpp 490 2013-02-22 18:43:26Z mueller $
+  \version $Id: RtclContext.hpp 866 2017-04-02 17:20:13Z mueller $
   \brief   Declaration of class RtclContext.
 */
 
@@ -78,7 +79,7 @@ namespace Retro {
       cset_t        fSetClass;              //!< set for Class objects
       pset_t        fSetProxy;              //!< set for Proxy objects
 
-      static xmap_t fMapContext;            //!< map of contexts
+      static xmap_t fContextMap;            //!< map of contexts
   };
   
 } // end namespace Retro

tools/src/librw11/Rw11Cpu.hpp

@@ -1,4 +1,4 @@
-// $Id: Rw11Cpu.hpp 857 2017-02-26 15:27:41Z mueller $
+// $Id: Rw11Cpu.hpp 866 2017-04-02 17:20:13Z mueller $
 //
 // Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 //
@@ -33,7 +33,7 @@
 
 /*!
   \file
-  \version $Id: Rw11Cpu.hpp 857 2017-02-26 15:27:41Z mueller $
+  \version $Id: Rw11Cpu.hpp 866 2017-04-02 17:20:13Z mueller $
   \brief   Declaration of class Rw11Cpu.
 */
 
@@ -42,6 +42,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 #include "boost/utility.hpp"
 #include "boost/shared_ptr.hpp"

tools/src/librwxxtpp/RtclRw11.cpp

@@ -1,4 +1,4 @@
-// $Id: RtclRw11.cpp 660 2015-03-29 22:10:16Z mueller $
+// $Id: RtclRw11.cpp 858 2017-03-05 17:41:37Z mueller $
 //
 // Copyright 2013-2015 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
 //
@@ -21,7 +21,7 @@
 
 /*!
   \file
-  \version $Id: RtclRw11.cpp 660 2015-03-29 22:10:16Z mueller $
+  \version $Id: RtclRw11.cpp 858 2017-03-05 17:41:37Z mueller $
   \brief   Implemenation of class RtclRw11.
  */
 
@@ -161,7 +161,7 @@ int RtclRw11::M_default(RtclArgs& args)
   if (!args.AllDone()) return kERR;
   ostringstream sos;
 
-  sos << "cpu type base : cntl  type ibbase  probe  lam boot" << endl;
+  sos << "cpu type base : cntl   type ibbase  probe  lam boot" << endl;
 
   for (size_t i=0; i<Obj().NCpu(); i++) {
     Rw11Cpu& cpu(Obj().Cpu(i));
@@ -175,7 +175,7 @@ int RtclRw11::M_default(RtclArgs& args)
       Rw11Cntl& cntl(cpu.Cntl(list[j]));
       const Rw11Probe& pstat(cntl.ProbeStatus());
       sos << "                 " << RosPrintf(cntl.Name().c_str(),"-s",4)
-          << " " << RosPrintf(cntl.Type().c_str(),"-s",4)
+          << " " << RosPrintf(cntl.Type().c_str(),"-s",5)
           << " " << RosPrintf(cntl.Base(),"o0",6)
           << "  ir=" << pstat.IndicatorInt() << "," << pstat.IndicatorRem();
       if (cntl.Lam() > 0) sos << " " << RosPrintf(cntl.Lam(),"d",3);