github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-02-27 01:19:57 +00:00
Code Issues Releases Wiki Activity

add -reset option to stats subcommand

Browse Source 
- librtools/Rstats: add Reset(); drop operator-=() and operator*=()
- librtcltools/RtclStats: Rename Collect->Exec, not longer const; add -reset
- libr*/*: Stats() not longer const; use RtclStats::Exec()
This commit is contained in:
wfjm
2019-06-08 09:02:24 +02:00
parent 600dd42e69
commit 07909777df
42 changed files with 186 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/CHANGELOG.md
View File

@@ -27,6 +27,11 @@ The full set of tests is only run for tagged releases.
- use vivado 2019.1 as default
### Changes
- tools changes
- add -reset option to stats subcommand
- librtools/Rstats: add Reset(); drop operator-=() and operator*=()
- librtcltools/RtclStats: Rename Collect->Exec, not longer const; add -reset
- libr*/*: Stats() not longer const; use RtclStats::Exec()
- firmware changes
- sys_w11a_arty: down-rate to 72 MHz, viv 2019.1 fails with 75 MHz
- sys_w11a_*.vmfset: add new rule for vivado 2019.1

11
tools/src/librlink/RlinkConnect.hpp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkConnect.hpp 1091 2018-12-23 12:38:29Z mueller $
// $Id: RlinkConnect.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 2.8.4 *Stats() not longer const
// 2018-12-23 1091 2.8.3 add BadPort()
// 2018-12-17 1085 2.8.2 use std::recursive_mutex instead of boost
// 2018-12-16 1084 2.8.1 use =delete for noncopyable instead of boost
@@ -137,9 +138,9 @@ namespace Retro {
void AddrMapClear();
const RlinkAddrMap& AddrMap() const;
const Rstats& Stats() const;
const Rstats& SndStats() const;
const Rstats& RcvStats() const;
Rstats& Stats();
Rstats& SndStats();
Rstats& RcvStats();
void SetLogBaseAddr(uint32_t base);
void SetLogBaseData(uint32_t base);

11
tools/src/librlink/RlinkConnect.ipp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkConnect.ipp 1079 2018-12-09 10:56:59Z mueller $
// $Id: RlinkConnect.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 2.7.1 Stats() not longer const
// 2018-12-08 1079 2.7 add HasPort; return ref for Port()
// 2018-12-07 1078 2.6.1 use std::shared_ptr instead of boost
// 2018-12-01 1076 2.6 use unique_ptr instead of scoped_ptr
@@ -205,7 +206,7 @@ inline const RlinkAddrMap& RlinkConnect::AddrMap() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkConnect::Stats() const
inline Rstats& RlinkConnect::Stats()
{
return fStats;
}
@@ -213,7 +214,7 @@ inline const Rstats& RlinkConnect::Stats() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkConnect::SndStats() const
inline Rstats& RlinkConnect::SndStats()
{
return fSndPkt.Stats();
}
@@ -221,7 +222,7 @@ inline const Rstats& RlinkConnect::SndStats() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkConnect::RcvStats() const
inline Rstats& RlinkConnect::RcvStats()
{
return fRcvPkt.Stats();
}

8
tools/src/librlink/RlinkPacketBuf.hpp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkPacketBuf.hpp 1084 2018-12-16 12:23:53Z mueller $
// $Id: RlinkPacketBuf.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 2.0.3 Stats() not longer const
// 2018-12-16 1084 2.0.2 use =delete for noncopyable instead of boost
// 2017-04-07 868 2.0.1 Dump(): add detail arg
// 2014-11-23 606 2.0 re-organize for rlink v4
@@ -55,8 +56,7 @@ namespace Retro {
uint32_t Flags() const;
bool TestFlag(uint32_t mask) const;
const Rstats& Stats() const;
Rstats& Stats();
void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librlink/RlinkPacketBuf.ipp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkPacketBuf.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: RlinkPacketBuf.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2014 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 2.0.1 Stats() not longer const
// 2014-11-15 604 2.0 re-organize for rlink v4
// 2011-04-02 375 1.0 Initial version
// 2011-03-05 366 0.1 First draft
@@ -62,7 +63,7 @@ inline bool RlinkPacketBuf::TestFlag(uint32_t mask) const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkPacketBuf::Stats() const
inline Rstats& RlinkPacketBuf::Stats()
{
return fStats;
}

7
tools/src/librlink/RlinkPort.hpp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkPort.hpp 1084 2018-12-16 12:23:53Z mueller $
// $Id: RlinkPort.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.4.5 Stats() not longer const
// 2018-12-16 1084 1.4.4 use =delete for noncopyable instead of boost
// 2018-12-07 1078 1.4.3 use std::shared_ptr instead of boost
// 2018-12-01 1076 1.4 2 use unique_ptr
@@ -86,7 +87,7 @@ namespace Retro {
uint32_t TraceLevel() const;
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librlink/RlinkPort.ipp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkPort.ipp 1078 2018-12-08 14:19:03Z mueller $
// $Id: RlinkPort.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.3.2 Stats() not longer const
// 2018-12-07 1078 1.3.1 use std::shared_ptr instead of boost
// 2015-04-11 666 1.3 add fXon, XonEnable()
// 2013-05-01 513 1.2.1 fTraceLevel now uint32_t
@@ -99,7 +100,7 @@ inline uint32_t RlinkPort::TraceLevel() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkPort::Stats() const
inline Rstats& RlinkPort::Stats()
{
return fStats;
}

5
tools/src/librlink/RlinkServer.hpp
View File

@@ -1,4 +1,4 @@
// $Id: RlinkServer.hpp 1125 2019-03-30 07:34:54Z mueller $
// $Id: RlinkServer.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 2.2.7 Stats() not longer const
// 2018-12-17 1088 2.2.6 use std::thread instead of boost
// 2018-12-16 1084 2.2.5 use =delete for noncopyable instead of boost
// 2018-12-15 1083 2.2.4 for std::function setups: use rval ref and move
@@ -111,7 +112,7 @@ namespace Retro {
void SetTraceLevel(uint32_t level);
uint32_t TraceLevel() const;
const Rstats& Stats() const;
Rstats& Stats();
void Print(std::ostream& os) const;
void Dump(std::ostream& os, int ind=0, const char* text=0,

7
tools/src/librlink/RlinkServer.ipp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkServer.ipp 1083 2018-12-15 19:19:16Z mueller $
// $Id: RlinkServer.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 2.2.3 Stats() not longer const
// 2018-12-15 1083 2.2.2 for std::function setups: use rval ref and move
// 2018-12-07 1078 2.2.1 use std::shared_ptr instead of boost
// 2015-01-10 632 2.2 Exec() without emsg now void, will throw
@@ -91,7 +92,7 @@ inline uint32_t RlinkServer::TraceLevel() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& RlinkServer::Stats() const
inline Rstats& RlinkServer::Stats()
{
return fStats;
}

11
tools/src/librlinktpp/RtclRlinkConnect.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRlinkConnect.cpp 1121 2019-03-11 08:59:12Z mueller $
// $Id: RtclRlinkConnect.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.6.11 use RtclStats::Exec()
// 2019-03-10 1121 1.6.10 M_exec(): tranfer BlockDone values after rblk
// 2019-02-23 1114 1.6.9 use std::bind instead of lambda
// 2018-12-23 1091 1.6.8 use AddWblk(move)
@@ -710,11 +711,11 @@ int RtclRlinkConnect::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().SndStats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().RcvStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().SndStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().RcvStats())) return kERR;
if (Obj().HasPort()) {
if (!RtclStats::Collect(args, cntx, Obj().Port().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Port().Stats())) return kERR;
}
return kOK;
}

5
tools/src/librlinktpp/RtclRlinkPort.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRlinkPort.cpp 1114 2019-02-23 18:01:55Z mueller $
// $Id: RtclRlinkPort.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.4.5 use RtclStats::Exec()
// 2019-02-23 1114 1.4.4 use std::bind instead of lambda
// 2018-12-22 1091 1.4.3 M_Open(): drop move() (-Wpessimizing-move fix)
// 2018-12-18 1089 1.4.2 use c++ style casts
@@ -188,7 +189,7 @@ int RtclRlinkPort::M_stats(RtclArgs& args)
if (!TestPort(args, false)) return kERR;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, fupObj->Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, fupObj->Stats())) return kERR;
return kOK;
}

