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
io: use template<bool kIsTextT> parametrer for text actions
  • Loading branch information
@linev
linev committed May 16, 2017
commit 317f1aa4e730c3c204adf6c8dc9048ee0cea8b12
12 changes: 6 additions & 6 deletions io/io/src/TStreamerInfoActions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ namespace TStreamerInfoActions

/** Direct copy of code from TStreamerInfo::WriteBufferAux,
* potentially can be used later for non-text streaming */
template<bool isText>
template<bool kIsTextT>
INLINE_TEMPLATE_ARGS Int_t WriteSTLp(TBuffer &buf, void *addr, const TConfiguration *config)
{
TClass *cl = config->fCompInfo->fClass;
Expand Down Expand Up @@ -285,7 +285,7 @@ namespace TStreamerInfoActions
return 0;
}
UInt_t pos = buf.WriteVersion(config->fInfo->IsA(),kTRUE);
if (isText) {
if (kIsTextT) {
// use same method which is used in kSTL
buf.WriteFastArray((void **)((char *) addr + ioffset), cl, config->fCompInfo->fLength, kFALSE, 0);
} else
Expand All @@ -309,13 +309,13 @@ namespace TStreamerInfoActions

/** Direct copy of code from TStreamerInfo::WriteBufferAux,
* potentially can be used later for non-text streaming */
template<bool isText>
template<bool kIsTextT>
INLINE_TEMPLATE_ARGS Int_t WriteStreamerLoop(TBuffer &buf, void *addr, const TConfiguration *config)
{
UInt_t eoffset = 0; // extra parameter of TStreamerInfo::WriteBufferAux, 0 for all kind of objects writing
UInt_t ioffset = eoffset + config->fOffset;

if (!isText && config->fCompInfo->fStreamer) {
if (!kIsTextT && config->fCompInfo->fStreamer) {
// Get any private streamer which was set for the data member.
TMemberStreamer* pstreamer = config->fCompInfo->fStreamer;
// -- We have a private streamer.
Expand All @@ -341,7 +341,7 @@ namespace TStreamerInfoActions
// By default assume the file version is the newest.
Int_t fileVersion = kMaxInt;

if (!isText) {
if (!kIsTextT) {
// At this point we do *not* have a private streamer.
// Get the version of the file we are writing to.
TFile* file = (TFile*) buf.GetParent();
Expand Down Expand Up @@ -385,7 +385,7 @@ namespace TStreamerInfoActions
} // isPtrPtr
} // ndx
} else // vlen
if (isText) {
if (kIsTextT) {
// special handling for the text-based streamers
for (Int_t ndx = 0; ndx < config->fCompInfo->fLength; ++ndx)
buf.WriteFastArray((void *) 0, cl, -1, 0);
Expand Down