Changeset 5039

Timestamp:

07/09/09 16:53:08 (4 years ago)

Author:

jow

Message:

libs/sys: improve efficiency of sys.net.defaultroute(), can save hundreds of KB memory usage

Files:

• luci/trunk/libs/sys/luasrc/sys.lua (modified) (4 diffs)

luci/trunk/libs/sys/luasrc/sys.lua

@@ -297 +297 @@
 --            "flags", "device" }
 function net.defaultroute()
-    local route = nil
-    for _, r in pairs(net.routes()) do
-        if r.dest:prefix() == 0 and (not route or route.metric > r.metric) then
-            route = r
-        end
-    end
+    local route
+
+    net.routes(function(rt)
+        if rt.dest:prefix() == 0 and (not route or route.metric > rt.metric) then
+            route = rt
+        end
+    end)
+
     return route
 end
@@ -372 +374 @@
 --          { "dest", "gateway", "metric", "refcount", "usecount", "irtt",
 --            "flags", "device" }
-function net.routes()
+function net.routes(callback)
     local routes = { }
 
@@ -390 +392 @@
             )
 
-            routes[#routes+1] = {
+            local rt = {
                 dest     = dst_ip,
                 gateway  = gateway,
@@ -402 +404 @@
                 device   = dev
             }
+
+            if callback then
+                callback(rt)
+            else
+                routes[#routes+1] = rt
+            end
         end
     end