Changeset a387d12e

Timestamp:

Mar 27, 2007, 10:04:10 PM (18 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

61abb18

Parents:

702aee7

git-author:

Nelson Elhage <nelhage@mit.edu> (03/27/07 22:04:03)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/27/07 22:04:10)

Message:

Implementing an LRU cache of the message list fmtexts. This reduces
memory usage by roughly 1MB/kilo-zephyrs in steady state.

Files:

• fmtext.c (modified) (5 diffs)
• global.c (modified) (1 diff)
• message.c (modified) (11 diffs)
• owl.h (modified) (4 diffs)

fmtext.c

@@ -9 +9 @@
 {
   f->textlen=0;
-  f->textbuff=owl_strdup("");
+  f->bufflen=5;
+  f->textbuff=owl_malloc(5);
   f->fmbuff=owl_malloc(5);
   f->fgcolorbuff=owl_malloc(5);
   f->bgcolorbuff=owl_malloc(5);
+  f->textbuff[0]=0;
   f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE;
   f->fgcolorbuff[0]=OWL_COLOR_DEFAULT;
@@ -18 +20 @@
 }
 
+/* Clear the data from an fmtext, but don't deallocate memory. This
+   fmtext can then be appended to again. */
+void owl_fmtext_clear(owl_fmtext *f)
+{
+    f->textlen = 0;
+    f->textbuff[0] = 0;
+    f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE;
+    f->fgcolorbuff[0]=OWL_COLOR_DEFAULT;
+    f->bgcolorbuff[0]=OWL_COLOR_DEFAULT;
+}
+
 /* Internal function.  Set the attribute 'attr' from index 'first' to
  * index 'last'
@@ -59 +72 @@
 }
 
+void _owl_fmtext_realloc(owl_fmtext *f, int newlen) /*noproto*/
+{
+    if(newlen + 1 > f->bufflen) {
+      f->textbuff=owl_realloc(f->textbuff, newlen+1);
+      f->fmbuff=owl_realloc(f->fmbuff, newlen+1);
+      f->fgcolorbuff=owl_realloc(f->fgcolorbuff, newlen+1);
+      f->bgcolorbuff=owl_realloc(f->bgcolorbuff, newlen+1);
+      f->bufflen = newlen+1;
+  }
+}
+
 /* append text to the end of 'f' with attribute 'attr' and color
  * 'color'
@@ -65 +89 @@
 {
   int newlen;
-
   newlen=strlen(f->textbuff)+strlen(text);
-  f->textbuff=owl_realloc(f->textbuff, newlen+2);
-  f->fmbuff=owl_realloc(f->fmbuff, newlen+2);
-  f->fgcolorbuff=owl_realloc(f->fgcolorbuff, newlen+2);
-  f->bgcolorbuff=owl_realloc(f->bgcolorbuff, newlen+2);
-
+  _owl_fmtext_realloc(f, newlen);
+  
   strcat(f->textbuff, text);
   _owl_fmtext_set_attr(f, attr, f->textlen, newlen);
@@ -154 +174 @@
 
   newlen=strlen(f->textbuff)+(stop-start+1);
-  f->textbuff=owl_realloc(f->textbuff, newlen+1);
-  f->fmbuff=owl_realloc(f->fmbuff, newlen+1);
-  f->fgcolorbuff=owl_realloc(f->fgcolorbuff, newlen+1);
-  f->bgcolorbuff=owl_realloc(f->bgcolorbuff, newlen+1);
+  _owl_fmtext_realloc(f, newlen);
 
   strncat(f->textbuff, in->textbuff+start, stop-start+1);

global.c

@@ -108 +108 @@
 
   owl_obarray_init(&(g->obarray));
+
+  owl_message_init_fmtext_cache();
 }
 

message.c

@@ -13 +13 @@
 static const char fileIdent[] = "$Id$";
 
+static owl_fmtext_cache fmtext_cache[OWL_FMTEXT_CACHE_SIZE];
+static owl_fmtext_cache * fmtext_cache_next = fmtext_cache;
+
+void owl_message_init_fmtext_cache ()
+{
+    int i;
+    for(i = 0; i < OWL_FMTEXT_CACHE_SIZE; i++) {
+        owl_fmtext_init_null(&(fmtext_cache[i].fmtext));
+        fmtext_cache[i].message = NULL;
+    }
+}
+
+owl_fmtext_cache * owl_message_next_fmtext() /*noproto*/
+{
+    if(fmtext_cache_next->message != NULL) {
+        owl_message_invalidate_format(fmtext_cache_next->message);
+    }
+    owl_fmtext_cache * f = fmtext_cache_next;
+    fmtext_cache_next++;
+    if(fmtext_cache_next - fmtext_cache == OWL_FMTEXT_CACHE_SIZE)
+        fmtext_cache_next = fmtext_cache;
+    return f;
+}
+
 void owl_message_init(owl_message *m)
 {
@@ -19 +43 @@
   m->delete=0;
   m->zwriteline=NULL;
-  m->invalid_format=1;
 
   owl_message_set_hostname(m, "");
@@ -29 +52 @@
   m->timestr[strlen(m->timestr)-1]='\0';
 
-  /* initialize the fmtext */
-  owl_fmtext_init_null(&(m->fmtext));
+  m->fmtext = NULL;
 }
 
