Ignore:
Timestamp:
06/06/17 17:58:16 (7 years ago)
Author:
oabramkina
Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_olga/src/memtrack.cpp

    r501 r1158  
    5252{ 
    5353  void addr2line(const char *file_name, char** addr, int naddr) ; 
     54#ifdef XIOS_MEMTRACK_LIGHT 
     55  void addr2line(const char *file_name, char** addr, int naddr) {}  
     56#endif 
    5457} 
    5558/* ------------------------------------------------------------ */ 
     
    5962namespace MemTrack 
    6063{ 
     64    size_t currentMemorySize=0 ; 
     65    size_t maxMemorySize=0 ;  
     66 
     67    size_t getCurrentMemorySize(void) {return currentMemorySize; } 
     68    size_t getMaxMemorySize(void) {return maxMemorySize ; } 
    6169 
    6270    /* ------------------------------------------------------------ */ 
     
    375383        // Get the offset to the user chunk and return it. 
    376384        UserChunk *pUser = GetUserAddress(pProlog); 
     385 
     386        currentMemorySize += size ; 
     387        if (currentMemorySize>maxMemorySize) maxMemorySize=currentMemorySize ; 
    377388         
    378389        return pUser; 
     
    400411        // Unlink the block header from the list and destroy it. 
    401412        BlockHeader *pBlockHeader = GetHeaderAddress(pProlog); 
     413        currentMemorySize-=pBlockHeader->GetRequestedSize(); 
    402414        BlockHeader::RemoveNode(pBlockHeader); 
    403415        pBlockHeader->~BlockHeader(); 
Note: See TracChangeset for help on using the changeset viewer.