From 8a65399e2786db837b5ae5c01c7a0b14a65b8ddc Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 29 Nov 2005 03:01:56 +0000
Subject: [PATCH] less overhead per string for stringshare (overhead right now
 is 2 pointers, 1 int (ie 12 bytes on 32bit, 20 bytes on 64bit systems). this
 removes 2 ptrs of overhead (8 or 16 bytes) compared to before.

SVN revision: 18685
---
 legacy/evas/src/lib/data/evas_stringshare.c | 57 +++++++++++++--------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/legacy/evas/src/lib/data/evas_stringshare.c b/legacy/evas/src/lib/data/evas_stringshare.c
index b1e8f9358d..59b6ce8383 100644
--- a/legacy/evas/src/lib/data/evas_stringshare.c
+++ b/legacy/evas/src/lib/data/evas_stringshare.c
@@ -11,9 +11,8 @@ struct _Evas_Stringshare
 
 struct _Evas_Stringshare_El
 {
-   Evas_Object_List  _list_data;
-   char             *str;
-   int               references;
+   int                  references;
+   Evas_Stringshare_El *next, *prev;
 };
 
 static inline int _evas_stringshare_hash_gen(const char *str);
@@ -59,55 +58,69 @@ const char *
 evas_stringshare_add(const char *str)
 {
    int hash_num;
+   char *el_str;
    Evas_Stringshare_El *el;
-   Evas_Object_List *l;
 
    hash_num = _evas_stringshare_hash_gen(str);
-   for (l = share.buckets[hash_num]; l; l = l->next)
+   for (el = share.buckets[hash_num]; el; el = el->next)
      {
-	el = (Evas_Stringshare_El *)l;
-	if (!strcmp(el->str, str))
+	el_str = ((char *)el) + sizeof(Evas_Stringshare_El);
+	if (!strcmp(el_str, str))
 	  {
-	     if (l != share.buckets[hash_num])
+	     if (el->prev)
 	       {
-		  share.buckets[hash_num] = evas_object_list_remove(share.buckets[hash_num], el);
-		  share.buckets[hash_num] = evas_object_list_prepend(share.buckets[hash_num], el);
+		  el->prev->next = el->next;
+		  if (el->next) el->next->prev = el->prev;
+		  el->prev = NULL;
+		  el->next = share.buckets[hash_num];
+		  share.buckets[hash_num] = el;
 	       }
 	     el->references++;
-	     return el->str;
+	     return el_str;
 	  }
      }
-   if (!(el = malloc(sizeof(struct _Evas_Stringshare_El) + strlen(str) + 1))) return NULL;
-   el->str = ((unsigned char *)el) + sizeof(struct _Evas_Stringshare_El);
-   strcpy(el->str, str);
+   if (!(el = malloc(sizeof(Evas_Stringshare_El) + strlen(str) + 1))) return NULL;
+   el_str = ((char *)el) + sizeof(Evas_Stringshare_El);
+   strcpy(el_str, str);
    el->references = 1;
-   share.buckets[hash_num] = evas_object_list_prepend(share.buckets[hash_num], el);
-   return el->str;
+   el->prev = NULL;
+   el->next = share.buckets[hash_num];
+   share.buckets[hash_num] = el;
+   return el_str;
 }
 
 void
 evas_stringshare_del(const char *str)
 {
    int hash_num;
+   char *el_str;
    Evas_Stringshare_El *el;
-   Evas_Object_List *l;
 
    hash_num = _evas_stringshare_hash_gen(str);
-   for (l = share.buckets[hash_num]; l; l = l->next)
+   for (el = share.buckets[hash_num]; el; el = el->next)
      {
-	el = (Evas_Stringshare_El *)l;
-	if (!strcmp(el->str, str))
+	el_str = ((char *)el) + sizeof(Evas_Stringshare_El);
+	if (!strcmp(el_str, str))
 	  {
 	     el->references--;
 	     if (el->references == 0)
 	       {
+		  if (el->next) el->next->prev = el->prev;
+		  if (el->prev) el->prev->next = el->next;
+		  else share.buckets[hash_num] = el->next;
 		  share.buckets[hash_num] = evas_object_list_remove(share.buckets[hash_num], el);
 		  free(el);
 	       }
 	     else
 	       {
-		  share.buckets[hash_num] = evas_object_list_remove(share.buckets[hash_num], el);
-		  share.buckets[hash_num] = evas_object_list_prepend(share.buckets[hash_num], el);
+		  if (el->prev)
+		    {
+		       el->prev->next = el->next;
+		       if (el->next) el->next->prev = el->prev;
+		       el->prev = NULL;
+		       el->next = share.buckets[hash_num];
+		       share.buckets[hash_num] = el;
+		    }
 	       }
 	     return;
 	  }