Skip to content

Provide actions for text-based streamers #578

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

Closed
linev wants to merge 11 commits into from
Closed

Provide actions for text-based streamers #578

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0732e21
io: introduce actions list for text writing like JSON or XML
linev May 15, 2017
19fbe81
json: use new actions list for writing objects data
linev May 15, 2017
b5e04a6
io: provide specialized write actions for TObject and TNamed
linev May 15, 2017
073f307
json: fix problem with TObject storage
linev May 15, 2017
15741be
io: introduce WriteTextStreamerLoop action
linev May 16, 2017
f440364
io: make WriteStreamerLoop action templated
linev May 16, 2017
60107b4
json: fix problem with kStreamLoop with fCounter==1
linev May 16, 2017
52aa165
json: rudimentary support for TRef
linev May 16, 2017
c013c6d
io: provide kSTLp text write action
linev May 16, 2017
b9b7144
Merge branch 'master' into json
linev May 16, 2017
317f1aa
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
io: provide specialized write actions for TObject and TNamed 
When such classes stored, class streamer called directly.
Such approach does not work with text storage, therefore special actions
required.
  • Loading branch information
@linev
linev committed May 15, 2017
commit b5e04a62f569b7897c51eac6d2c87d477d3c2d7c
44 changes: 42 additions & 2 deletions io/io/src/TStreamerInfoActions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,23 @@ namespace TStreamerInfoActions
return 0;
}

INLINE_TEMPLATE_ARGS Int_t WriteTextTNamed(TBuffer &buf, void *addr, const TConfiguration *config)
{
void *x = (void*)( ((char*)addr) + config->fOffset );
// Idea: Implement buf.ReadBasic/Primitive to avoid the return value
buf.StreamObject(x, TNamed::Class(), TNamed::Class());
return 0;
}

INLINE_TEMPLATE_ARGS Int_t WriteTextTObject(TBuffer &buf, void *addr, const TConfiguration *config)
{
void *x = (void*)( ((char*)addr) + config->fOffset );
// Idea: Implement buf.ReadBasic/Primitive to avoid the return value
buf.StreamObject(x, TObject::Class(), TObject::Class());
return 0;
}


class TConfWithFactor : public TConfiguration {
// Configuration object for the Float16/Double32 where a factor has been specified.
public:
Expand Down Expand Up @@ -2877,6 +2894,9 @@ void TStreamerInfo::AddWriteTextAction(TStreamerInfoActions::TActionSequence *wr
// Skip artificial element used for reading purposes.
return;
}

Bool_t generic = kFALSE;

switch (compinfo->fType) {
// write basic types
case TStreamerInfo::kBool: writeSequence->AddAction( WriteBasicType<Bool_t>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;
Expand All @@ -2892,7 +2912,23 @@ void TStreamerInfo::AddWriteTextAction(TStreamerInfoActions::TActionSequence *wr
case TStreamerInfo::kUInt: writeSequence->AddAction( WriteBasicType<UInt_t>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;
case TStreamerInfo::kULong: writeSequence->AddAction( WriteBasicType<ULong_t>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;
case TStreamerInfo::kULong64: writeSequence->AddAction( WriteBasicType<ULong64_t>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;
// case TStreamerInfo::kBits: writeSequence->AddAction( WriteBasicType<BitsMarker>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;

case TStreamerInfo::kTObject:
if (element->IsBase())
generic = kTRUE;
else
writeSequence->AddAction( WriteTextTObject, new TConfiguration(this,i,compinfo,compinfo->fOffset) );
break;

case TStreamerInfo::kTNamed:
if (element->IsBase())
generic = kTRUE;
else
writeSequence->AddAction( WriteTextTNamed, new TConfiguration(this,i,compinfo,compinfo->fOffset) );
break;


// case TStreamerInfo::kBits: writeSequence->AddAction( WriteBasicType<BitsMarker>, new TConfiguration(this,i,compinfo,compinfo->fOffset) ); break;
/*case TStreamerInfo::kFloat16: {
if (element->GetFactor() != 0) {
writeSequence->AddAction( WriteBasicType_WithFactor<float>, new TConfWithFactor(this,i,compinfo,compinfo->fOffset,element->GetFactor(),element->GetXmin()) );
Expand Down Expand Up @@ -2958,9 +2994,13 @@ void TStreamerInfo::AddWriteTextAction(TStreamerInfoActions::TActionSequence *wr
break;
} */
default:
writeSequence->AddAction( GenericWriteAction, new TGenericConfiguration(this,i,compinfo) );
generic = kTRUE;
break;
}

// use generic write action when special handling is not provided
if (generic) writeSequence->AddAction( GenericWriteAction, new TGenericConfiguration(this,i,compinfo) );

#if defined(CDJ_NO_COMPILE)
if (element->TestBit(TStreamerElement::kCache)) {
TConfiguredAction action( writeSequence->fActions.back() ); // Action is moved, we must pop it next.
Expand Down