[root] / trunk / core / base / inc / TBuffer.h Repository:
ViewVC logotype

Log of /trunk/core/base/inc/TBuffer.h

Parent Directory Parent Directory


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 49019 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 31 17:18:33 2013 UTC (21 months, 3 weeks ago) by pcanal
File length: 21890 byte(s)
Diff to previous 46080
Import revision 48931 from the v5-34-00 patch branch:
Add the concept of implicit rules to (centrally) support automatic translation of
STL collection from numeric type to other numeric type or for when the contained
class has some rules.  Currently enabled only when the target is an std::vector.

Implement the transformation from STL container of numeric to any other numeric
type (both in TGenCollectionStreamer and TStreamerInfo[Actions]).

Migrate more of the conversions to TStreamerInfoActions.

Fix the Conversion of a Double32 or Float16 inside a collection of object to another
type (the previous implemetation was not supporting the customization of the factor
nor the number of bits).

Add TBuffer::ReadFastArrayWithNbits and WithFactor for use in the StreamerInfo Actions.

TStreamerInfoActions:

Introduce WithFactorMarker and NoFactorMarker to allow for less code duplicaton when
supporting Float16_t and Double32_t.
Replace the collection-memberwise action from loop over simple operation to using
ReadFastArray (to be compatible with TBufferXML).

Revision 46080 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 20 13:12:30 2012 UTC (2 years, 4 months ago) by pcanal
File length: 21496 byte(s)
Diff to previous 40872
templated input operator are no longer experimental remove the remnant of the previous implementation ... 10 years later

Revision 40872 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Sep 13 21:33:33 2011 UTC (3 years, 4 months ago) by pcanal
File length: 21544 byte(s)
Diff to previous 39551
From Chris Jones:

Put in place the infrastructure to optimize the I/O writes in the same way we optimized the I/O reads.

Rename TBuffer::ReadSequence to TBuffer::ApplySequence as they can be used both for reading and writing.  The 3 new signatures:

1. virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence &sequence, void *object);      
2. virtual Int_t ApplySequenceVecPtr(const TStreamerInfoActions::TActionSequence &sequence, void *start_collection, void *end_collection);      
3. virtual Int_t ApplySequence(const TStreamerInfoActions::TActionSequence &sequence, void *start_collection, void *end_collection);

The 1st version is optimized to read a single object. The 2nd version is optimized to read the content of TClonesArrays and vectors of pointers to objects.
The 3rd version is used to streamed any collections.

In TBranchElement, introduce a set FillLeaves member functions to precalculate many of the (existing) conditional.  Introduction support for the StreamerInfo write actions and sequences.

Revision 39551 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 3 18:37:05 2011 UTC (3 years, 7 months ago) by pcanal
File length: 21541 byte(s)
Diff to previous 39548
Add parameter 'copy' to TBuffer::Expand indicating whether the caller
want the existing data to be copy forward (the old behavior and the
new default is to copy the data forward).
Use this feature is TBasket::Reset to avoid a useless memcpy.

Revision 39548 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 2 21:16:27 2011 UTC (3 years, 7 months ago) by pcanal
File length: 21520 byte(s)
Diff to previous 39134
Add the function TBuffer::AutoExpand to centralize the automatic 
buffer extension policy.  This enable the ability to tweak it later
(for example instead of always doubling the size, increasing by
only at most 2Mb or take hints from the number of entries already
in a TBasket).

Revision 39134 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 6 19:19:17 2011 UTC (3 years, 8 months ago) by pcanal
File length: 21448 byte(s)
Diff to previous 37809
Avoid the error messages similar to:
  Error in <TBufferFile::ReadVersion>: Could not find the StreamerInfo with a checksum of -849380031 for the class "NeverWritten" in memberwise.root.
which is spurrious when it is issued when unstreaming a memberwised streamed collection which is always empty (Introduce TBuffer::ReadVersionForMemberWise
for this purpose).

Revision 37809 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jan 19 11:07:41 2011 UTC (4 years ago) by rdm
File length: 21374 byte(s)
Diff to previous 36061
Try to silence:
warning: 'TBuffer::fCacheStack' should be initialized in the member initialization list. As per Fed's request.

Revision 36061 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 4 16:05:51 2010 UTC (4 years, 3 months ago) by pcanal
File length: 21358 byte(s)
Diff to previous 35314
Introduce an optimized infrastructure for reading objects using a StreamerInfo.

Rather than driving the streaming using a switch statement inside TStreamerInfo::ReadBuffer,
the streaming is now driven using a simple loop over a sequence of configured StreamerInfo actions.

This improves run-time performance by allowing a dramatic reduction in function calls and code
branches at the expense of some code duplication.


There are 3 versions of this loop implemented in TBufferFile and overloaded in TBufferXML and TBufferSQL:

1. virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &sequence, void *object);      
2. virtual Int_t ReadSequenceVecPtr(const TStreamerInfoActions::TActionSequence &sequence, void *start_collection, void *end_collection);      
3. virtual Int_t ReadSequence(const TStreamerInfoActions::TActionSequence &sequence, void *start_collection, void *end_collection);

The 1st version is optimized to read a single object. The 2nd version is optimized to read the content of TClonesArrays and vectors of pointers to objects.
The 3rd version is used to streamed any collections.

TBufferXML and TBufferSQL overload the loops to introduce extra code to help the buffer keep track of which streamer
element is being streamed (this functionality is not used by TBufferFile.)

A TStreamerInfoActions::TActionSequence is an ordered sequence of configured actions.   

A configured action has both an action which is a free standing function and a configuration object deriving 
from TStreamerInfoActions::TConfiguration. The configuration contains information that is specific to the action
but varies from use to use, including the offset from the beginning of the object that needs to be updated.   
Other examples of configuration include the number of bits requested for storing a Double32_t or its factor and minimum.   


When the sequence is intended for a collection, the sequence also has a configuration object deriving
from TStreamerInfoActions::TLoopConfiguration which contains for example the size of the element of
a vector or the pointers to the iterators functions (see below).


Each TStreamerInfo has 2 reading sequences, one for object-wise reading (GetReadObjectWiseActions)
and one for member-wise reading (GetReadMemberWiseActions) which is used when streaming a TClonesArray
of a vector of pointer to the type of objects described by the TClass.


Each collection proxy has at least one reading sequences, one for the reading each version of the
contained class layout.


Each case of the TStreamerInfo::ReadBuffer switch statement is replaced by 4 new action functions,
one for the object wise reading, one for the member wise reading for TClonesArray and vector of pointers,
one for the member wise reading for a vector of object and one for all other collections.


