Changeset 2286 for XIOS/dev

Timestamp:

01/10/22 13:35:22 (3 years ago)

Author:

jderouillat

Message:

For memtrack, switch addr2line from to backtrace_symbols. Add parse of mem files to validate memory usage.

Location:

XIOS/dev/dev_ym/XIOS_COUPLING

Files:

• src/memtrack.cpp (modified) (1 diff)
• xios_test_suite/TEST_SUITE/step2.py (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/memtrack.cpp

@@ -510 +510 @@
             sprintf(strbuff,"... %s:%d\n", fileName, lineNum);
             memReport<<strbuff ;
-            pBlockHeader->backTrace(memReport, myaddr2line);
-            //pBlockHeader->backTrace(memReport);
+            //pBlockHeader->backTrace(memReport, myaddr2line);
+            pBlockHeader->backTrace(memReport);
             i++ ;
         }

XIOS/dev/dev_ym/XIOS_COUPLING/xios_test_suite/TEST_SUITE/step2.py

@@ -46 +46 @@
         if line and not line.startswith("#"):
             yield line
+
+
+def extract_bytes( filename ):
+    print( filename )
+    fmem = open(filename, 'r')
+    bytes_tot = 0
+    for line in fmem:
+        if not( "bytes" in line ):
+            continue
+        
+        bytes_line = line.replace("\n", "")
+        print( bytes_line.split() )
+        bytes_str = bytes_line.split()[2]
+        if (bytes_str.isdigit() ):
+            bytes_tot += int( bytes_str )
+    fmem.close()
+  
+    return bytes_tot
+
 
 def main():
@@ -132 +151 @@
                         elif ( enable_mem_track=='--memtrack full' ) and ( '.mem' in files_list ) : # mem file
                             validated = 1
-                            OSinfo("diff "+config+"/"+checkfile+" "+"reference/ref_"+config+"/"+checkfile+" | grep bytes 2>&1  > diff_"+checkfile+".txt")
-                            if os.stat("diff_"+checkfile+".txt").st_size==0: # if no diff -> set 0
+                            ref_memory = extract_bytes( "reference/ref_"+config+"/"+checkfile )
+                            res_memory = extract_bytes( config+"/"+checkfile )
+                            if ( ref_memory == res_memory ) :
                                 validated = 1
-                            else: # if diff returns diff -> set -1
+                            else:
                                 validated = -1
                             report.write(folder_name+" "+folder_name+"@"+config_name+" "+folder_name+"@"+config_name+"@"+checkfile+" "+str(validated)+"\n")