5
tools/src/librlinktpp/RtclRlinkServer.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRlinkServer.cpp 1114 2019-02-23 18:01:55Z mueller $
// $Id: RtclRlinkServer.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.2.4 use RtclStats::Exec()
// 2019-02-23 1114 1.2.3 use std::bind instead of lambda
// 2018-12-17 1087 1.2.2 use std::lock_guard instead of boost
// 2018-12-14 1081 1.2.1 use std::bind instead of boost
@@ -273,7 +274,7 @@ int RtclRlinkServer::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
return kOK;
}

17
tools/src/librtcltools/RtclStats.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclStats.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclStats.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2014 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.1 Rename Collect->Exec, not longer const; add -reset
// 2014-08-22 584 1.0.2 use nullptr
// 2013-03-06 495 1.0.1 Rename Exec->Collect
// 2011-02-26 364 1.0 Initial version
@@ -46,7 +47,7 @@ namespace Retro {
bool RtclStats::GetArgs(RtclArgs& args, Context& cntx)
{
static RtclNameSet optset("-lname|-ltext|-lvalue|-lpair|-lall|"
"-atext|-avalue|-print");
"-atext|-avalue|-print|-reset");
string opt;
string varname;
@@ -81,8 +82,7 @@ bool RtclStats::GetArgs(RtclArgs& args, Context& cntx)
//------------------------------------------+-----------------------------------
//! FIXME_docs
bool RtclStats::Collect(RtclArgs& args, const Context& cntx,
const Rstats& stats)
bool RtclStats::Exec(RtclArgs& args, const Context& cntx, Rstats& stats)
{
Tcl_Interp* interp = args.Interp();
Tcl_Obj* plist = Tcl_GetObjResult(interp);
@@ -101,8 +101,8 @@ bool RtclStats::Collect(RtclArgs& args, const Context& cntx,
if (Tcl_ListObjAppendElement(interp, plist, pobj) != TCL_OK) return false;
}
} else if (cntx.opt == "-lvalue") {
for (size_t i=0; i<stats.Size(); i++) { // -lvalue ------------------------
} else if (cntx.opt == "-lvalue") { // -lvalue ------------------------
for (size_t i=0; i<stats.Size(); i++) {
RtclOPtr pobj(Tcl_NewDoubleObj(stats.Value(i)));
if (Tcl_ListObjAppendElement(interp, plist, pobj) != TCL_OK) return false;
}
@@ -143,6 +143,9 @@ bool RtclStats::Collect(RtclArgs& args, const Context& cntx,
stats.Print(sos, cntx.format.c_str(), cntx.width, cntx.prec);
args.AppendResultLines(sos);
} else if (cntx.opt == "-reset") { // -reset -------------------------
stats.Reset();
} else {
args.AppendResult("-E: BUG! RtclStats::Collect: bad option '",
cntx.opt.c_str(), "'", nullptr);

8
tools/src/librtcltools/RtclStats.hpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclStats.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclStats.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2013 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.1 Rename Collect->Exec, not longer const
// 2013-03-06 495 1.0.1 Rename Exec->Collect
// 2011-02-26 364 1.0 Initial version
// 2011-02-20 363 0.1 fFirst draft
@@ -49,8 +50,7 @@ namespace Retro {
};
static bool GetArgs(RtclArgs& args, Context& cntx);
static bool Collect(RtclArgs& args, const Context& cntx,
const Rstats& stats);
static bool Exec(RtclArgs& args, const Context& cntx, Rstats& stats);
};
} // end namespace Retro

41
tools/src/librtools/Rstats.cpp
View File

@@ -1,6 +1,6 @@
// $Id: Rstats.cpp 1089 2018-12-19 10:45:41Z mueller $
// $Id: Rstats.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.0.6 add Reset(); drop operator-=() and operator*=()
// 2018-12-18 1089 1.0.5 use c++ style casts
// 2017-02-04 865 1.0.4 add NameMaxLength(); Print(): add counter name
// 2017-02-18 851 1.0.3 add IncLogHist; fix + and * operator definition
@@ -111,6 +112,15 @@ void Rstats::Define(size_t ind, const std::string& name,
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Rstats::Reset()
{
for (auto& o: fValue) o = 0.;
return;
}
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Rstats::IncLogHist(size_t ind, size_t maskfirst,
size_t masklast, size_t val)
{
@@ -231,31 +241,4 @@ Rstats& Rstats::operator=(const Rstats& rhs)
return *this;
}
//------------------------------------------+-----------------------------------
//! FIXME_docs
Rstats& Rstats::operator-=(const Rstats& rhs)
{
if (Size() != rhs.Size() || fHash != rhs.fHash) {
throw Rexception("Rstats::oper-()",
"Bad args: subtract incompatible stats");
}
for (size_t i=0; i<fValue.size(); i++) {
fValue[i] -= rhs.fValue[i];
}
return *this;
}
//------------------------------------------+-----------------------------------
//! FIXME_docs
Rstats& Rstats::operator*=(double rhs)
{
for (size_t i=0; i<fValue.size(); i++) {
fValue[i] *= rhs;
}
return *this;
}
} // end namespace Retro

9
tools/src/librtools/Rstats.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rstats.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rstats.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2019 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
// 2019-06-07 1160 1.0.3 add Reset(); drop operator-=() and operator*=()
// 2017-02-04 865 1.0.2 add NameMaxLength(); Dump(): add detail arg
// 2017-02-18 851 1.0.1 add IncLogHist; fix + and * operator definition
// 2011-02-06 359 1.0 Initial version
@@ -46,6 +47,8 @@ namespace Retro {
void Set(size_t ind, double val);
void Inc(size_t ind, double val=1.);
void Reset();
void IncLogHist(size_t ind, size_t maskfirst,
size_t masklast, size_t val);
@@ -65,8 +68,6 @@ namespace Retro {
double operator[](size_t ind) const;
Rstats& operator=(const Rstats& rhs);
Rstats& operator-=(const Rstats& rhs);
Rstats& operator*=(double rhs);
private:
std::vector<double> fValue; //!< counter value

5
tools/src/librw11/Rw11Cntl.hpp
View File

@@ -1,4 +1,4 @@
// $Id: Rw11Cntl.hpp 1146 2019-05-05 06:25:13Z mueller $
// $Id: Rw11Cntl.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.2.6 Stats() not longer const
// 2019-05-04 1146 1.2.5 UnitSetupAll(): now virtual
// 2019-04-14 1131 1.2.4 add UnitSetup(), UnitSetupAll()
// 2018-12-16 1084 1.2.3 use =delete for noncopyable instead of boost
@@ -93,7 +94,7 @@ namespace Retro {
std::string UnitName(size_t index) const;
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11Cntl.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Cntl.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11Cntl.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.1.1 Stats() not longer const
// 2017-02-04 848 1.1 add ProbeFound(),ProbeDataInt,Rem()
// 2013-03-06 495 1.0 Initial version
// 2013-02-05 483 0.1 First draft
@@ -175,7 +176,7 @@ inline uint32_t Rw11Cntl::TraceLevel() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11Cntl::Stats() const
inline Rstats& Rw11Cntl::Stats()
{
return fStats;
}

7
tools/src/librw11/Rw11CntlRHRP.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRHRP.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRHRP.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.2 RdmaStats() not longer const
// 2017-04-02 865 1.0.1 Dump(): add detail arg
// 2015-05-14 680 1.0 Initial version
// 2015-03-21 659 0.1 First draft
@@ -51,7 +52,7 @@ namespace Retro {
void SetChunkSize(size_t chunk);
size_t ChunkSize() const;
const Rstats& RdmaStats() const;
Rstats& RdmaStats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11CntlRHRP.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRHRP.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRHRP.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.1 RdmaStats() not longer const
// 2015-05-14 680 1.0 Initial version
// 2015-03-21 659 0.1 First draft
// ---------------------------------------------------------------------------
@@ -46,7 +47,7 @@ inline size_t Rw11CntlRHRP::ChunkSize() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11CntlRHRP::RdmaStats() const
inline Rstats& Rw11CntlRHRP::RdmaStats()
{
return fRdma.Stats();
}

7
tools/src/librw11/Rw11CntlRK11.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRK11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRK11.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 2.0.2 RdmaStats() not longer const
// 2017-04-02 865 2.0.1 Dump(): add detail arg
// 2015-01-03 627 2.0 use Rw11RdmaDisk
// 2014-12-29 623 1.1 adopt to Rlink V4 attn logic
@@ -54,7 +55,7 @@ namespace Retro {
void SetChunkSize(size_t chunk);
size_t ChunkSize() const;
const Rstats& RdmaStats() const;
Rstats& RdmaStats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11CntlRK11.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRK11.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRK11.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.1 Stats() not longer const
// 2015-01-03 627 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -45,7 +46,7 @@ inline size_t Rw11CntlRK11::ChunkSize() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11CntlRK11::RdmaStats() const
inline Rstats& Rw11CntlRK11::RdmaStats()
{
return fRdma.Stats();
}

7
tools/src/librw11/Rw11CntlRL11.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRL11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRL11.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2019 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
// 2019-06-07 1160 1.0.2 RdmaStats() not longer const
// 2017-04-02 865 1.0.1 Dump(): add detail arg
// 2015-03-01 653 1.0 Initial version
// 2014-06-08 561 0.1 First draft
@@ -51,7 +52,7 @@ namespace Retro {
void SetChunkSize(size_t chunk);
size_t ChunkSize() const;
const Rstats& RdmaStats() const;
Rstats& RdmaStats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11CntlRL11.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlRL11.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlRL11.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.1 RdmaStats() not longer const
// 2015-01-10 632 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -45,7 +46,7 @@ inline size_t Rw11CntlRL11::ChunkSize() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11CntlRL11::RdmaStats() const
inline Rstats& Rw11CntlRL11::RdmaStats()
{
return fRdma.Stats();
}

7
tools/src/librw11/Rw11CntlTM11.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlTM11.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlTM11.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.2 RdmaStats() not longer const
// 2017-04-02 865 1.0.1 Dump(): add detail arg
// 2015-06-04 686 1.0 Initial version
// 2015-05-17 683 0.1 First draft
@@ -51,7 +52,7 @@ namespace Retro {
void SetChunkSize(size_t chunk);
size_t ChunkSize() const;
const Rstats& RdmaStats() const;
Rstats& RdmaStats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11CntlTM11.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlTM11.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlTM11.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.1 RdmaStats() not longer const
// 2015-05-17 683 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -45,7 +46,7 @@ inline size_t Rw11CntlTM11::ChunkSize() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11CntlTM11::RdmaStats() const
inline Rstats& Rw11CntlTM11::RdmaStats()
{
return fRdma.Stats();
}

5
tools/src/librw11/Rw11Cpu.hpp
View File

@@ -1,4 +1,4 @@
// $Id: Rw11Cpu.hpp 1143 2019-05-01 13:25:51Z mueller $
// $Id: Rw11Cpu.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.2.20 Stats() not longer const
// 2019-04-30 1143 1.2.19 add HasM9312()
// 2019-04-19 1133 1.2.18 add ExecWibr(),ExecRibr()
// 2019-04-13 1131 1.2.17 add defs for w11 cpu component addresses; add
@@ -181,7 +182,7 @@ namespace Retro {
void W11AttnHandler();
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

5
tools/src/librw11/Rw11Cpu.ipp
View File

@@ -1,4 +1,4 @@
// $Id: Rw11Cpu.ipp 1143 2019-05-01 13:25:51Z mueller $
// $Id: Rw11Cpu.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.2.7 Stats() not longer const
// 2019-04-30 1143 1.2.6 add HasM9312()
// 2019-04-13 1131 1.2.5 add MemSize()
// 2019-02-15 1112 1.2.4 add HasIbtst()
@@ -292,7 +293,7 @@ inline const RlinkAddrMap& Rw11Cpu::RAddrMap() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11Cpu::Stats() const
inline Rstats& Rw11Cpu::Stats()
{
return fStats;
}

7
tools/src/librw11/Rw11Rdma.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Rdma.hpp 1084 2018-12-16 12:23:53Z mueller $
// $Id: Rw11Rdma.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.1.5 Stats() not longer const
// 2018-12-16 1084 1.1.4 use =delete for noncopyable instead of boost
// 2018-12-15 1083 1.1.3 for std::function setups: use rval ref and move
// 2018-12-14 1081 1.1.2 use std::function instead of boost
@@ -72,7 +73,7 @@ namespace Retro {
void QueueWMem(uint32_t addr, const uint16_t* block, size_t size,
uint16_t mode);
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11Rdma.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Rdma.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11Rdma.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 20154- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.0.1 Stats() not longer const
// 2015-01-04 627 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -91,7 +92,7 @@ inline bool Rw11Rdma::IsActive() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11Rdma::Stats() const
inline Rstats& Rw11Rdma::Stats()
{
return fStats;
}

7
tools/src/librw11/Rw11Unit.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Unit.hpp 1084 2018-12-16 12:23:53Z mueller $
// $Id: Rw11Unit.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.1.5 Stats() not longer const
// 2018-12-16 1084 1.1.4 use =delete for noncopyable instead of boost
// 2017-04-15 875 1.1.3 add VirtBase(), IsAttached(), AttachUrl()
// 2017-04-07 868 1.1.2 Dump(): add detail arg
@@ -75,7 +76,7 @@ namespace Retro {
virtual bool Attach(const std::string& url, RerrMsg& emsg);
virtual void Detach();
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11Unit.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Unit.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11Unit.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.0.2 Stats() not longer const
// 2013-05-01 513 1.0.1 add fAttachOpts, (Set)AttachOpts()
// 2013-03-06 495 1.0 Initial version
// 2013-02-13 488 0.1 First draft
@@ -110,7 +111,7 @@ inline RlogFile& Rw11Unit::LogFile() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11Unit::Stats() const
inline Rstats& Rw11Unit::Stats()
{
return fStats;
}

7
tools/src/librw11/Rw11Virt.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Virt.hpp 1084 2018-12-16 12:23:53Z mueller $
// $Id: Rw11Virt.hpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.1.4 Stats() not longer const
// 2018-12-16 1084 1.1.3 use =delete for noncopyable instead of boost
// 2017-04-15 875 1.1.2 add Url() const getter
// 2017-04-07 868 1.1.1 Dump(): add detail arg
@@ -60,7 +61,7 @@ namespace Retro {
virtual bool Open(const std::string& url, RerrMsg& emsg) = 0;
const Rstats& Stats() const;
Rstats& Stats();
virtual void Dump(std::ostream& os, int ind=0, const char* text=0,
int detail=0) const;

7
tools/src/librw11/Rw11Virt.ipp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11Virt.ipp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11Virt.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.0.2 Stats() not longer const
// 2017-04-15 875 1.0.1 add Url() const getter
// 2013-03-06 495 1.0 Initial version
// 2013-02-16 489 0.1 First draft
@@ -85,7 +86,7 @@ inline const RparseUrl& Rw11Virt::Url() const
//------------------------------------------+-----------------------------------
//! FIXME_docs
inline const Rstats& Rw11Virt::Stats() const
inline Rstats& Rw11Virt::Stats()
{
return fStats;
}

5
tools/src/librwxxtpp/RtclRw11Cntl.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11Cntl.cpp 1114 2019-02-23 18:01:55Z mueller $
// $Id: RtclRw11Cntl.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.1.6 use RtclStats::Exec()
// 2019-02-23 1114 1.1.5 use std::bind instead of lambda
// 2018-12-17 1085 1.1.4 use std::lock_guard instead of boost
// 2018-12-15 1082 1.1.3 use lambda instead of boost::bind
@@ -124,7 +125,7 @@ int RtclRw11Cntl::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
return kOK;
}

9
tools/src/librwxxtpp/RtclRw11CntlRHRP.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlRHRP.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlRHRP.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.1.1 use RtclStats::Exec()
// 2017-04-16 878 1.1 add class in ctor; derive from RtclRw11CntlDiskBase
// 2015-05-14 680 1.0 Initial version
// 2015-03-21 659 0.1 First draft
@@ -98,8 +99,8 @@ int RtclRw11CntlRHRP::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().RdmaStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().RdmaStats())) return kERR;
return kOK;
}

9
tools/src/librwxxtpp/RtclRw11CntlRK11.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlRK11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlRK11.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 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
// 2019-06-07 1160 1.2.1 use RtclStats::Exec()
// 2017-04-16 878 1.2 add class in ctor; derive from RtclRw11CntlDiskBase
// 2015-01-04 627 1.1 add Get/Set for chunksize
// 2013-03-06 495 1.0 Initial version
@@ -99,8 +100,8 @@ int RtclRw11CntlRK11::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().RdmaStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().RdmaStats())) return kERR;
return kOK;
}

11
tools/src/librwxxtpp/RtclRw11CntlRL11.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlRL11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlRL11.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2019 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,7 +13,8 @@
//
// Revision History:
// Date Rev Version Comment
// 2017-04-16 878 1.2 add class in ctor; derive from RtclRw11CntlDiskBase
// 2019-06-07 1160 1.1.1 use RtclStats::Exec()
// 2017-04-16 878 1.1 add class in ctor; derive from RtclRw11CntlDiskBase
// 2015-01-10 632 1.0 Initial version
// 2014-06-08 561 0.1 First draft
// ---------------------------------------------------------------------------
@@ -98,8 +99,8 @@ int RtclRw11CntlRL11::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().RdmaStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().RdmaStats())) return kERR;
return kOK;
}

9
tools/src/librwxxtpp/RtclRw11CntlTM11.cpp
View File

@@ -1,6 +1,6 @@
// $Id: RtclRw11CntlTM11.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclRw11CntlTM11.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2015-2019 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
// 2019-06-07 1160 1.1.1 use RtclStats::Exec()
// 2017-04-16 878 1.1 add class in ctor; derive from RtclRw11CntlTapeBase
// 2015-05-17 683 1.0 Initial version
// ---------------------------------------------------------------------------
@@ -97,8 +98,8 @@ int RtclRw11CntlTM11::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().RdmaStats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().RdmaStats())) return kERR;
return kOK;
}

