Changeset 1178

Timestamp:

05/08/11 23:32:48 (2 years ago)

Author:

reyalP

Message:

get_meminfo for lua, see ​http://chdk.setepontos.com/index.php?topic=2509.msg66350#msg66350
also enabled CAM_FIRMWARE_MEMINFO for a590 and sx20

Location:

trunk

Files:

• core/luascript.c (modified) (4 diffs)
• platform/a590/platform_camera.h (modified) (1 diff)
• platform/sx20/platform_camera.h (modified) (1 diff)

trunk/core/luascript.c

@@ -1076 +1076 @@
 }
 
+static void set_number_field(lua_State* L, const char *key, int val)
+{
+  lua_pushnumber(L, val);
+  lua_setfield(L, -2, key);
+}
+
 static int luaCB_get_buildinfo( lua_State* L )
 {
@@ -1090 +1096 @@
   set_string_field( L,"os", "dryos" );
 #endif
-  lua_pushnumber( L, PLATFORMID );
-  lua_setfield(L, -2, "platformid");
+  set_number_field( L, "platformid", PLATFORMID );
   return 1;
 }
@@ -1579 +1584 @@
 }
 #endif
+
+/* helper for meminfo to set table field only if valid */
+static void set_meminfo_num( lua_State* L,const char *name, int val) {
+    if(val != -1) {
+        set_number_field( L, name, val );
+    }
+}
+/*
+meminfo=get_meminfo([heapname])
+get camera memory information
+heapname="system" or "exmem" if not given, meminfo is returned for heap used by CHDK for malloc
+meminfo is false if the requested heapname isn't valid ("exmem" when exmem is not enabled, or unknown)
+otherwise, a table of the form
+meminfo = {
+    name -- string "system" or "exmem"
+    chdk_malloc -- bool, this is the heap used by CHDK for malloc
+    chdk_start -- number, load address of CHDK
+    chdk_size -- number, size of CHDK image
+    -- all the following are numbers, will not be set if not available
+    start_address
+    end_address
+    total_size
+    allocated_size
+    allocated_peak
+    allocated_count
+    free_size
+    free_block_max_size
+    free_block_count
+}
+NOTES
+* under vxworks and cameras without GetMemInfo only the only valid fields
+  for the system heap will be those defined by chdk and free_block_max_size
+* the meaning of fields may not correspond exactly between exmem and system
+*/
+static int luaCB_get_meminfo( lua_State* L ) {
+    // for memory info, duplicated from lowlevel
+    extern const char _start,_end;
+
+#if defined(OPT_EXMEM_MALLOC) && !defined(OPT_EXMEM_TESTING)
+    const char *default_heapname="exmem";
+#else
+    const char *default_heapname="system";
+#endif
+    const char *heapname = luaL_optstring( L, 1, default_heapname );
+    cam_meminfo meminfo;
+
+    if(strcmp(heapname,"system") == 0) {
+#if defined(CAM_FIRMWARE_MEMINFO)
+        GetMemInfo(&meminfo);
+#else
+        memset(&meminfo,0xFF,sizeof(cam_meminfo));
+        meminfo.free_block_max_size = core_get_free_memory();
+#endif
+    }
+#if defined(OPT_EXMEM_MALLOC) && !defined(OPT_EXMEM_TESTING)
+    else if(strcmp(heapname,"exmem") == 0) {
+        GetExMemInfo(&meminfo);
+        meminfo.allocated_count = -1; // not implemented in suba
+    }
+#endif
+    else {
+        lua_pushboolean(L,0);
+        return 1;
+    }
+    // adjust start and size, if CHDK is loaded at heap start
+    if(meminfo.start_address == (int)(&_start)) {
+        meminfo.start_address += MEMISOSIZE;
+        meminfo.total_size -= MEMISOSIZE;
+    }
+    lua_createtable(L, 0, 13); // might not always use 13, but doesn't hurt
+    set_string_field( L,"name", heapname );
+    lua_pushboolean( L, (strcmp(heapname,default_heapname)==0));
+    lua_setfield(L, -2, "chdk_malloc");
+    set_number_field( L, "chdk_start", (int)(&_start) );
+    set_number_field( L, "chdk_size", MEMISOSIZE );
+    set_meminfo_num( L, "start_address", meminfo.start_address );
+    set_meminfo_num( L, "end_address", meminfo.end_address);
+    set_meminfo_num( L, "total_size", meminfo.total_size);
+    set_meminfo_num( L, "allocated_size", meminfo.allocated_size);
+    set_meminfo_num( L, "allocated_peak", meminfo.allocated_peak);
+    set_meminfo_num( L, "allocated_count", meminfo.allocated_count);
+    set_meminfo_num( L, "free_size", meminfo.free_size);
+    set_meminfo_num( L, "free_block_max_size", meminfo.free_block_max_size);
+    set_meminfo_num( L, "free_block_count", meminfo.free_block_count);
+    return 1;
+}
 
 void register_lua_funcs( lua_State* L )
@@ -1772 +1863 @@
 
 #endif
-}
+   FUNC(get_meminfo);
+}

trunk/platform/a590/platform_camera.h

@@ -66 +66 @@
 #define CAM_MULTIPART               1
 #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
+
+#define CAM_FIRMWARE_MEMINFO    1       // Use 'GetMemInfo' to get free memory size.
+
 //----------------------------------------------------------
 

trunk/platform/sx20/platform_camera.h

@@ -120 +120 @@
                                                                                                                         // see http://chdk.setepontos.com/index.php?topic=6179.0
 
+#define CAM_FIRMWARE_MEMINFO    1       // Use 'GetMemInfo' to get free memory size.
 //----------------------------------------------------------