Changeset 39

Timestamp:

05/01/2011 11:13:36 PM (2 years ago)

Author:

reyalP

Message:

add simple dependency system to rlib

File:

• trunk/lua/chdku.lua (modified) (11 diffs)

trunk/lua/chdku.lua

@@ -39 +39 @@
 end
 
---[[
+-- TODO this should be split out into it's own module(s)
+--[[
+simple library system for building remote commands
 chunks of source code to be used remotely
 can be used with chdku.exec
 TODO some of these are duplicated with local code, but we don't yet have an easy way of sharing them
 TODO would be good to minify
-TODO handle order and dependencies
 TODO passing compiled chunks might be better but our lua configurations are different
 ]]
-chdku.rlib={
+local rlibs = {
+        libs={},
+}
+
+--[[
+register{
+        name='libname'
+        depend={'lib1','lib2'...}, -- already registered rlibs this one requires (cyclic deps not allowed)
+        code='', -- main lib code.
+}
+]]
+function rlibs:register(t)
+        if type(t.depend) == 'nil' then
+                t.depend = {}
+        elseif type(t.depend) ~= 'table' then
+                error('expected dependency table')
+        end
+        if type(t.code) ~= 'string' then
+                error('expected code string')
+        end
+        if type(t.name) ~= 'string' then
+                error('expected name string')
+        end
+        for i,v in ipairs(t.depend) do
+                if not self.libs[v] then
+                        errf('%s missing dep %s\n',t.name,v)
+                end
+        end
+        self.libs[t.name] = t
+end
+
+--[[
+register an array of libs
+]]
+function rlibs:register_array(t)
+        for i,v in ipairs(t) do
+                self:register(v)
+        end
+end
+
+--[[
+add deps for a single lib
+]]
+function rlibs:build_single(build,name)
+        local lib = self.libs[name]
+        if not lib then
+                errf('unknown lib %s\n',tostring(name))
+        end
+        -- already added
+        if build.map[name] then
+                return
+        end
+        for i,dname in ipairs(lib.depend) do
+                self:build_single(build,dname)
+        end
+        build.map[name]=lib
+        table.insert(build.list,lib)
+end
+--[[
+return a list of rlibs in dependency order
+]]
+function rlibs:build_list(libnames)
+        local build={
+                list={},
+                map={},
+        }
+        for i,name in ipairs(libnames) do
+                self:build_single(build,name)
+        end
+        return build.list
+end
+--[[
+return a string containing all the required rlib code
+]]
+function rlibs:build(names)
+        local liblist = self:build_list(names)
+        -- TODO would be good to keep a map of line numbers here somehow
+        -- or possibly exec should keep the code around ?
+        local code=""
+        for i,lib in ipairs(liblist) do
+                code = code .. lib.code .. '\n'
+        end
+        return code
+end
+
+rlibs:register_array{
 --[[
 mostly duplicated from util.serialize
 global defaults can be changed from code
 ]]
-        serialize=[[
+{
+        name='serialize',
+        code=[[
 serialize_r = function(v,opts,seen,depth)
         local vt = type(v)
@@ -119 +207 @@
         return serialize_r(v,opts)
 end
-
 ]],
+},
 -- override default table serialization for messages
-        serialize_msgs=[[
+{
+        name='serialize_msgs',
+        depend={'serialize'},
+        code=[[
         usb_msg_table_to_string=serialize
 ]],
+},
 --[[
         status[,err]=dir_iter(path,func,opts)
@@ -132 +224 @@
 func is called with a nil filename after listing is complete
 ]]
-        dir_iter=[[
+{
+        name='dir_iter',
+        code=[[
 function dir_iter(path,func,opts)
         if not opts then
@@ -151 +245 @@
 end
 ]],
+},
 --[[
 function to batch stuff in groups of messages
@@ -161 +256 @@
 b:flush() sends any remaining items
 ]]
-        msg_batch=[[
+{
+        name='msg_batcher',
+        depend={'serialize_msgs'},
+        code=[[
 function msg_batcher(opts_in)
         local t = {
@@ -195 +293 @@
 end
 ]],
+},
 --[[
 retrieve a directory listing of names, batched in messages
 ]]
-        ls_simple=[[
+{
+        name='ls_simple',
+        depend={'msg_batcher'},
+        code=[[
 function ls_simple(path)
         local b=msg_batcher()
@@ -213 +315 @@
 end
 ]],
+},
 --[[
 TODO rework this to a general iterate over directory function
@@ -242 +345 @@
 TODO handle case if 'path' is a file
 ]]
-        ls=[[
+{
+        name='ls',
+        depend={'serialize_msgs'},
+        code=[[
 function ls(path,opts_in)
         local opts={
@@ -293 +399 @@
 end
 ]],
-}
-
+},
+}
+
+chdku.rlibs = rlibs
 --[[
 opts may be a table, or a string containing lua code for a table
@@ -310 +418 @@
                 {
                         wait=true,
-                        libs={'serialize','serialize_msgs','ls'},
+                        libs={'ls'},
                         msgs=function(msg)
                                 if msg.subtype ~= 'table' then
@@ -368 +476 @@
         local opts = extend_table({},opts_in)
         if opts.libs then
-                local libcode=''
-                for k,v in ipairs(opts.libs) do
-                        if chdku.rlib[v] then
-                                libcode = libcode .. chdku.rlib[v];
-                        else
-                                return false,'unknown rlib'..v
-                        end
-                end
-                code = libcode .. code
+                code = chdku.rlibs:build(opts.libs) .. code
         end
         local status,err=chdk.execlua(code)