Changeset e5d4294 in mainline for uspace/app/edit/sheet.c

Timestamp:

2009-09-16T21:31:46Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

57688fe2

Parents:

8c73012 (diff), 743e17b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge editor improvements from ~jsvoboda/helenos/edit.

File:

• uspace/app/edit/sheet.c (modified) (6 diffs)

uspace/app/edit/sheet.c

@@ -54 +54 @@
 #include <adt/list.h>
 #include <align.h>
+#include <macros.h>
 
 #include "sheet.h"
 
 enum {
-        TAB_WIDTH = 8
+        TAB_WIDTH       = 8,
+
+        /** Initial  of dat buffer in bytes */
+        INITIAL_SIZE    = 32
 };
 
@@ -64 +68 @@
 int sheet_init(sheet_t *sh)
 {
-        sh->dbuf_size = 65536;
+        sh->dbuf_size = INITIAL_SIZE;
         sh->text_size = 0;
 
@@ -95 +99 @@
         link_t *link;
         tag_t *tag;
+        char *newp;
 
         sz = str_size(str);
-        if (sh->text_size + sz > sh->dbuf_size)
-                return ELIMIT;
+        if (sh->text_size + sz > sh->dbuf_size) {
+                /* Enlarge data buffer. */
+                newp = realloc(sh->data, sh->dbuf_size * 2);
+                if (newp == NULL)
+                        return ELIMIT;
+
+                sh->data = newp;
+                sh->dbuf_size = sh->dbuf_size * 2;
+        }
 
         ipp = sh->data + pos->b_off;
 
+        /* Copy data. */
         memmove(ipp + sz, ipp, sh->text_size - pos->b_off);
         memcpy(ipp, str, sz);
         sh->text_size += sz;
 
-        /* Adjust tags */
+        /* Adjust tags. */
 
         link = sh->tags_head.next;
@@ -139 +152 @@
         link_t *link;
         tag_t *tag;
+        char *newp;
+        size_t shrink_size;
 
         spp = sh->data + spos->b_off;
@@ -146 +161 @@
         sh->text_size -= sz;
 
-        /* Adjust tags */
+        /* Adjust tags. */
         link = sh->tags_head.next;
         while (link != &sh->tags_head) {
@@ -158 +173 @@
                 link = link->next;
         }
-        
+
+        /* See if we should free up some memory. */
+        shrink_size = max(sh->dbuf_size / 4, INITIAL_SIZE);
+        if (sh->text_size <= shrink_size && sh->dbuf_size > INITIAL_SIZE) {
+                /* Shrink data buffer. */
+                newp = realloc(sh->data, shrink_size);
+                if (newp == NULL) {
+                        /* Failed to shrink buffer... no matter. */
+                        return EOK;
+                }
+
+                sh->data = newp;
+                sh->dbuf_size = shrink_size;
+        }
+
         return EOK;
 }