Each collection (proxy) needs to provide 5 new free standing functions:

   // Set of functions to iterate easily throught the collection
   static const Int_t fgIteratorArenaSize = 16; // greater than sizeof(void*) + sizeof(UInt_t)

   typedef void (*CreateIterators_t)(void *collection, void **begin_arena, void **end_arena);
   virtual CreateIterators_t GetFunctionCreateIterators(Bool_t read = kTRUE) = 0; 
   // begin_arena and end_arena should contain the location of a memory arena of size fgIteratorSize. 
   // If the collection iterator are of that size or less, the iterators will be constructed in place in those location (new with placement)
   // Otherwise the iterators will be allocated via a regular new and their address returned by modifying the value of begin_arena and end_arena.
   
   typedef void* (*CopyIterator_t)(void *dest, const void *source);
   virtual CopyIterator_t GetFunctionCopyIterator(Bool_t read = kTRUE) = 0;
   // Copy the iterator source, into dest.   dest should contain the location of a memory arena of size fgIteratorSize.
   // If the collection iterator is of that size or less, the iterator will be constructed in place in this location (new with placement)
   // Otherwise the iterator will be allocated via a regular new and its address returned by modifying the value of dest.
   
   typedef void* (*Next_t)(void *iter, const void *end);
   virtual Next_t GetFunctionNext(Bool_t read = kTRUE) = 0;
   // iter and end should be pointers to respectively an iterator to be incremented and the result of collection.end()
   // If the iterator has not reached the end of the collection, 'Next' increment the iterator 'iter' and return 0 if 
   // the iterator reached the end.
   // If the end was not reached, 'Next' returns the address of the content pointed to by the iterator before the 
   // incrementation ; if the collection contains pointers, 'Next' will return the value of the pointer.
   
   typedef void (*DeleteIterator_t)(void *iter);
   typedef void (*DeleteTwoIterators_t)(void *begin, void *end);

   virtual DeleteIterator_t GetFunctionDeleteIterator(Bool_t read = kTRUE) = 0;
   virtual DeleteTwoIterators_t GetFunctionDeleteTwoIterators(Bool_t read = kTRUE) = 0;
   // If the size of the iterator is greater than fgIteratorArenaSize, call delete on the addresses,
   // Otherwise just call the iterator's destructor.
 
This functions are currently only 'emulated' using the old infrastructure for the collections other than vector ; they
will later one be provided by the dictionaries.

Revision 35314 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 16 03:22:09 2010 UTC (4 years, 4 months ago) by pcanal
File length: 20113 byte(s)
Diff to previous 35224
Migrate the functionality of TStreamerInfo::TagFile to a new interface TBuffer::TagStreamerInfo
so that TMessage can customize the behavior.  TMessage now relies on this new interface
instead of TBuffer::IncrementLevel which had the disadvantage of being called not only
during writing but also during reading (where there is no need to keep track of the StreamerInfo used).
[This change will also allow us to keep the calls to IncrementLevel/DecrementLevel only in the
case the buffer is a TBufferXML]
 
Fix the implementation of TSocket::RecvStreamerInfos to properly handle the case where there are
abstract classes (when GetStreamerInfo() can not be called on an abstract class until it has
been called for one of the concrete derived classes) and the case of STL containers.

Revision 35224 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 10 12:40:53 2010 UTC (4 years, 4 months ago) by pcanal
File length: 20042 byte(s)
Diff to previous 27845
Make TBuffer::Expand public, to allow external object (TBaskset) to re-size the buffer pre-emptively

Revision 27845 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 17 15:23:30 2009 UTC (5 years, 10 months ago) by pcanal
File length: 20039 byte(s)
Diff to previous 27759
Improve constness.
In constructor, do not 'tweak' the buffer size in read mode.
In SetBuffer, never expand the buffer in read mode.

Revision 27759 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 11 21:44:13 2009 UTC (5 years, 10 months ago) by brun
File length: 20033 byte(s)
Diff to previous 27683
From Federico:
mod for effc++

Revision 27683 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 3 20:15:49 2009 UTC (5 years, 10 months ago) by pcanal
File length: 20026 byte(s)
Diff to previous 25450
Allow user to provide a custom reallocator when the TBuffer is being passed
memory.  If the TBuffer does not own the memory __and__ no custom memory
reallocator has been set, a Fatal error will be issued:

Fatal in <TBufferFile::Expand>: Failed to expand the data buffer because TBuffer does not own it and no custom memory reallocator was provided.

This fixes the savannah issues 47611 and 39120

Revision 25450 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 18 21:13:42 2008 UTC (6 years, 4 months ago) by pcanal
File length: 19756 byte(s)
Diff to previous 24217
Import the code from the branch dev/datamodelevolution revision 25436

This implements the infrastructure for the new Data Model Evolution Scheme.

This Data Model Evolution is brought to your courtesy of BNL/STAR/ATLAS/Fermi/Cern

Current Capabilities:
  Assign values to transient data members
  Rename classes
  Rename data members
  Change the shape of the data structures or convert one class structure to another
  Change the meaning of data members
  Ability to access the TBuffer directly when needed
  Ensure that the objects in collections are handled in the same way as the ones stored separately
  Supported in object-wise, member-wise and split modes.

Coming soon:
  Make things operational also in bare ROOT mode
  Ability to transform data before writing
  Support for changing the class type of nested object in a split branch
  Support for access to onfile version of nested objects from within the parent rule

LinkDef rule syntax:
  Setting a transient member:

#pragma read sourceClass="ACache" targetClass="ACache" source="" version="[1-]" target="zcalc" \
   code="{ zcalc = false; }"

  Setting a new member from 2 removed members

#pragma read sourceClass="ACache" targetClass="ACache" source="int x; int y; char c"  version="[8]" target="z" \
   code="{ z = onfile.x*1000 + onfile.y*10; }"

   Renaming a class

#pragma read sourceClass="ACache" version="[8]" targetClass="Axis" \
   source="int x; int y;"  target="z" \
   code="{ z = onfile.x*1000 + onfile.y*
#pragma read sourceClass="ACache" version="[9]" targetClass="Axis";

Selection XML syntax

  <read  sourceClass="ACache" targetClass="ACache" source="" version="[1-]" target="zcalc">
  <![CDATA[
   { zcalc = false; }
  ]]></read>


Revision 24217 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 11 15:39:13 2008 UTC (6 years, 7 months ago) by brun
File length: 19482 byte(s)
Diff to previous 22961
-rename the function ForceWriteInfo to ForceWriteInfoClones
-add a new function
  virtual void ForceWriteInfo(TVirtualStreamerInfo *info, Bool_t force) = 0;

Revision 22961 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 3 13:32:57 2008 UTC (6 years, 9 months ago) by rdm
File length: 19391 byte(s)
Diff to previous 20877
move the directories:
  base clib cont meta metautils newdelete pcre rint thread unix utils
  winnt zip
