Changeset 1234 for trunk/lib/lang/lang.c

Timestamp:

07/11/11 01:57:16 (23 months ago)

Author:

reyalp

Message:

memory saving patch from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg70056#msg70056

• changed some struct values from int to short (conf.c, gui_menu.h, platform.h)
• gui code cleanup plus some helper functions in gui_draw
• changed palette display under Miscellaneous stuff menu to use the same UI as the color picker in Visual settings (better and consistent UI, plus removes a chunk of code)
• packed version of font_8x16_uni.h default font, plus new tool to create packed version (this is done during the build so if changes are need to the font they can be done in font_8x16_uni.h).
• Change 'strings' pointer table in lang.c to an offset table (halves table size).
• Changes lang.c to use one buffer for the strings instead of allocating a new buffer for each string,

File:

• trunk/lib/lang/lang.c (modified) (6 diffs)

trunk/lib/lang/lang.c

@@ -4 +4 @@
 //-------------------------------------------------------------------
 
-static char **strings = NULL;
+// Array of offsets to each string stored in the 'sbuf' array
+static unsigned short *strings = NULL;
 static int count = 0;
+
+// Strings stored in one large umalloc'ed array rather than individually (reduces memory overhead)
+// Previously when loading a language file a block of memory was allocated to read the file
+// then another block was allocated for each string in the data read from the file, then the original
+// block was freed. This version uses the same buffer to read the file and store the strings.
+static char *sbuf = NULL;   
+static int sbuflen = 0;
 
 //-------------------------------------------------------------------
@@ -11 +19 @@
     int i;
 
-    if (strings) {
-       for (i=0; i<count; ++i)
-           if (strings[i]) ufree(strings[i]);
+    // Free old buffer (should not happen since this is only called once at startup)
+    if (strings)
+    {
        ufree(strings);
+       strings = 0;
        count = 0;
     }
 
+    // Free old buffer (should not happen since this is only called once at startup)
+    if (sbuf)
+    {
+        ufree(sbuf);
+        sbuf = 0;
+        sbuflen = 0;
+    }
+
+    // Allocate offset buffer
     ++num;
-    strings = umalloc(num*sizeof(char*));
+    strings = umalloc(num*sizeof(unsigned short));
     if (strings) {
-        memset(strings, 0, num*sizeof(char*));
+        memset(strings, 0, num*sizeof(unsigned short));
         count = num;
     }
-
 }
 
 //-------------------------------------------------------------------
-static void lang_add_string(int num, const char *str) {
+// Add a string to the buffer. String is cleaned up to convert special
+// characters and the offset of the string in 'sbuf' is stored in the
+// strings array.
+static void lang_add_string(int num, char *str) {
     int f=0;
     char *p;
 
-    if (strings && num<count) {
-       if (strings[num]) ufree(strings[num]);
-       p = strings[num] = umalloc(strlen(str)+1);
+    if (num<count) {
+       p = str;
+       strings[num] = (unsigned short)(str - sbuf);
        if (p) {
            for (; *str; ++str) {
@@ -55 +75 @@
 
 //-------------------------------------------------------------------
-void lang_load_from_mem(char *buf) {
+// Parse the 'sbuf' memory and build the strings offset array
+void lang_load_from_sbuf()
+{
     char *p, *s, *e;
     int i;
     
-    e = buf-1;
+    e = sbuf-1;
     while(e) {
         p = e+1;
@@ -82 +104 @@
 
 //-------------------------------------------------------------------
+// Allocate a new 'sbuf' array if needed.
+// If the existing one is large enough use it instead of getting a new block of memory.
+int alloc_sbuf(int len)
+{
+    if (len > sbuflen)
+    {
+        if (sbuf) ufree(sbuf);
+        sbuf = umalloc(len);
+        if (sbuf)
+        {
+            sbuflen = len;
+        }
+    }
+    return (sbuf != 0);
+}
+//-------------------------------------------------------------------
+// Load the default language data from memory.
+void lang_load_from_mem(char *buf) {
+    if (alloc_sbuf(strlen(buf)+1))
+    {
+        memcpy(sbuf,buf,sbuflen);
+        lang_load_from_sbuf();
+    }
+}
+
+//-------------------------------------------------------------------
+// Load language data from a file.
 void lang_load_from_file(const char *filename) {
     int f, size;
@@ -91 +140 @@
         size = (stat((char*)filename, &st)==0)?st.st_size:0;
         if (size) {
-            buf = umalloc(size+1);
-            if (buf) {
-                size = read(f, buf, size);
-                buf[size]=0;
-                lang_load_from_mem(buf);
-                ufree(buf);
+            if (alloc_sbuf(size+1))
+            {
+                size = read(f, sbuf, size);
+                sbuf[size]=0;
+                lang_load_from_sbuf();
             }
         }
@@ -104 +152 @@
 
 //-------------------------------------------------------------------
+// Return the string corresponding to the 'str' index.
 char* lang_str(int str) {
     if (str && str<0x1000) {
-        return (strings && str<count && strings[str])?strings[str]:"";
+        return (strings && str<count && strings[str])?sbuf+strings[str]:"";
     } else { // not ID, just char*
         return (char*)str;