Changeset 79a3ee in git

Timestamp:

Aug 29, 2016, 3:46:57 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

96789547f72000c1f8c3028f096a81b2e0becb41

Parents:

22fabffdb78ca38871fffa9e8d162a5ad38f96e3

Message:

fix: count omalloc-internal small blocks from malloc

Location:

omalloc

Files:

• omStats.c (modified) (4 diffs)
• omStats.h (modified) (1 diff)

omalloc/omStats.c

@@ -11 +11 @@
 #include "omalloc.h"
 
-omInfo_t om_Info = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+omInfo_t om_Info = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 unsigned long om_SbrkInit = 0;
@@ -39 +39 @@
   om_Info.UsedBytesMalloc = OM_MALLOC_USED_BYTES;
 #else
-  om_Info.UsedBytesMalloc = om_Info.CurrentBytesFromMalloc;
+  om_Info.UsedBytesMalloc = om_Info.CurrentBytesFromMalloc
+                            -om_Info.InternalUsedBytesMalloc;
 #endif
 #ifdef OM_MALLOC_AVAIL_BYTES
@@ -115 +116 @@
 {
   omUpdateInfo();
-  fprintf(fd, "System %ldk:%ldk Appl %ldk/%ldk Malloc %ldk/%ldk Valloc %ldk/%ldk Pages %ld/%ld Regions %ld:%ld\n",
+  fprintf(fd, "System %ldk:%ldk Appl %ldk/%ldk Malloc %ldk/%ldk Valloc %ldk/%ldk Pages %ld/%ld Regions %ld:%ld Internal: %ld\n",
           om_Info.CurrentBytesSystem/1024, om_Info.MaxBytesSystem/1024,
           om_Info.UsedBytes/1024, om_Info.AvailBytes/1024,
@@ -121 +122 @@
           om_Info.CurrentBytesFromValloc/1024, om_Info.AvailBytesFromValloc/1024,
           om_Info.UsedPages, om_Info.AvailPages,
-          om_Info.CurrentRegionsAlloc, om_Info.MaxRegionsAlloc);
+          om_Info.CurrentRegionsAlloc, om_Info.MaxRegionsAlloc,
+          InternalUsedBytesMalloci/1024);
 }
 

omalloc/omStats.h

@@ -19 +19 @@
   long AvailBytes;          /* set in omUpdateInfo() */
   long UsedBytesMalloc;     /* set in omUpdateInfo(), needs malloc support */
+  long InternalUsedBytesMalloc;
   long AvailBytesMalloc;    /* set in omUpdateInfo(), needs malloc support */
   long MaxBytesFromMalloc;      /* always kept up-to-date */