(file) Return to Buffer.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Buffer.cpp between version 1.5 and 1.11

version 1.5, 2006/03/15 23:13:58 version 1.11, 2006/11/30 13:25:45
Line 29 
Line 29 
 // //
 //============================================================================== //==============================================================================
 // //
 // Author: Michael E. Brasher (mike-brasher@austin.rr.com -- Inova Europe)  
 //  
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
 #include <cstring> #include <cstring>
Line 39 
Line 37 
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
 BufferRep Buffer::_empty_rep = { 0, 0, {0} };  //
   // Note: _empty_rep is the only BufferRep object that may have a zero capacity.
   // So "_rep->cap == 0" implies "_rep == _empty_rep". But some platforms produce
   // more than one instance of _empty_rep (strangely). Therefore, it is safer to
   // use the former test rather than the latter.
   //
   BufferRep Buffer::_empty_rep =
   {
       0, /* size */
       0, /* cap (zero implies it is the _empty_rep) */
       {0} /* data[0] */
   };
  
 static const size_t MIN_CAPACITY = 2048; static const size_t MIN_CAPACITY = 2048;
  
 static Uint32 _next_pow_2(Uint32 x) static Uint32 _next_pow_2(Uint32 x)
 { {
       // Check for potential overflow in x.
       PEGASUS_CHECK_CAPACITY_OVERFLOW(x);
   
     if (x < MIN_CAPACITY)     if (x < MIN_CAPACITY)
         return MIN_CAPACITY;         return MIN_CAPACITY;
  
Line 61 
Line 73 
  
 static inline BufferRep* _allocate(size_t cap) static inline BufferRep* _allocate(size_t cap)
 { {
     BufferRep* rep = (BufferRep*)malloc(sizeof(BufferRep) + cap);      if (cap < MIN_CAPACITY)
           cap = MIN_CAPACITY;
   
       // Allocate an extra byte for null-termination performed by getData().
       BufferRep* rep = (BufferRep*)malloc(sizeof(BufferRep) + cap + 1);
   
     if (!rep)     if (!rep)
     {     {
         throw PEGASUS_STD(bad_alloc)();         throw PEGASUS_STD(bad_alloc)();
Line 72 
Line 89 
  
 static inline BufferRep* _reallocate(BufferRep* rep, size_t cap) static inline BufferRep* _reallocate(BufferRep* rep, size_t cap)
 { {
     rep = (BufferRep*)realloc(rep, sizeof(BufferRep) + cap);      // Allocate an extra byte for null-termination performed by getData().
       rep = (BufferRep*)realloc(rep, sizeof(BufferRep) + cap + 1);
   
     if (!rep)     if (!rep)
     {     {
         throw PEGASUS_STD(bad_alloc)();         throw PEGASUS_STD(bad_alloc)();
Line 101 
Line 120 
     {     {
         if (x._rep->size > _rep->cap)         if (x._rep->size > _rep->cap)
         {         {
             if (_rep != &_empty_rep)              if (_rep->cap != 0)
                 free(_rep);                 free(_rep);
  
             _rep = _allocate(x._rep->cap);             _rep = _allocate(x._rep->cap);
Line 115 
Line 134 
  
 void Buffer::_reserve_aux(size_t cap) void Buffer::_reserve_aux(size_t cap)
 { {
     if (_rep == &_empty_rep)      if (_rep->cap == 0)
     {     {
         _rep = _allocate(cap);         _rep = _allocate(cap);
         _rep->size = 0;         _rep->size = 0;
     }     }
     else     else
         _rep = _reallocate(_rep, _next_pow_2(cap));          _rep = _reallocate(_rep, _next_pow_2( (Uint32)cap));
 } }
  
 void Buffer::_append_char_aux() void Buffer::_append_char_aux()
 { {
     if (_rep == &_empty_rep)      if (_rep->cap == 0)
     {     {
         _rep = _allocate(MIN_CAPACITY);         _rep = _allocate(MIN_CAPACITY);
         _rep->size = 0;         _rep->size = 0;
     }     }
     else     else
       {
           // Check for potential overflow.
           PEGASUS_CHECK_CAPACITY_OVERFLOW(_rep->cap);
         _rep = _reallocate(_rep, _rep->cap ? (2 * _rep->cap) : MIN_CAPACITY);         _rep = _reallocate(_rep, _rep->cap ? (2 * _rep->cap) : MIN_CAPACITY);
 } }
   }
  
 void Buffer::insert(size_t pos, const char* data, size_t size) void Buffer::insert(size_t pos, const char* data, size_t size)
 { {
Line 152 
Line 175 
         memcpy(rep->data + pos, data, size);         memcpy(rep->data + pos, data, size);
         memcpy(rep->data + pos + size, _rep->data + pos, rem);         memcpy(rep->data + pos + size, _rep->data + pos, rem);
  
         if (_rep != &_empty_rep)          if (_rep->cap != 0)
             free(_rep);             free(_rep);
  
         _rep = rep;         _rep = rep;

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.11
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2