Changeset 3f6555d

Timestamp:

May 16, 2010, 1:15:25 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

c314f39

Parents:

f034ac0

git-author:

David Benjamin <davidben@mit.edu> (05/15/10 17:38:31)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:25)

Message:

Punt obarray and friends in favor of g_intern_string

It's somewhat faster (about 1.5x by completely unrigorous tests), and
it's less code for us to maintain.

Signed-off-by: David Benjamin <davidben@mit.edu>

Files:

• Makefile.am (modified) (1 diff)
• global.c (modified) (2 diffs)
• message.c (modified) (2 diffs)
• obarray.c (deleted)
• owl.h (modified) (2 diffs)
• tester.c (modified) (2 diffs)

Makefile.am

@@ -48 +48 @@
      keypress.c keymap.c keybinding.c cmd.c context.c \
      aim.c buddy.c buddylist.c style.c errqueue.c \
-     zbuddylist.c popexec.c obarray.c select.c wcwidth.c \
+     zbuddylist.c popexec.c select.c wcwidth.c \
      glib_compat.c filterproc.c
 

global.c

@@ -113 +113 @@
   g->pseudologin_notify = 0;
 
-  owl_obarray_init(&(g->obarray));
-
   owl_message_init_fmtext_cache();
   owl_list_create(&(g->io_dispatch_list));
@@ -1012 +1010 @@
 }
 
-const char * owl_global_intern(owl_global *g, const char * string)
-{
-  return owl_obarray_insert(&(g->obarray), string);
-}
-
 owl_list *owl_global_get_io_dispatch_list(owl_global *g)
 {

message.c

@@ -74 +74 @@
   if(pair ==  NULL) {
     pair = owl_malloc(sizeof(owl_pair));
-    owl_pair_create(pair, owl_global_intern(&g, attrname), NULL);
+    owl_pair_create(pair, g_intern_string(attrname), NULL);
     owl_list_append_element(&(m->attributes), pair);
   }
@@ -496 +496 @@
 void owl_message_set_hostname(owl_message *m, const char *hostname)
 {
-  m->hostname=owl_global_intern(&g, hostname);
+  m->hostname = g_intern_string(hostname);
 }
 

owl.h

@@ -521 +521 @@
   short **pairs;
 } owl_colorpair_mgr;
-
-typedef struct _owl_obarray {
-  owl_list strings;
-} owl_obarray;
 
 typedef struct _owl_io_dispatch {
@@ -623 +619 @@
   int pseudologin_notify;
   struct termios startup_tio;
-  owl_obarray obarray;
   owl_list io_dispatch_list;
   owl_list psa_list;

tester.c

@@ -33 +33 @@
   numfailures += owl_variable_regtest();
   numfailures += owl_filter_regtest();
-  numfailures += owl_obarray_regtest();
   numfailures += owl_editwin_regtest();
   if (numfailures) {
@@ -301 +300 @@
 }
 
-
-int owl_obarray_regtest(void) {
-  int numfailed = 0;
-  const char *p,*p2;
-
-  owl_obarray oa;
-  owl_obarray_init(&oa);
-
-  printf("# BEGIN testing owl_obarray\n");
-
-  p = owl_obarray_insert(&oa, "test");
-  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test"));
-  p2 = owl_obarray_insert(&oa, "test");
-  FAIL_UNLESS("returned string is equal", p2 && !strcmp(p2, "test"));
-  FAIL_UNLESS("returned the same string", p2 && p == p2);
-
-  p = owl_obarray_insert(&oa, "test2");
-  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test2"));
-  p2 = owl_obarray_find(&oa, "test2");
-  FAIL_UNLESS("returned the same string", p2 && !strcmp(p2, "test2"));
-
-  p = owl_obarray_find(&oa, "nothere");
-  FAIL_UNLESS("Didn't find a string that isn't there", p == NULL);
-
-  printf("# END testing owl_obarray (%d failures)\n", numfailed);
-
-  return numfailed;
-}
-
 int owl_editwin_regtest(void) {
   int numfailed = 0;