From 9eb60c0a353420584e08ff62bb655e0749e55aa5 Mon Sep 17 00:00:00 2001
From: Sergey Linev <S.Linev@gsi.de>
Date: Mon, 6 May 2019 10:49:28 +0200
Subject: [PATCH] reve: suppress by default huge debug output
Only activated when gDebug > 0
---
graf3d/eve7/src/REveElement.cxx | 7 ++++---
graf3d/eve7/src/REveManager.cxx | 8 +++++---
graf3d/eve7/src/REveScene.cxx | 24 +++++++++++++++---------
graf3d/eve7/src/REveSelection.cxx | 20 ++++++++++++--------
4 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/graf3d/eve7/src/REveElement.cxx b/graf3d/eve7/src/REveElement.cxx
index 1ac0653af83..f9b5409c4db 100644
--- a/graf3d/eve7/src/REveElement.cxx
+++ b/graf3d/eve7/src/REveElement.cxx
@@ -1460,9 +1460,10 @@ void REveElement::RecheckImpliedSelections()
void REveElement::AddStamp(UChar_t bits)
{
- if (fDestructing == kNone && fScene && fScene->IsAcceptingChanges())
- {
- printf("%s AddStamp %d + (%d) -> %d \n", GetCName(), fChangeBits, bits, fChangeBits|bits);
+ if (fDestructing == kNone && fScene && fScene->IsAcceptingChanges()) {
+
+ if (gDebug > 0)
+ ::Info(Form("%s::AddStamp", GetCName()), "%d + (%d) -> %d", fChangeBits, bits, fChangeBits | bits);
fChangeBits |= bits;
fScene->SceneElementChanged(this);
}
diff --git a/graf3d/eve7/src/REveManager.cxx b/graf3d/eve7/src/REveManager.cxx
index 80ceb797aac..53cb1fbd70b 100644
--- a/graf3d/eve7/src/REveManager.cxx
+++ b/graf3d/eve7/src/REveManager.cxx
@@ -808,8 +808,9 @@ void REveManager::HttpServerCallback(unsigned connid, const std::string &arg)
fScenes->AcceptChanges(true);
// MIR
- nlohmann::json cj = nlohmann::json::parse(arg.c_str());
- printf("MIR test %s \n", cj.dump().c_str());
+ nlohmann::json cj = nlohmann::json::parse(arg);
+ if (gDebug > 0)
+ ::Info("REveManager::HttpServerCallback", "MIR test %s", cj.dump().c_str());
std::string mir = cj["mir"];
std::string ctype = cj["class"];
int id = cj["fElementId"];
@@ -817,7 +818,8 @@ void REveManager::HttpServerCallback(unsigned connid, const std::string &arg)
auto el = FindElementById(id);
std::stringstream cmd;
cmd << "((" << ctype << "*)" << std::hex << std::showbase << (size_t)el << ")->" << mir << ";";
- std::cout << "MIR cmd " << cmd.str() << std::endl;
+ if (gDebug > 0)
+ ::Info("REveManager::HttpServerCallback", "MIR cmd %s", cmd.str().c_str());
gROOT->ProcessLine(cmd.str().c_str());
fScenes->AcceptChanges(false);
diff --git a/graf3d/eve7/src/REveScene.cxx b/graf3d/eve7/src/REveScene.cxx
index a49daeafc9b..a9be6a0312f 100644
--- a/graf3d/eve7/src/REveScene.cxx
+++ b/graf3d/eve7/src/REveScene.cxx
@@ -280,8 +280,6 @@ void REveScene::StreamRepresentationChanges()
if (bits & kCBObjProps)
{
- printf("total element change %s \n", el->GetCName());
-
Int_t rd_size = el->WriteCoreJson(jobj, fTotalBinarySize);
if (rd_size) {
assert (rd_size % 4 == 0);
@@ -295,9 +293,12 @@ void REveScene::StreamRepresentationChanges()
el->ClearStamps();
}
- for (auto el : fAddedElements) {
+ for (auto &el : fAddedElements) {
+
+ if (gDebug > 0)
+ Info("REveScene::StreamRepresentationChanges", "new element change %s", el->GetCName());
+
nlohmann::json jobj = {};
- printf("scene representation change new element change %s \n", el->GetCName());
Int_t rd_size = el->WriteCoreJson(jobj, fTotalBinarySize);
jarr.push_back(jobj);
if (rd_size) {
@@ -327,16 +328,19 @@ void REveScene::StreamRepresentationChanges()
nlohmann::json msg = { {"header", jhdr}, {"arr", jarr}};
fOutputJson = msg.dump();
- printf("[%s] Stream representation changes %s ...\n", GetCName(), fOutputJson.substr(0,30).c_str() );
+ if (gDebug > 0)
+ Info("REveScene::StreamRepresentationChanges", "class: %s changes %s ...", GetCName(), fOutputJson.substr(0,30).c_str() );
}
void REveScene::SendChangesToSubscribers()
{
for (auto && client : fSubscribers) {
- printf(" sending json, len = %d --> to conn_id = %d\n", (int) fOutputJson.size(), client->fId);
+ if (gDebug > 0)
+ printf(" sending json, len = %d --> to conn_id = %d\n", (int) fOutputJson.size(), client->fId);
client->fWebWindow->Send(client->fId, fOutputJson);
if (fTotalBinarySize) {
- printf(" sending binary, len = %d --> to conn_id = %d\n", fTotalBinarySize, client->fId);
+ if (gDebug > 0)
+ printf(" sending binary, len = %d --> to conn_id = %d\n", fTotalBinarySize, client->fId);
client->fWebWindow->SendBinary(client->fId, &fOutputBinary[0], fTotalBinarySize);
}
}
@@ -344,7 +348,8 @@ void REveScene::SendChangesToSubscribers()
Bool_t REveScene::IsChanged() const
{
- printf("REveScene::IsChanged %s (changed=%d, added=%d, removed=%d)\n", GetCName(),
+ if (gDebug > 0)
+ ::Info("REveScene::IsChanged","%s (changed=%d, added=%d, removed=%d)", GetCName(),
(int) fChangedElements.size(), (int) fAddedElements.size(), (int) fRemovedElements.size());
return ! (fChangedElements.empty() && fAddedElements.empty() && fRemovedElements.empty());
@@ -565,7 +570,8 @@ void REveSceneList::DestroyElementRenderers(REveElement* element)
void REveSceneList::ProcessSceneChanges()
{
- printf("REveSceneList::ProcessSceneChanges\n");
+ if (gDebug > 0)
+ ::Info("REveSceneList::ProcessSceneChanges","processing");
for (auto &el : fChildren)
{
diff --git a/graf3d/eve7/src/REveSelection.cxx b/graf3d/eve7/src/REveSelection.cxx
index 053129882e4..4cab27cba93 100644
--- a/graf3d/eve7/src/REveSelection.cxx
+++ b/graf3d/eve7/src/REveSelection.cxx
@@ -421,18 +421,22 @@ void REveSelection::NewElementPicked(ElementId_t id, bool multi, bool secondary,
REveElement *pel = REX::gEve->FindElementById(id);
- if ( ! pel) throw eh + "picked element id=" + id + " not found.";
+ if (!pel) throw eh + "picked element id=" + id + " not found.";
REveElement *el = MapPickedToSelected(pel);
- printf("REveSelection::NewElementPicked %p -> %p, multi: %d, secondary: %d", pel, el, multi, secondary);
- if (secondary)
- {
- printf(" { ");
- for (auto si : secondary_idcs) printf("%d ", si);
- printf("}");
+ if (gDebug > 0) {
+ std::string debug_secondary;
+ if (secondary) {
+ debug_secondary = " {";
+ for (auto si : secondary_idcs) {
+ debug_secondary.append(" ");
+ debug_secondary.append(std::to_string(si));
+ }
+ debug_secondary.append(" }");
+ }
+ ::Info("REveSelection::NewElementPicked", "%p -> %p, multi: %d, secondary: %d %s", pel, el, multi, secondary, debug_secondary.c_str());
}
- printf("\n");
Record *rec = find_record(el);
--
GitLab