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: use new actions list for writing objects data 
Main difference - it is not-optimized list, therefore there is no need
to unfold compressed data members
  • Loading branch information
@linev
linev committed May 16, 2017
commit a070ef306cb90ea881cfefc1339d8347fb504ac3
4 changes: 1 addition & 3 deletions io/io/inc/TBufferJSON.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,7 @@ class TBufferJSON : public TBuffer {
TJSONStackObj *Stack(Int_t depth = 0);

void WorkWithClass(TStreamerInfo *info, const TClass *cl = 0);
void WorkWithElement(TStreamerElement *elem, Int_t comp_type);

void WorkWithElement(TStreamerElement *elem, Int_t);

void JsonDisablePostprocessing();
Int_t JsonSpecialClass(const TClass *cl) const;
Expand Down Expand Up @@ -459,7 +458,6 @@ class TBufferJSON : public TBuffer {
std::map<const void *, unsigned> fJsonrMap; //! map of recorded objects, used in JsonR to restore references
unsigned fJsonrCnt; //! counter for all objects and arrays
TObjArray fStack; //! stack of streamer infos
Bool_t fExpectedChain; //! flag to resolve situation when several elements of same basic type stored as FastArray
Int_t fCompact; //! 0 - no any compression, 1 - no spaces in the begin, 2 - no new lines, 3 - no spaces at all
TString fSemicolon; //! depending from compression level, " : " or ":"
TString fArraySepar; //! depending from compression level, ", " or ","
Expand Down
81 changes: 21 additions & 60 deletions io/io/src/TBufferJSON.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ class TJSONStackObj : public TObject {
public:
TStreamerInfo *fInfo; //!
TStreamerElement *fElem; //! element in streamer info
Int_t fElemNumber; //! number of streamer element in streamer info
Bool_t fIsStreamerInfo; //!
Bool_t fIsElemOwner; //!
Bool_t fIsPostProcessed;//! indicate that value is written
Expand All @@ -252,7 +251,6 @@ class TJSONStackObj : public TObject {
TObject(),
fInfo(0),
fElem(0),
fElemNumber(0),
fIsStreamerInfo(kFALSE),
fIsElemOwner(kFALSE),
fIsPostProcessed(kFALSE),
Expand Down Expand Up @@ -299,7 +297,6 @@ TBufferJSON::TBufferJSON() :
fJsonrMap(),
fJsonrCnt(0),
fStack(),
fExpectedChain(kFALSE),
fCompact(0),
fSemicolon(" : "),
fArraySepar(", "),
Expand Down Expand Up @@ -1262,8 +1259,6 @@ void TBufferJSON::IncrementLevel(TVirtualStreamerInfo *info)

void TBufferJSON::WorkWithClass(TStreamerInfo *sinfo, const TClass *cl)
{
fExpectedChain = kFALSE;

if (sinfo != 0) cl = sinfo->GetClass();

if (cl == 0) return;
Expand Down Expand Up @@ -1300,8 +1295,6 @@ void TBufferJSON::WorkWithClass(TStreamerInfo *sinfo, const TClass *cl)

void TBufferJSON::DecrementLevel(TVirtualStreamerInfo *info)
{
fExpectedChain = kFALSE;

if (gDebug > 2)
Info("DecrementLevel", "Class: %s",
(info ? info->GetClass()->GetName() : "custom"));
Expand Down Expand Up @@ -1346,10 +1339,8 @@ void TBufferJSON::SetStreamerElementNumber(TStreamerElement *elem, Int_t comp_ty
/// that class member will be streamed
/// Name of element used in JSON

void TBufferJSON::WorkWithElement(TStreamerElement *elem, Int_t comp_type)
void TBufferJSON::WorkWithElement(TStreamerElement *elem, Int_t)
{
fExpectedChain = kFALSE;

TJSONStackObj *stack = Stack();
if (stack == 0) {
Error("WorkWithElement", "stack is empty");
Expand Down Expand Up @@ -1392,19 +1383,10 @@ void TBufferJSON::WorkWithElement(TStreamerElement *elem, Int_t comp_type)
return;
}

Bool_t isBasicType = (elem->GetType() > 0) && (elem->GetType() < 20);

fExpectedChain = isBasicType && (comp_type - elem->GetType() == TStreamerInfo::kOffsetL);

if (fExpectedChain && (gDebug > 3))
Info("WorkWithElement", " Expects chain for elem %s number %d",
elem->GetName(), number);

TClass *base_class = elem->IsBase() ? elem->GetClassPointer() : 0;

stack = PushStack(0);
stack->fElem = (TStreamerElement *) elem;
stack->fElemNumber = number;
stack->fIsElemOwner = (number < 0);

JsonStartElement(elem, base_class);
Expand Down Expand Up @@ -2484,48 +2466,27 @@ void TBufferJSON::WriteArrayDouble32(const Double_t *d, Int_t n,
TJSONPushValue(); \
if (n <= 0) { /*fJsonrCnt++;*/ fValue.Append("[]"); return; } \
TStreamerElement* elem = Stack(0)->fElem; \
if ((elem != 0) && (elem->GetType()>TStreamerInfo::kOffsetL) && \
(elem->GetType() < TStreamerInfo::kOffsetP) && \
(elem->GetArrayLength() != n)) fExpectedChain = kTRUE; \
if (fExpectedChain) { \
TStreamerInfo* info = Stack(1)->fInfo; \
Int_t startnumber = Stack(0)->fElemNumber; \
fExpectedChain = kFALSE; \
Int_t index(0); \
while (index<n) { \
elem = (TStreamerElement*)info->GetElements()->At(startnumber++);\
if (index>0) JsonStartElement(elem); \
if (elem->GetType()<TStreamerInfo::kOffsetL) { \
JsonWriteBasic(vname[index]); \
index++; \
} else { \
method((vname+index), elem->GetArrayLength(),typname); \
index+=elem->GetArrayLength(); \
if ((elem!=0) && (elem->GetArrayDim()>1) && (elem->GetArrayLength()==n)) { \
TArrayI indexes(elem->GetArrayDim() - 1); \
indexes.Reset(0); \
Int_t cnt = 0, shift = 0, len = elem->GetMaxIndex(indexes.GetSize()); \
while (cnt >= 0) { \
if (indexes[cnt] >= elem->GetMaxIndex(cnt)) { \
fValue.Append("]"); \
indexes[cnt--] = 0; \
if (cnt >= 0) indexes[cnt]++; \
continue; \
} \
fValue.Append(indexes[cnt] == 0 ? "[" : fArraySepar.Data()); \
if (++cnt == indexes.GetSize()) { \
method((vname+shift), len, typname); \
indexes[--cnt]++; \
shift+=len; \
} \
PerformPostProcessing(Stack(0), elem); \
} \
} else \
if ((elem!=0) && (elem->GetArrayDim()>1) && (elem->GetArrayLength()==n)) { \
TArrayI indexes(elem->GetArrayDim() - 1); \
indexes.Reset(0); \
Int_t cnt = 0, shift = 0, len = elem->GetMaxIndex(indexes.GetSize()); \
while (cnt >= 0) { \
if (indexes[cnt] >= elem->GetMaxIndex(cnt)) { \
fValue.Append("]"); \
indexes[cnt--] = 0; \
if (cnt >= 0) indexes[cnt]++; \
continue; \
} \
fValue.Append(indexes[cnt] == 0 ? "[" : fArraySepar.Data()); \
if (++cnt == indexes.GetSize()) { \
method((vname+shift), len, typname); \
indexes[--cnt]++; \
shift+=len; \
} \
} \
} else { \
method(vname, n, typname); \
} \
} else { \
method(vname, n, typname); \
} \
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -3613,7 +3574,7 @@ Int_t TBufferJSON::WriteClassBuffer(const TClass *cl, void *pointer)

//NOTE: In the future Philippe wants this to happen via a custom action
TagStreamerInfo(sinfo);
ApplySequence(*(sinfo->GetWriteObjectWiseActions()), (char *)pointer);
ApplySequence(*(sinfo->GetWriteTextActions()), (char *)pointer);

//write the byte count at the start of the buffer
// SetByteCount(R__c, kTRUE);
Expand Down