5
tools/src/librwxxtpp/RtclRw11Cpu.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11Cpu.cpp 1143 2019-05-01 13:25:51Z mueller $
// $Id: RtclRw11Cpu.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.2.32 use RtclStats::Exec()
// 2019-04-30 1143 1.2.31 add HasM9312() getter
// 2019-04-12 1131 1.2.30 BUGFIX: M_wtcpu(): check cpu attn in no-server case
// add MemSize() getter; loadabs: add -trace and start
@@ -1471,7 +1472,7 @@ int RtclRw11Cpu::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return kERR;
return kOK;
}

7
tools/src/librwxxtpp/RtclRw11UnitBase.ipp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11UnitBase.ipp 1114 2019-02-23 18:01:55Z mueller $
// $Id: RtclRw11UnitBase.ipp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.3.7 use RtclStats::Exec()
// 2019-02-23 1114 1.3.6 use std::bind instead of lambda
// 2018-12-15 1082 1.3.5 use lambda instead of boost::bind
// 2018-12-09 1080 1.3.4 use HasVirt(); Virt() returns ref
@@ -150,9 +151,9 @@ int RtclRw11UnitBase<TU,TUV,TB>::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return TB::kERR;
if (!RtclStats::Collect(args, cntx, Obj().Stats())) return TB::kERR;
if (!RtclStats::Exec(args, cntx, Obj().Stats())) return TB::kERR;
if (Obj().HasVirt()) {
if (!RtclStats::Collect(args, cntx, Obj().Virt().Stats())) return TB::kERR;
if (!RtclStats::Exec(args, cntx, Obj().Virt().Stats())) return TB::kERR;
}
return TB::kOK;
}

5
tools/src/librwxxtpp/RtclRw11Virt.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclRw11Virt.cpp 1114 2019-02-23 18:01:55Z mueller $
// $Id: RtclRw11Virt.cpp 1160 2019-06-07 17:30:17Z mueller $
//
// Copyright 2017-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2019-06-07 1160 1.0.5 use RtclStats::Exec()
// 2019-02-23 1114 1.0.4 use std::bind instead of lambda
// 2018-12-17 1087 1.0.3 use std::lock_guard instead of boost
// 2018-12-15 1082 1.0.2 use lambda instead of boost::bind
@@ -91,7 +92,7 @@ int RtclRw11Virt::M_stats(RtclArgs& args)
{
RtclStats::Context cntx;
if (!RtclStats::GetArgs(args, cntx)) return kERR;
if (!RtclStats::Collect(args, cntx, Virt()->Stats())) return kERR;
if (!RtclStats::Exec(args, cntx, Virt()->Stats())) return kERR;
return kOK;
}