under the new core meta directory.

Revision 20877 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 19 11:17:07 2007 UTC (7 years, 2 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 19391 byte(s)
Diff to previous 20170
Set property svn:eol-style LF on all source and Makefiles. This should avoid
problems with Win32 line endings ending up in the repository. All MS tools
support LF eols fine.

Revision 20170 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 2 09:02:20 2007 UTC (7 years, 3 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19391 byte(s)
Diff to previous 19826
First batch of changes to support the new data type Float16_t.
For more info about Float16_t see TBufferFile::WriteFloat16.

Revision 19826 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 19 19:56:11 2007 UTC (7 years, 4 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 18772 byte(s)
Diff to previous 19825
imported svn:keywords Id property

Revision 19825 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 19 19:49:10 2007 UTC (7 years, 4 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 18820 byte(s)
Diff to previous 18872
remove :$ from tag line

Revision 18872 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 23 22:12:29 2007 UTC (7 years, 8 months ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 18830 byte(s)
Diff to previous 18024
restore schema evolution for the content of unsplit TClonesArray (broken since 5.15/02)

Revision 18024 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 19 18:51:48 2007 UTC (7 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18811 byte(s)
Diff to previous 17996
Undo all the changes excluding functions from the abstract interface
to be visible from CINT.
Too many side-effects and not enough energy to solve the problem.
a real pity: we are waisting 1 MByte of real memory with ROOT Core.

Revision 17996 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 18 14:56:42 2007 UTC (7 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18832 byte(s)
Diff to previous 17943
For abstract interfaces, generate the CINT stub functions only for
the strict minimum of functions.
Keep only one pure function known to CINT such that CINT can
recognize that the class is abstract and has pure functions.
This optimization gains about one megabyte of generated code.

Revision 17943 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 13 20:28:34 2007 UTC (7 years, 11 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 18811 byte(s)
Diff to previous 17812
some  cleanups in comments and removal of duplicate inline.

Revision 17812 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Feb 9 08:37:21 2007 UTC (7 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18922 byte(s)
Diff to previous 17706
Remove the last references to TStreamerInfo in base directory and fix
all the consequences.

Revision 17706 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 5 18:08:45 2007 UTC (7 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18894 byte(s)
Diff to previous 17536
-Implement the new following functions in TBuffer
   // Utilities for TClass
   virtual   Int_t    ReadClassEmulated(TClass *cl, void *object) = 0;
   virtual   Int_t    ReadClassBuffer(TClass *cl, void *pointer) = 0;
   virtual   Int_t    ReadClassBuffer(TClass *cl, void *pointer, Int_t version, UInt_t start, UInt_t count) = 0;
   virtual   Int_t    WriteClassBuffer(TClass *cl, void *pointer) = 0;

Revision 17536 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Jan 28 18:26:10 2007 UTC (7 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18538 byte(s)
Diff to previous 17445
-Move the enum kCannotHandleMemberWiseStreaming from TBufferFile to TBuffer.
This enum is used by TClonesArray (cannot reference TBufferFile).

Revision 17445 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 23 06:10:39 2007 UTC (8 years ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17779 byte(s)
Diff to previous 17412
Implement new function
  virtual Int_t TBuffer::GetVersionOwner() const
It returns the version number of the buffer owner. In case of TBufferFile,
it returns the file version number.

This new function is introduced to further reduce the dependencies on the I/O system.

Revision 17412 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 20 19:29:35 2007 UTC (8 years ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17727 byte(s)
Diff to previous 17402
-Remove Varargs.h from TString.h and TObject.h and add this include
in the few files that need it.

-Move the following enums from TBuffer.h to TBufferFile.h

   enum { kMapSize = 503 };
   enum { kStreamedMemberWise = BIT(14) }; //added to version number to know if a collection has been stored member-wise
   enum { kNotDecompressed = BIT(15) };    //indicates a weird buffer, used by TBasket
   enum { kCannotHandleMemberWiseStreaming = BIT(17), //if set TClonesArray should not use memeber wise streaming
          kTextBasedStreaming = BIT(18) };            // indicates if buffer used for XML/SQL object streaming

Revision 17402 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jan 19 16:48:00 2007 UTC (8 years ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18179 byte(s)
Diff to previous 15011
CVs been changed into a pure abstract interface.
The concrete implementation is in the new class TBufferFile.
All classes previously deriving from TBuffer derive now from TBufferFile, ie

  TBuffer  <- TBufferFile  <- TMessage
                           <- TBufferXML
                           <- TBufferSQL
                           <- TBufferSQL2

Because there are several problems with C++ operators overloading,
The I/O operators are defined in TBuffer. These are inline functions
calling C++ virtual functions defined in TBuffer and overloaded
by TBufferFile and all other derived classes when necessary.

The previous implementation of TBuffer.h included <vector> and Bytes.h.
The two include statements have been moved to TBufferFile.h. As a result the
compilation of the ROOT system is now slightly faster and a big bonus
is that changes in TBufferFile or Bytes.h will affect only TBufferFile
and will not force the recompilation of the entire system.
This change has some side-effects. If you assumed that include <vector>
was done by TBuffer.h, you may have to specify this include directly
in your class. This was the case for a few ROOT classes.


 : ----------------------------------------------------------------------

Revision 15011 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 12 12:25:45 2006 UTC (8 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 26722 byte(s)
Diff to previous 13908
From Federico Carminati:
More changes to support the gcc effc++ option

Revision 13908 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 24 21:23:20 2006 UTC (9 years ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 26708 byte(s)
Diff to previous 13463
From Sergei Linev:
3 new virtual methods:
   virtual void TBuffer::ClassBegin(const TClass*, Version_t = -1) {}
   virtual void TBuffer::ClassEnd(const TClass*) {}
   virtual void TBuffer::ClassMember(const char*, const char*, Int_t = -1, Int_t = -1, Int_t = -1) {}
This method can be use to make a custom streamed object 'splitable'

Add a new Bit for TBuffer kTextBasedStreaming which can be used in the
streamer to facilitate writing to a text output (xml, sql).

Revision 13463 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 2 22:27:34 2005 UTC (9 years, 1 month ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 26389 byte(s)
Diff to previous 13433
Add TBuffer::StreamObject for TObject* (in addition to the non-TObject version

Revision 13433 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 1 16:28:56 2005 UTC (9 years, 1 month ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 26336 byte(s)
Diff to previous 13300
add an enum to mark whether a buffer can handle member wise streaming or not

Revision 13300 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 21 11:17:18 2005 UTC (9 years, 2 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 26222 byte(s)
Diff to previous 13254
coding style fixes.

Revision 13254 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 16 20:03:58 2005 UTC (9 years, 2 months ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 26226 byte(s)
Diff to previous 12480
Add fPidOffset to enable the quick transfer  of TKey/TBakset from one file to another

Revision 12480 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Aug 15 21:20:41 2005 UTC (9 years, 5 months ago) by pcanal
Original Path: trunk/base/inc/TBuffer.h
File length: 25977 byte(s)
Diff to previous 11606
Correct the default constructor
Add Read/WriteFastArrayString to allow overloading of the operation
(coming from TLeafC)

Revision 11606 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 18 10:54:58 2005 UTC (9 years, 9 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25653 byte(s)
Diff to previous 11253
Extend the functionality of the Double32_t data type (see below)
This extension supports higher precision than just a 32 bit float
and it also allows better compression when the range and number of bits
are specified.

New functions in TBuffer
  void TBuffer::ReadDouble32 (Double_t *d, TStreamerElement *ele)
  void TBuffer::WriteDouble32 (Double_t *d, TStreamerElement *ele)

The following functions of TBuffer have new signatures;
  Int_t TBuffer::ReadArrayDouble32(Double_t *&d, TStreamerElement *ele)
  Int_t TBuffer::ReadStaticArrayDouble32(Double_t *d, TStreamerElement *ele)
  void  TBuffer::ReadFastArrayDouble32(Double_t *d, Int_t n, TStreamerElement *ele)
  void  TBuffer::WriteArrayDouble32(const Double_t *d, Int_t n, TStreamerElement *ele)
  void  TBuffer::WriteFastArrayDouble32(const Double_t *d, Int_t n, TStreamerElement *ele)

The following data members have been added to TStreamerElement;
   Double_t  fXmin;    //Minimum of data member if a range is specified  [xmin,xmax,nbits]
   Double_t  fXmax;    //Maximum of data member if a range is specified  [xmin,xmax,nbits]
   Double_t  fFactor;  //Conversion factor if a range is specified fFactor = (1<<nbits/(xmax-xmin)

The static function GetRange has been added to TStreamerElement.cxx.
This function analyzes the range specifier given in the data member
comments field.

The following cases are supported for streaming a Double32_t type
depending on the range declaration in the comment field of the data member:
     A-    Double32_t     fNormal;
     B-    Double32_t     fTemperature; //[0,100]
     C-    Double32_t     fCharge;      //[-1,1,2]
     D-    Double32_t     fVertex[3];   //[-30,30,10]
     E     Int_t          fNsp;
           Double32_t*    fPointValue;   //[fNsp][0,3]

    In case A fNormal is converted from a Double_t to a Float_t
    In case B fTemperature is converted to a 32 bit unsigned integer
    In case C fCharge is converted to a 2 bits unsigned integer
    In case D the array elements of fVertex are converted to an unsigned 10 bits integer
    In case E the fNsp elements of array fPointvalue are converted to an unsigned 32 bit integer
              Note that the range specifier must follow the dimension specifier.
    the case B has more precision (9 to 10 significative digits than case A (6 to 7 digits).

    The range specifier has the general format: [xmin,xmax] or [xmin,xmax,nbits]
     [0,1]
     [-10,100];
     [-pi,pi], [-pi/2,pi/4],[-2pi,2*pi]
     [-10,100,16]
    if nbits is not specified, or nbits <2 or nbits>32 it is set to 32

TStreamerInfo has been modified to take into account the new facility
when streaming a Double32_t. It calls the new TBuffer functions ReadDouble32
and WriteDouble32 instead of the previous inline code.

Note that the files TEmulatedCollectionProxy.cxx and TGenCollectionStreamer.cxx
must still be modified to pass correctly the TStreamerElement object
to the Double32 conversion routines (for Philippe).

Note also that the class TXMLBuffer must still be changed to support
the Double32_t data type (for Sergei).

The test program Event has been modified to illustrate several combinations
of the range specifier.

The test program stress2 has been changed to take into account the slight
increase in the file size due to the new members in TStreamerElement.

Revision 11253 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 7 16:18:15 2005 UTC (9 years, 10 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 25354 byte(s)
Diff to previous 11246
Added
   CheckObject(const TObject*)
   CheckObject(const void *, const TClass *)
these functions return kTRUE if the specified object is already in
the TBuffer. The buffer must be in writing mode.

Revision 11246 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Mar 6 07:29:05 2005 UTC (9 years, 10 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25247 byte(s)
Diff to previous 11245
Move the enum kNotDecompressed=BIT(15) from TBasket to TBuffer
where it belongs logically.

Revision 11245 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 5 22:59:34 2005 UTC (9 years, 10 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25217 byte(s)
Diff to previous 11243
Ise BIT(16) instead of BIT(15) in TBuffer.

Revision 11243 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 5 22:15:52 2005 UTC (9 years, 10 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25163 byte(s)
Diff to previous 10728
Fix a potentially dangerous bomb for the future in TBuffer.h.
The enum kIsOwner (protected) and kStreamedMemberWise (public)
were both set to BIT(14) !!
I moved kIsOwner to public and set it to BIT(15) because
kStreamedMemberWise is already used for forward compatibility.
I added 3 user bits enum kUser1, kUser2, kUser3.
These bits can be used by the application to mark special cases when streaming.
For example, kUser3 is used by TCanvas::Streamer to avoid writing
twice the table of colors in case two or more canvases are streamed
to the same buffer (case seen by Marek in PROOF).
~
~

Revision 10728 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 9 07:14:03 2004 UTC (10 years, 1 month ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25082 byte(s)
Diff to previous 10572
From Sergei Linev
Add new method TBuffer::SkipObjectAny.
This new method reads the byte count for any object and jumps
to the data following this object. This new function facilitates
support for schema evolution with XML.

Revision 10572 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 19 14:28:17 2004 UTC (10 years, 2 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 25044 byte(s)
Diff to previous 10541
white space corrections, tab removal and error message corrections.

Revision 10541 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 17 06:02:52 2004 UTC (10 years, 2 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 25052 byte(s)
Diff to previous 10429
From Philippe:
This patch implements the schema evolution to and from selected containers.
The following cases are currently implemented:

  TClonesArray object -> STL object containing the same type
  TClonesArray pointer -> STL pointer containing the same type
  STL object -> STL object containing the same type
  STL pointer -> STL pointer containing the same type

  STL split branches -> TClonesArray

In addition this patch implement the ability to have schema evolution
between various version of a foreign class when the library is not present.

This patch also support in in TTree::Draw for the schema evolution of simple
type stored in a non-split branch.

Revision 10429 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 29 16:07:32 2004 UTC (10 years, 2 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 24863 byte(s)
Diff to previous 10350
Mods for port to latest aCC on HP-UX 11.5i. Most changes are related
to aCC now being standards compliant (STL container in proper std
namespace, etc.).

Revision 10350 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Oct 19 11:00:09 2004 UTC (10 years, 3 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 24858 byte(s)
Diff to previous 9619
From Philippe:
implements MemberWise streaming for collection with a
TVirtualCollectionProxy and whose content is splittable (i.e. guaranteed
homogeneous).

In this first implementation, objectwise streaming is still the default.
To activate memberwise streaming, call the static function
   TStreamerInfo::SetStreamMemberWise(kTRUE);

Revision 9619 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jul 30 01:12:28 2004 UTC (10 years, 5 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 24648 byte(s)
Diff to previous 9288
From Philippe:
This patch implements a const Write and keeps the existing non-const
Write. If somebody derived from TObject and overload Write(), they
will be reminded to implement the const version with a warning
similar to:

include/TCollection.h(45): warning #654: overloaded virtual function "TObject::Write" is only partially overridden in class "TCollection"
 class TCollection : public TObject {

The implementation of the non-const Write is simple: call the const Write().

Exceptions are TFile and TDirectory which actually can only implement
non const Write (and hence const Write outputs an error message).

Revision 9288 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 22 18:09:27 2004 UTC (10 years, 7 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 24509 byte(s)
Diff to previous 9053
From Philippe
TBuffer manages a stack of TStreamerInfo filled by IncrementLevel
and DecrementLevel.

Revision 9053 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat May 29 17:42:05 2004 UTC (10 years, 7 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 24295 byte(s)
Diff to previous 8843
Add member TStreamerInfo* fInfo in TBuffer.
fInfo is set when calling TBuffer::IncrementLevel(info).
fInfo may be used and may simplify some operations in TBuffer
for classes derived from TBuffer like tBufferXML.

Revision 8843 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 10 12:08:37 2004 UTC (10 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 24063 byte(s)
Diff to previous 8829
Improve constness of several functions
   void     WriteObject(const void *actualObjStart, const TClass *actualClass);
   void     MapObject(const void *obj, const TClass *cl, UInt_t offset = 1);
   Version_t  ReadVersion(UInt_t *start = 0, UInt_t *bcnt = 0, const TClass *cl = 0);
   Int_t    WriteObjectAny(const void *obj, const TClass *ptrClass);
   void     ReadFastArray(void  *start , const TClass *cl, Int_t n=1, TMemberStreamer *s=0);
   void     ReadFastArray(void **startp, const TClass *cl, Int_t n=1, Bool_t isPreAlloc=kFALSE, TMemberStr
   void     WriteFastArray(void  *start,  const TClass *cl, Int_t n=1, TMemberStreamer *s=0);
   Int_t    WriteFastArray(void **startp, const TClass *cl, Int_t n=1, Bool_t isPreAlloc=kFALSE, TMemberSt
   void     StreamObject(void *obj, const TClass *cl);

Revision 8829 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat May 8 14:34:09 2004 UTC (10 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 24001 byte(s)
Diff to previous 8812
Several TBuffer functions are made virtual by default.
This change is required for the new XML implementation
that implements a class TXmlBuffer deriving from TBuffer.
This change has some impact on the performance, in particular
when reading non-compressed files. We expect to regain
this loss in a future version with a further optimisation
of the function TStreamerInfo::Compile.
The table below indicates the loss in performance
on some machines.

                    normal     virtual   penalty
Linux gg3.2
stress -b 30          752rm     732rm      2.7%
stress -b 1000        628rm     623rm      0.8%
bench -b -q           624rm     602rm      3.5%
Event 5000 0 0 1     24.74s     25.67s     3.8%
Event 5000 0 0 20     7.49s      8.45s    12.8s
Event 5000 1 0 1     54.21s     55.12s     1.7%
Event 5000 1 0 20    15.58s     16.75s     7.5%
Event 5000 0 9 1     23.50s     24.24s     3.1%
Event 5000 0 9 20     7.38s      8.29s    12.3%
-----------------------------------------------
windows/VC++7.0
stress -b 30          860rm     843rm      1.9%
stress -b 1000        749rm     726rm      3.1%
bench -b -q           714rm     693rm      2.9%
Event 5000 0 0 1     18.85s     19.09s     1.3%
Event 5000 0 0 20     6.40s      7.03s     9.8%
Event 5000 1 0 1     44.07s     45.18s     2.5%
Event 5000 1 0 20    10.20s     11.05s     8.3%
-----------------------------------------------
sgi/cc
stress -b 30         194rm      192rm      1.1%
stress -b 1000       177rm      171rm      3.5%
bench -b -q          186rm      183rm      1.6%
Event 5000 0 0 1     74.82s     80.49s     7.6%
Event 5000 0 0 20    29.37s     35.54s    21.0%

Revision 8812 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 7 09:08:19 2004 UTC (10 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 29849 byte(s)
Diff to previous 7880
New functions added to TBuffer in view of the coming XML interface
   virtual void IncrementLevel(TStreamerInfo*)
   virtual void SetStreamerElementNumber(Int_t)
   virtual void DecrementLevel(TStreamerInfo*)

The IncrementLevel & Decrementlevel functions are called by the
TClass::ReadBuffer and TClassWriteBuffer functions.

The function SetStreamerElementNumber is called by
TStreamerInfo::ReadBuffer and TStreamerInfoWriteBuffer
to pass to the buffer the loop index.

This new version of TBuffer is still experimental.
If ROOT is compiled with the option R__BufferVirtual, several
functions from TBuffer are declared virtual. The default is
to have the TBuffer functions non virtual.

We are currently investigating the performance penalty induced
by making these functions virtual.

Revision 7880 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 10 10:52:31 2004 UTC (11 years ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 22685 byte(s)
Diff to previous 7828
From Philippe:

This mega patch introduces a new implementation of the STL I/O
which is backward and forward compatible.  In addition this is more
exactly a new implementation or an extension of the container I/O.

We are introducing a new abstract interface:
"TVirtualContainerProxy", which can be implemented to present a
proxy to any collection which the I/O (and TTreeFormula) can use
then transparently.

The TVirtualContainerProxy interface allows to the I/O system to
request some information and to execute some essential function of
the container:
   what kind of object/data does it contain
   does it contain pointers
   how to insert data into the container
   how to retrieve an array of pointer to the elements inside
   how to create a collection object
   how to clear the collection
   how to resize the collection
   how to streamer the collection (if needed)
   how to calculate the sizeof the collection
   how to calculate the number of elements of the collection.

Using those primitives, the I/O and TTreeFormula should be able to
access any collection.   The I/O should also be able to handle the
splitting of collections that can be split (i.e. contains a single
type of object/data).

The current compromise selected between code duplication,
performance of the I/O of TClonesArray and vector of pointers and
the performance of the I/O of other containers, was to have on
function handle all collection as if they were a C-style array of
pointers to data.  This implies for example that the I/O of vector
of object current passes via the construction of temporary array
of pointer.  The cost of this construction is usually ~Qjust~R the
cost of calculating the addresses of the elements and assigning it
to an array element.

Registering a collection proxy will be similar to
     static int dummy = GenerateInitInstance((CollectType*)0x0)-
>AdoptCollectionProxy(new CollectTypeProxy));

Follows a few details on the modifications made to some of the
files and classes.

Bytes.h:
   Work around a problem in the MSVC++ 6.0 optimizer.  This should
not affect other compilers.

String:
   Included the std::string dictionary into G__Base2.cxx, this
insures its presence at all time.
   Added a new file string.cxx holding the streamer for
std::string.

RConfig.h
   Added proper ansi stream configuration for AIX, KCC
   Added template specialization defect for MSVC

TBrowser
   Start adding the ability to browser non TObject classes

TBuffer
   To handle the reading and writing array of objects, added:
     Int_t    CheckByteCount(UInt_t startpos, UInt_t bcnt, const
TClass *clss, const char* classname);
     Int_t    CheckByteCount(UInt_t startpos, UInt_t bcnt, const
char *classname);
     void     ReadFastArray(void  *start , TClass *cl, Int_t n=1,
TMemberStreamer *s=0);
     void     ReadFastArray(void **startp, TClass *cl, Int_t n=1,
Bool_t isPreAlloc=kFALSE, TMemberStreamer *s=0);
     void     WriteFastArray(void  *start,  TClass *cl, Int_t n=1,
TMemberStreamer *s=0);
     Int_t    WriteFastArray(void **startp, TClass *cl, Int_t n=1,
Bool_t isPreAlloc=kFALSE, TMemberStreamer *s=0);

TROOT
   Enhancement to make the access to gROOT not dependent for the
library loading order.  In particular we added:
      ROOT::GetROOT()
   which should be used instead of gROOT.

   Improve support for STL.  In particular, now STL containers do
have a corresponding TClass object


TRealData
   Replace SetStreamer by AdoptStreamer that allow to use not only
a streamer function but also streamer object (allowing streamer
with a state for Foreign classes)

TString:
   Improve streamer performance

TSystem:
   More consistency of the return value of TSystem::CompileMacro

build/unix/makecintdlls.sh
   Stop making the string.dll

config:
   enhance sgicc makefiles

cont:
   fix TBits::operator=
   TClassTable now warns for duplicate only for non stl classes
   TClonesArray fix a typo

gpad:
   Add a new class TInspectObject to enable inspect non TObject
classes
   TRootBrowser : enable inspect non TObject classes

TFormula/TTreeFormula
   To enhance performance switch from using one array fOper which
contained the operation code and its arguments to using 2 arrays
fActions and fActionParams to store respectively the operation and
its parameters.
   A new function Convert is used to convert old version from the
fOper to fActions.  This allows cleaner coding and offer
optimization opportunities.

TTreePlayer
   Start adding support in MakeClass for STL containers.

TRint/TProofServ
   Insure the loading of the string support

Event.cxx
   make sure to avoid memory over-write

stress.cxx
   Add new parameters
      stress <nevent> <style> <subbench> <portion>
   if <subbench> is 1 or higher, print the benchmark results after
each test.  This allows understand
   which test is affect by a performance change.
   portion is a binary field to indicate which test to run.  This
allows to focus on a particular test.

TVirtualCollectionProxy
   Abstract interface used to access any type of containers from
the I/O system and TTreeFormula. See TVectorProxy and
TEmulatedVectorProxy for examples.

TEmulatedVectorProxy
   Implementation of a std::vector proxy to be able to read a
std::vector without any libraries.

TVectorProxy
   Implementation of TVirtualCollectionProxy for a std::vector for
which we have the library.

TStreamerInfo.cxx
   Split in 3 files:  TStreamerInfo.cxx
TStreamerInfoReadBuffer.cxx TStreamerInfoWriteBuffer.cxx

   All the ReadBuffer, ReadBufferClones and the new ReadBufferSTL
(similarly for  WriteBuffer) have been factorized into one
function and 2 short wrappers.  The new main function expect an
array of pointer to the objects (this array is most often of size
one).

   TClonesArray objects pass GetObjectRef(0) to the common
ReadBuffer
   vector<bla*> v pass &(v[0])
   vector<bla> needs to create an intermediary array to hold the
address

   This mechanism is sometimes not optimal (vector<blah>) but
allows extremely flexibly and extension.  Basically, to add
support for a new container type using the StreamerInfo mechanism
(in particular allows splitting), one 'just' need to implement a
TVirtualCollectionProxy, which, in particular, will return an
array of address to the object it contains.  Even std::map can be
handled with this mechanism, since, for I/O purposes, it can be
consider as a container of pairs.

   Add a few optimization, including more caching via a new array
of a new struct (fComp).

   Fixed a problem (re)introduced while implementing the Foreign
class CheckSum.  Doing:
      class Event;
      f = new TFile("Event.root");
   resulted in errors.

TCint
   Add proper support for TClass of STL containers. Fix a memory
leak.
   Add support for load TClass via a typedef.
   Fix a problem with multiple inheritance

TClass
   Fixed a problem (re)introduced while implementing the Foreign
class CheckSum.  Doing:
      class Event;
      f = new TFile("Event.root");
   resulted in errors.
   Add a

TClass/TGenericClassInfo/TDataMember
   Add support for a new interface (TVirtualCollectionProxy)
useable for STL containers or any user defined containers.
   Add support for streamer with are objects (as opposed to free
standing function or methods).  This allows the user a greater
flexibility in writing a streamer.
   Add a few optimizations
   Add CanSplit to answer the question for a whole Class (for
example some collection can not be splitted).

TClassStreamer
   New class to wrap a class wide streamer

ClassStreamerFunc_t
   typedef for a class wide streamer function

TMemberStreamer
   New class to wrap a specific class member streamer

MemberStreamerFunc_t
   typedef for  a specific class member streamer function

RootStreamer
   Macro to specify a free standing streamer object or function
for a class
   For example:
      RootStreamer(string,std_string_streamer);

TStreamerElement:
   A couple of optimization/simplification.
   Add support for the new STL I/O
   Extend the useful

TBranchElement:
   add a connection to the proper TVirtualCollectionProxy
   add support for STL containers (non-split and split mode)

TTree
   Make the function TTree::GetMakeClass NON-virtual for better
efficiency
   Add support for STL containers

TBasket
   Left (in comment) a yet unproved improvement proposed by
Victor.  The preliminary tests were inconclusive performance wise
and it had (seemingly) problem with backward and forward
compatibility.

TBranch
   Performance improvements

metautils
   This is a new package for C++ files shared between rootcint and
meta.
   It contains TClassEdit a class to help determine some property
of a class given its class name (stl, template, etc).

utils
   Introduced a new file RStl.cxx to start separating rootcint in
modules.
   Modified rootcint to support the new STL I/O methods.
   In particular a new class RStl is in charge of doing the
generating of code for STL containers.

Revision 7828 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jan 3 09:41:16 2004 UTC (11 years ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 22103 byte(s)
Diff to previous 7799
Add the following new functions:
   Int_t    ReadArrayDouble32(Double_t  *&d);
   Int_t    ReadStaticArrayDouble32(Double_t  *d);
   void     ReadFastArrayDouble32(Double_t  *d, Int_t n);
   void     WriteArrayDouble32(const Double_t  *d, Int_t n);
   void     WriteFastArrayDouble32(const Double_t  *d, Int_t n);

Revision 7799 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 25 17:47:02 2003 UTC (11 years, 1 month ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 21821 byte(s)
Diff to previous 6421
Add an optional argument to TBuffer::ReadVersion.
The new argument "TClass* cl) is used to retrieve the version number
corresponding to the class checksum.
This change is required to support automatic schema evolution
for foreign classes.

Revision 6421 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 11 11:48:11 2003 UTC (11 years, 9 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 21805 byte(s)
Diff to previous 6295
Big (unsigned) long long support patch. Following provided:
- basic typedefs in Rtypes.h: Long64_t and ULong64_t
- basic Long64 I/O support in TBuffer
- automatic Long64 I/O support in TStreamerInfo
- Long64 byteswap in Bytes.h
- Long64 type handling in classes like TDataMember, TDataType, TCint,
  TROOT, etc
- Removal of obsolete Long64_t typedefs in many PROOF classes
No changes for non-Long64 data types (no backward incompatibilies).
I/O tested for Long64 basic type, and static and dynamic arrays using
handcoded streamers, rootcint generated streamers and automatic StreamerInfo
streamers.

Revision 6295 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Mar 11 14:27:15 2003 UTC (11 years, 10 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 19481 byte(s)
Diff to previous 6056
fix in writing negative Long_t's, the unsused 4 bytes must be set to -1
and not 0 to be able to read on 64 bit machines at least up to 4 byte
negative longs. Without this fix -1 written on 32 bit was read as 4294967295
on a 64 bit machine.

Revision 6056 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Feb 5 15:03:05 2003 UTC (11 years, 11 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 19807 byte(s)
Diff to previous 6055
fix typo in comment of new fClassMap member.

Revision 6055 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Feb 4 22:04:17 2003 UTC (11 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19818 byte(s)
Diff to previous 5688
From Philippe:
The following patch insures that object of class using multiple inheritance with TObject not being in the
'left-most' inheritance part are now correctly returned even when they are saved multiple time in the same
buffer (the class information for these objects are stored only once, and was not available during the 2nd
reading).

Revision 5688 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 28 07:29:36 2002 UTC (12 years, 1 month ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19721 byte(s)
Diff to previous 5523
Fix by Philippe replacing R__GCC by R__GNU to be consistent with RConfig.h

Revision 5523 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 1 19:12:10 2002 UTC (12 years, 2 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19721 byte(s)
Diff to previous 5363
From Philippe:

This patch adds the ability to save objects of classes using multiple
inheritance (directly or indirectly) as part of other objects.
(Previously multiple inheritance was only supported for top level objects).

In TBuffer.h, TBuffer.cxx:

   TBuffer::WriteObject( const void *actualObjStart, TClass *actualClass);

has been made protected. It is replaced by

    WriteObjectAny(const void *obj, TClass *ptrClass);

which has a slightly different semantic (for multiple inheriting classes).
The value of 'obj' in expected to be a value that can be legally stored
in a pointer to an object of the type described by 'ptrClass'.  I.e:
    MyClass *ptr;
    ....
    b.WriteObjectAny(ptr,gROOT->GetClass(typeid(MyClass)));

We introduced:

   void    *ReadObjectAny(const TClass* cast);

which returns a value suitable to be stored in a pointer to an object of
the type described by 'cast'.  I.e, a typical usage is:
   MyClass *ptr = (MyClass*)b.ReadObjectAny(MyClass::Class());

The existing function

    TObject *TBuffer::ReadObject(const TClass *clReq)

now ignores its parameter and returns the address where the object read
actually start.  It should be noted that if the object is of a class
which derives from TObject but not as a first inheritance, this value is
NOT a valid TObject*.  We recommend using ReadObjectAny instead.

In TKey.cxx, I reverted the comments to properly describe how to deal with
top level object which inherits from TObject but not as a first inheritance
(can not use dynamic_cast).

In TGenericInfo.h, TGenericInfo.cxx, rootcint.cxx and TClass.cxx, we moved
to always use an IsA wrapper function instead of using the interpreter for
TObjects.

TClass.cxx has been modified to optimize a few function now called many
times.

TStreamerInfo.cxx and TStreamerElement.cxx has been modified to use the
new TBuffer function and to properly read/write multiple inheriting objects.

Revision 5363 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Sep 30 09:18:53 2002 UTC (12 years, 3 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19892 byte(s)
Diff to previous 5338
In the inline definition of the output operator << replace the call to
 buf.WriteObject(obj)
by
buf.WriteObject(obj, cl)

In TBuffer::ReadObject and TBuffer::WriteObject, replace calls to
StreamObject(obj,clRef)
by
clRef->Streamer(obj, *this);

With these corrections, one gain two levels of recursivity when
streaming TObject*. It makes I/O faster and may help on MACOSX
where the maximum recursivity level in the calling stack seems
to be limited.

Revision 5338 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Sep 21 20:46:11 2002 UTC (12 years, 4 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19841 byte(s)
Diff to previous 5337
Include <typeinfo> only for gcc on Solaris

Revision 5337 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Sep 21 08:12:14 2002 UTC (12 years, 4 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19790 byte(s)
Diff to previous 5002
Patch from Pat Welch/Eddy Offermann.
#include <typeinfo> is required by solarisgcc

Revision 5002 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 23 11:11:26 2002 UTC (12 years, 6 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 19763 byte(s)
Diff to previous 4727
remove trailing <cr> characters inserted by some windows editor.

Revision 4727 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 17 15:38:46 2002 UTC (12 years, 7 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19771 byte(s)
Diff to previous 4666
Fix from Philippe.
If the operator ">>" is required and not provided by the user,
then he get an error message.
If I/O is required and the '!' is used  and operator>> or operator<< is
missing, then an error message is printed.
The forward declaration of these operators has been moved back
to Rtypes.h. It was in TBuffer.h but TString.h does not include
TBuffer.h

Revision 4666 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 5 10:52:56 2002 UTC (12 years, 7 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 19620 byte(s)
Diff to previous 4656
small cleanup of coding style in Victors mods.

Revision 4656 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 4 07:29:13 2002 UTC (12 years, 7 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19607 byte(s)
Diff to previous 4498
Improvements by Victor Perevoztchikov
1. rootcint generates all codes for STL containers and arrays of containers.
   Now arrays of containers implemented for all STL types, before was only
  for vector and deque. It works for both, pointers and objects inside of
  containers.
  rootcint was simplified, now containers and arrays of ones generated by
  one routine.
  Special routine StreamerElement provides the code for different types.
  So everything located in one place and easy to maintain. It is easy to
  expand for all other code generators.

2.Some small addings to TBuffer, just to avoid direct use of gROOT->GetClass

Improvements in rootcint by Mathieu de Naurois in case of namespaces

Revision 4498 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 9 20:22:01 2002 UTC (12 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 19093 byte(s)
Diff to previous 4460
New attempt to introduce the new additions (Philippe) to the I/O system
as well as as the new version of ClassDef/ClassImp.
With the additions to the I/O, it is now possible to generate
a dictionary for classes not instrumented with ClassDef.

Revision 4460 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 6 10:11:08 2002 UTC (12 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17885 byte(s)
Diff to previous 4446
Revert to the 3.03/05 situation.
The new I/O scheme still requires more work due
to portability problems and the size of the dictionaries.

Revision 4446 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 3 14:30:43 2002 UTC (12 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 18071 byte(s)
Diff to previous 4196
Introduce a long patch by Philippe. With this patch, ROOT I/O
should be able to support foreign not-ROOT instrumented classes.
More information will come later.
This patch is tentatively put in the CVS head to facilitate
testing on all platforms.

Revision 4196 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 18 18:28:03 2002 UTC (12 years, 10 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17884 byte(s)
Diff to previous 4097
Declare the functions ReadObject/WriteObject/ReadClass/WriteClass virtual.
There was a request from the HESS experiment.
The performance penalty seems to be negligible (less than 1 per cent on stress)

Revision 4097 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Feb 25 12:36:52 2002 UTC (12 years, 11 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 17853 byte(s)
Diff to previous 4070
add support for reading and writing arrays of bools.

Revision 4070 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 23 10:15:22 2002 UTC (12 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17705 byte(s)
Diff to previous 3844
patch from Fons adding support for the native bool type in TBuffer & associates

Revision 3844 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Feb 3 16:13:27 2002 UTC (12 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17132 byte(s)
Diff to previous 3841
Replace the union
    union {
       TExMap *fReadMap;      //Map containing id,object references during reading
       TExMap *fWriteMap;     //Map containing object,id pairs during writing
    };
by
    TExMap   *fMap;           //Map containing object,id pairs for reading/ writing

The union was an unnecessary complication and also given problems
with rootcint when another pointer (eg fParent) was added to the class.

New constructors added:
    TBuffer(EMode mode);
    TBuffer(EMode mode, Int_t bufsiz);
    TBuffer(EMode mode, Int_t bufsiz, void *buf, Bool_t adopt = kTRUE);

The Get/SetParent moved to the implementation file.

Revision 3841 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 2 13:42:18 2002 UTC (12 years, 11 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 17224 byte(s)
Diff to previous 3836
make GetParent() const. Funny problem with CINT and location of fParent or
any other new datamember before the union.

Revision 3836 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Feb 2 11:52:46 2002 UTC (12 years, 11 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 17224 byte(s)
Diff to previous 3618
Add new member
  TObject *fParent; //fParent points to the buffer owner (typically a TFile).
Add new functions
  TObject *Getparent()
  void SetParent(TObject *parent);

The fParent info will be used instead of gFile in all the places currently
referencing gFile and reading/writing from/to a TBuffer.

Revision 3618 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jan 8 22:13:00 2002 UTC (13 years ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 16997 byte(s)
Diff to previous 3334
add support for I/O of const pointer data members, like e.g.:
   const TNamed *fName;
This required the introduction of an "operator>>(TBuffer &, const <class> *&)"
in the ClassDef and the generation of the implementation of this function
in rootcint. The non-const version is now calling the const version via
a cast (see ClassDef). Non TObject derived classes (TString and TArray's)
had the signature of their operator>>() changed to const to match the ClassDef.

Revision 3334 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 30 11:29:37 2001 UTC (13 years, 1 month ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 16992 byte(s)
Diff to previous 1837
new argument "adopt" to TBuffer ctor and to SetBuffer(). The default
value of the argument is kTRUE. When this value is kFALSE the buffer
passed will not be adopted by TBuffer and not deleted in the dtor
or in SetBuffer() when a new buffer is passed in. The default value
of adopt is backward compatible.

Revision 1837 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 21 09:28:01 2001 UTC (13 years, 10 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 16878 byte(s)
Diff to previous 1195
Files written with versions older than 3.00/06 had a non-portable
implementation of Long_t/ULong_t. These types should not have been used at all.
However, because some users had already written many files with these types
we provide a fix to be able to read old files.
The inline operator >> for Long_t has been moved to TBuffer.cxx.
A new function frombufOld local to TBuffer is called to read Long_t types
from buffers in files written before 3.00/06.

Revision 1195 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Dec 12 18:22:11 2000 UTC (14 years, 1 month ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 16869 byte(s)
Diff to previous 363
remove dummy implementation of copy ctor and assignment operator.

Revision 363 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jul 12 16:32:53 2000 UTC (14 years, 6 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 16824 byte(s)
Diff to previous 42
*** empty log message ***

Revision 42 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed May 24 10:31:48 2000 UTC (14 years, 8 months ago) by brun
Original Path: trunk/base/inc/TBuffer.h
File length: 16718 byte(s)
Diff to previous 3
- Change return type from void to Int_t for several read/write functions   in several classes. The Read functions return the number of bytes read,   the Write functions the number of bytes written.

Revision 3 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 16 17:00:58 2000 UTC (14 years, 8 months ago) by rdm
Original Path: trunk/base/inc/TBuffer.h
File length: 16649 byte(s)
Copied from: branches/rdm/base/inc/TBuffer.h revision 2
Diff to previous 2
This commit was generated by cvs2svn to compensate for changes in r2,
which included commits to RCS files with non-trunk default branches.

Revision 2 - (view) (download) (as text) (annotate) - [select for diffs]
Added Tue May 16 17:00:58 2000 UTC (14 years, 8 months ago) by rdm
Original Path: branches/rdm/base/inc/TBuffer.h
File length: 16649 byte(s)
Initial import of ROOT into CVS

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

Sort log by:

Subversion Admin
ViewVC Help
Powered by ViewVC 1.0.9