Changeset 2654

Timestamp:

10/25/08 16:21:41 (17 months ago)

Author:

hagish

Message:

extended ogre stats

Location:

trunk

Files:

• lua/gui/gui.helper.lua (modified) (2 diffs)
• scripts/stats.gnuplot (modified) (1 diff)
• scripts/stats_ogre.gnuplot (added)

trunk/lua/gui/gui.helper.lua

@@ -51 +51 @@
                 gMemStats_NextUpdate = gMyTicks + 1000
                 
-                local mem_dyn = gcinfo() or 0
+                local mem_dyn = (collectgarbage("count") or 0) * 1024
                 local b = OgreBatchCount()
                 local t = OgreTriangleCount()
@@ -57 +57 @@
                 local l = giShowLoading
                 local fps = OgreAvgFPS()
-                
+        
                 if gConfig:Get("gLogStatsToFile") then
                         -- write to file
                         local fp = io.open("stats.dat","a")
                         if (fp) then
-                                fp:write(gMyTicks.."\t"..fps.."\t"..b.."\t"..t.."\t"..memoryusage.."\t"..mem_dyn.."\t"..j.."\t"..l.."\n")
+                                fp:write(
+                                        -- 0
+                                        gMyTicks.."\t"..
+                                        fps.."\t"..
+                                        b.."\t"..
+                                        t.."\t"..
+                                        memoryusage.."\t"..
+                                        -- 5
+                                        mem_dyn.."\t"..
+                                        j.."\t"..
+                                        l.."\t"..
+                                        OgreMemoryUsage("compositor").."\t"..
+                                        OgreMemoryUsage("font").."\t"..
+                                        -- 10
+                                        OgreMemoryUsage("gpuprogram").."\t"..
+                                        OgreMemoryUsage("highlevelgpuprogram").."\t"..
+                                        OgreMemoryUsage("material").."\t"..
+                                        OgreMemoryUsage("mesh").."\t"..
+                                        OgreMemoryUsage("skeleton").."\t"..
+                                        -- 15
+                                        OgreMemoryUsage("texture").."\n"
+                                )
                                 fp:close()
                         end

trunk/scripts/stats.gnuplot

@@ -14 +14 @@
 set lmargin 10.
 
-set multiplot layout 7,1 scale 0.9,1.1
+set multiplot layout 7,1 scale 1,1
 
 plot "stats.dat" using 2 with lines title "fps"