Ignore:
Timestamp:
06/06/17 19:06:45 (7 years ago)
Author:
yushan
Message:

fix bad commit. Back to R1155 branch not merged

File:
1 edited

Legend:

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

    r1156 r1160  
    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 
    5754} 
    5855/* ------------------------------------------------------------ */ 
     
    6259namespace MemTrack 
    6360{ 
    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 ; } 
    6961 
    7062    /* ------------------------------------------------------------ */ 
     
    384376        // Get the offset to the user chunk and return it. 
    385377        UserChunk *pUser = GetUserAddress(pProlog); 
    386  
    387         currentMemorySize += size ; 
    388         if (currentMemorySize>maxMemorySize) maxMemorySize=currentMemorySize ; 
    389378         
    390379        return pUser; 
     
    412401        // Unlink the block header from the list and destroy it. 
    413402        BlockHeader *pBlockHeader = GetHeaderAddress(pProlog); 
    414         currentMemorySize-=pBlockHeader->GetRequestedSize(); 
    415403        BlockHeader::RemoveNode(pBlockHeader); 
    416404        pBlockHeader->~BlockHeader(); 
Note: See TracChangeset for help on using the changeset viewer.