Skip to content

Provide actions for text-based streamers #580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcanal merged 10 commits into from
May 27, 2017
Merged

Provide actions for text-based streamers #580

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4be8c5b
io: introduce actions list for text writing like JSON or XML
linev May 15, 2017
a070ef3
json: use new actions list for writing objects data
linev May 15, 2017
e94695e
io: provide specialized write actions for TObject and TNamed
linev May 15, 2017
8474285
json: fix problem with TObject storage
linev May 15, 2017
40df040
io: introduce WriteTextStreamerLoop action
linev May 16, 2017
1bfeaa5
io: make WriteStreamerLoop action templated
linev May 16, 2017
3ab4375
json: fix problem with kStreamLoop with fCounter==1
linev May 16, 2017
1fef7c9
json: rudimentary support for TRef
linev May 16, 2017
a5bbd42
io: provide kSTLp text write action
linev May 16, 2017
caae5b0
io: use template<bool kIsTextT> parametrer for text actions
linev May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
json: rudimentary support for TRef 
Just reuse postprocessing code for TObject.
Makes output more readable, but TRef need much more work 
to be supported with JSON and JSROOT
  • Loading branch information
@linev
linev committed May 16, 2017
commit 1fef7c92078cded9a140bfd06e1a3bd5eb050d92
4 changes: 2 additions & 2 deletions io/io/inc/TBufferJSON.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ class TBufferJSON : public TBuffer {
}
virtual UShort_t WriteProcessID(TProcessID * /*pid*/)
{
Error("WriteProcessID", "useless");
// Error("WriteProcessID", "useless");
return 0;
}

Expand Down Expand Up @@ -428,7 +428,7 @@ class TBufferJSON : public TBuffer {

void JsonStartElement(const TStreamerElement *elem, const TClass *base_class = 0);

void PerformPostProcessing(TJSONStackObj *stack, Bool_t is_tobject = kFALSE);
void PerformPostProcessing(TJSONStackObj *stack, const TClass *obj_cl = 0);

void JsonWriteBasic(Char_t value);
void JsonWriteBasic(Short_t value);
Expand Down
23 changes: 14 additions & 9 deletions io/io/src/TBufferJSON.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1135,8 +1135,8 @@ void TBufferJSON::JsonWriteObject(const void *obj, const TClass *cl, Bool_t chec
}
}

// reuse post-processing code for TObject
if (cl == TObject::Class()) PerformPostProcessing(stack, kTRUE);
// reuse post-processing code for TObject or TRef
PerformPostProcessing(stack, cl);

if ((special_kind == 0) &&
((stack->fValues.GetLast() >= 0) || (fValue.Length() > 0))) {
Expand Down Expand Up @@ -1557,13 +1557,13 @@ void TBufferJSON::ClassMember(const char *name, const char *typeName,
////////////////////////////////////////////////////////////////////////////////
/// Function is converts TObject and TString structures to more compact representation

void TBufferJSON::PerformPostProcessing(TJSONStackObj *stack, Bool_t isTObject)
void TBufferJSON::PerformPostProcessing(TJSONStackObj *stack, const TClass *obj_cl)
{
if (stack->fIsPostProcessed) return;

const TStreamerElement *elem = stack->fElem;

if (!elem && !isTObject) return;
if (!elem && !obj_cl) return;

stack->fIsPostProcessed = kTRUE;

Expand All @@ -1573,9 +1573,13 @@ void TBufferJSON::PerformPostProcessing(TJSONStackObj *stack, Bool_t isTObject)
return;
}

Bool_t isTString(kFALSE), isSTLstring(kFALSE), isOffsetPArray(kFALSE), isTArray(kFALSE);
Bool_t isTObject(kFALSE), isTRef(kFALSE), isTString(kFALSE), isSTLstring(kFALSE), isOffsetPArray(kFALSE), isTArray(kFALSE);

if (!isTObject) {
if (obj_cl) {
if (obj_cl == TObject::Class()) isTObject = kTRUE;
else if (obj_cl == TRef::Class()) isTRef = kTRUE;
else return;
} else {
const char *typname = elem->IsBase() ? elem->GetName() : elem->GetTypeName();
isTObject = (elem->GetType() == TStreamerInfo::kTObject) || (strcmp("TObject", typname) == 0);
isTString = elem->GetType() == TStreamerInfo::kTString;
Expand Down Expand Up @@ -1605,16 +1609,17 @@ void TBufferJSON::PerformPostProcessing(TJSONStackObj *stack, Bool_t isTObject)
stack->fValues.Delete();
fValue = "[]";
}
} else if (isTObject) {
// complex workaround for TObject streamer
} else if (isTObject || isTRef) {
// complex workaround for TObject/TRef streamer
// would be nice if other solution can be found
// Here is not supported TRef on TRef (double reference)

Int_t cnt = stack->fValues.GetLast()+1;
if (fValue.Length() > 0) cnt++;

if (cnt<2 || cnt>3) {
if (gDebug > 0)
Error("PerformPostProcessing", "When storing TObject, strange number of items %d", cnt);
Error("PerformPostProcessing", "When storing TObject/TRef, strange number of items %d", cnt);
AppendOutput(",", "\"dummy\"");
AppendOutput(fSemicolon.Data());
} else {
Expand Down