Performance v2

src/core/app.lua

@@ -11,6 +11,7 @@ local ffi    = require("ffi")
 local C      = ffi.C
 require("core.packet_h")
 
+debug = false
 test_skipped_code = 43
 
 -- The set of all active apps and links in the system.
@@ -128,10 +129,13 @@ end
 
 -- Call this to "run snabb switch".
 function main (options)
-   local done = nil
    options = options or {}
+   local done = options.done
    local no_timers = options.no_timers
-   if options.duration then done = lib.timer(options.duration * 1e9) end
+   if options.duration then
+      assert(not done, "You can not have both 'duration' and 'done'")
+      done = lib.timer(options.duration * 1e9)
+   end
    repeat
       breathe()
       if not no_timers then timer.run() end
@@ -144,7 +148,9 @@ function breathe ()
    -- Inhale: pull work into the app network
    for _, app in ipairs(app_array) do
       if app.pull then
-         zone(app.zone) app:pull() zone()
+         if debug then zone(app.zone) end
+         app:pull()
+         if debug  then zone() end
       end
    end
    -- Exhale: push work out through the app network
@@ -157,7 +163,9 @@ function breathe ()
             link.has_new_data = false
             local receiver = app_array[link.receiving_app]
             if receiver.push then
-               zone(receiver.zone) receiver:push() zone()
+               if debug then zone(receiver.zone) end
+               receiver:push()
+               if debug then zone() end
                progress = true
             end
          end

src/core/freelist.lua

@@ -11,7 +11,7 @@ end
 
 function add (freelist, element)
    -- Safety check
-   assert(freelist.nfree < freelist.max, "freelist overflow")
+   if freelist.nfree == freelist.max then assert(freelist.nfree < freelist.max, "freelist overflow") end
    freelist.list[freelist.nfree] = element
    freelist.nfree = freelist.nfree + 1
 end

src/core/link.lua

@@ -1,6 +1,6 @@
 module(...,package.seeall)
 
-local debug = true
+local debug = false
 
 local ffi = require("ffi")
 local C = ffi.C
@@ -26,7 +26,7 @@ function receive (r)
 end
 
 function transmit (r, p)
-   assert(p)
+   if debug then assert(p) end
    if full(r) then
       r.stats.txdrop = r.stats.txdrop + 1
    else

src/core/memory.lua

@@ -92,17 +92,16 @@ local virt_page_cache = {}
 function virtual_to_physical (virt_addr)
    virt_addr = ffi.cast("uint64_t", virt_addr)
    local virt_page = tonumber(virt_addr / base_page_size)
-   local offset    = tonumber(virt_addr % base_page_size)
    local phys_page = virt_page_cache[virt_page]
    if not phys_page then
-      phys_page = C.phys_page(virt_page)
+      phys_page = C.phys_page(virt_page) * base_page_size
       virt_page_cache[virt_page] = phys_page
    end
    if phys_page == 0 then
       error("Failed to resolve physical address of "..tostring(virt_addr))
    end
    --assert(phys_page == C.phys_page(virt_page))
-   return ffi.cast("uint64_t", phys_page * base_page_size + offset)
+   return ffi.cast("uint64_t", phys_page + virt_addr % base_page_size)
 end
 
 --- ### selftest

src/core/packet.lua

@@ -19,6 +19,7 @@ packets    = ffi.new("struct packet[?]", max_packets)
 local packet_size = ffi.sizeof("struct packet")
 
 function module_init ()
+   ffi.fill(packets, max_packets * packet_size)
    for i = 0, max_packets-1 do
       free(packets[i])
    end
@@ -184,7 +185,7 @@ end
 function deref (p,  n)
    n = n or 1
    if p.refcount > 0 then
-      assert(p.refcount >= n)
+      if debug then assert(p.refcount >= n) end
       if n == p.refcount then
          free(p)
       else
@@ -203,9 +204,10 @@ function free (p)
    for i = 0, p.niovecs-1 do
       buffer.free(p.iovecs[i].buffer)
    end
-   ffi.fill(p, packet_size, 0)
    p.refcount       = 1
    p.fuel           = initial_fuel
+   p.niovecs        = 0
+   p.length         = 0
    freelist.add(packets_fl, p)
 end
 

src/designs/bench/basic1

@@ -38,11 +38,10 @@ function run (npackets)
    config.link(c, "Tee.tx2 -> Sink.rx2")
    engine.configure(c)
    local start = C.get_monotonic_time()
-   timer.init()
-   timer.activate(timer.new("null", function () end, 1e6, 'repeating'))
-   while engine.app_table.Source.output.tx.stats.txpackets < npackets do
-      engine.main({duration = 0.01, no_report = true})
+   local done = function ()
+       return engine.app_table.Source.output.tx.stats.txpackets >= npackets
    end
+   engine.main({done = done, no_report = true})
    local finish = C.get_monotonic_time()
    local runtime = finish - start
    local packets = engine.app_table.Source.output.tx.stats.txpackets

src/lib/virtio/net_device.lua

@@ -294,6 +294,10 @@ function VirtioNetDevice:map_from_guest (addr)
    for i = 0, table.getn(self.mem_table) do
       local m = self.mem_table[i]
       if addr >= m.guest and addr < m.guest + m.size then
+         if i ~= 0 then
+            self.mem_table[i] = self.mem_table[0]
+            self.mem_table[0] = m
+         end
          return addr + m.snabb - m.guest
       end
    end