@@ -106 +128 @@
 void owl_message_invalidate_format(owl_message *m)
 {
-  m->invalid_format=1;
+  if(m->fmtext) {
+    m->fmtext->message = NULL;
+    owl_fmtext_clear(&(m->fmtext->fmtext));
+    m->fmtext=NULL;
+  }
 }
 
@@ -112 +138 @@
 {
   owl_message_format(m);
-  return(&(m->fmtext));
+  return(&(m->fmtext->fmtext));
 }
 
@@ -120 +146 @@
   owl_view *v;
 
-  if (m->invalid_format) {
+  if (!m->fmtext) {
+    m->fmtext = owl_message_next_fmtext();
+    m->fmtext->message = m;
     /* for now we assume there's just the one view and use that style */
     v=owl_global_get_current_view(&g);
     s=owl_view_get_style(v);
 
-    owl_fmtext_free(&(m->fmtext));
-    owl_fmtext_init_null(&(m->fmtext));
-    owl_style_get_formattext(s, &(m->fmtext), m);
-    m->invalid_format=0;
+    owl_style_get_formattext(s, &(m->fmtext->fmtext), m);
   }
 }
@@ -392 +417 @@
 char *owl_message_get_text(owl_message *m)
 {
-  return(owl_fmtext_get_text(&(m->fmtext)));
+  return(owl_fmtext_get_text(&(m->fmtext->fmtext)));
 }
 
@@ -437 +462 @@
   if (m == NULL) return(0);
   owl_message_format(m);
-  return(owl_fmtext_num_lines(&(m->fmtext)));
+  return(owl_fmtext_num_lines(&(m->fmtext->fmtext)));
 }
 
@@ -504 +529 @@
   owl_fmtext_init_null(&b);
   
-  owl_fmtext_truncate_lines(&(m->fmtext), aline, bline-aline+1, &a);
+  owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline+1, &a);
   owl_fmtext_truncate_cols(&a, acol, bcol, &b);
   if (fgcolor!=OWL_COLOR_DEFAULT) {
@@ -698 +723 @@
   owl_message_format(m); /* is this necessary? */
   
-  return (owl_fmtext_search(&(m->fmtext), string));
+  return (owl_fmtext_search(&(m->fmtext->fmtext), string));
 }
 
@@ -989 +1014 @@
   owl_list_free_simple(&(m->attributes));
  
-  owl_fmtext_free(&(m->fmtext));
-}
+  owl_message_invalidate_format(m);
+}

owl.h

@@ -249 +249 @@
 typedef struct _owl_fmtext {
   int textlen;
+  int bufflen;
   char *textbuff;
   char *fmbuff;
@@ -329 +330 @@
 } owl_pair;
 
+struct _owl_fmtext_cache;
+
 typedef struct _owl_message {
   int id;
@@ -335 +338 @@
   ZNotice_t notice;
 #endif
-  owl_fmtext fmtext;              /* this is now only a CACHED copy */
-  int invalid_format;             /* indicates whether fmtext needs to be regenerated */
+  struct _owl_fmtext_cache * fmtext;
   int delete;
   char *hostname;
@@ -344 +346 @@
   char *zwriteline;
 } owl_message;
+
+#define OWL_FMTEXT_CACHE_SIZE 1000
+/* We cache the saved fmtexts for the last bunch of messages we
+   rendered */
+typedef struct _owl_fmtext_cache {
+    owl_message * message;
+    owl_fmtext fmtext;
+} owl_fmtext_cache;
 
 typedef struct _owl_style {