Merge lp:~rodrigo-moya/ubuntuone-client/use-hash-tables into lp:ubuntuone-client

[Rodrigo Moya]

[r=dobey, r=lucio.torre] Use GHashTable instead of GSList for a slight performance win

[Rodrigo Moya (rodrigo-moya)]

Searching in GSList's can become quite slow when the uploads/downloads/shares lists become big (think 'uploading my whole photo collection') since it needs to iterate over the whole list. Using hash tables should be quicker for small lists and much more quicker for big/huge ones

[dobey (dobey)]

review: Approve

[lp:~rodrigo-moya/ubuntuone-client/use-hash-tables]

59. By Rodrigo Moya on 2009-06-26

Added instructions to test Nautilus extension with jhbuild

[Lucio Torre (lucio.torre)]

code looks great. couldn't test it.

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-06-17 20:04:32 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-06-26 11:11:21 +0000
@@ -61,9 +61,9 @@
   GHashTable * buttons;
 
   /* Lists of ul/dl/shares for setting emblems */
-  GSList * uploads;
-  GSList * downloads;
-  GSList * shares;
+  GHashTable * uploads;
+  GHashTable * downloads;
+  GHashTable * shares;
 } UbuntuOneNautilus;
 
 typedef struct {
@@ -147,13 +147,13 @@
 
   path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
 
-  if (g_slist_find (uon->uploads, path))
+  if (g_hash_table_lookup (uon->uploads, path))
     nautilus_file_info_add_emblem (file, "ubuntuone-uploading");
 
-  if (g_slist_find (uon->downloads, path))
+  if (g_hash_table_lookup (uon->downloads, path))
     nautilus_file_info_add_emblem (file, "ubuntuone-downloading");
 
-  if (g_slist_find (uon->shares, path))
+  if (g_hash_table_lookup (uon->shares, path))
     nautilus_file_info_add_emblem (file, "shared");
 
   return NAUTILUS_OPERATION_COMPLETE;
@@ -476,9 +476,9 @@
 
 static void ubuntuone_nautilus_instance_init (UbuntuOneNautilus * uon) {
   uon->connected = FALSE;
-  uon->uploads = NULL;
-  uon->downloads = NULL;
-  uon->shares = NULL;
+  uon->uploads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  uon->downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
 
   /* Magic bag of holding +10:
    * We store some button widgets in a hash table here, so that we can
@@ -571,28 +571,13 @@
   g_object_unref (uon->u1_status);
   g_object_unref (uon->bus);
 
-  for (l = uon->uploads; l != NULL; l = l->next) {
-    char * file = l->data;
-    uon->uploads = g_slist_remove (uon->uploads, file);
-    g_free (file);
-  }
-  g_slist_free (uon->uploads);
+  g_hash_table_destroy (uon->uploads);
   uon->uploads = NULL;
 
-  for (l = uon->downloads; l != NULL; l = l->next) {
-    char * file = l->data;
-    uon->downloads = g_slist_remove (uon->downloads, file);
-    g_free (file);
-  }
-  g_slist_free (uon->downloads);
+  g_hash_table_destroy (uon->downloads);
   uon->downloads = NULL;
 
-  for (l = uon->shares; l != NULL; l = l->next) {
-    char * file = l->data;
-    uon->shares = g_slist_remove (uon->shares, file);
-    g_free (file);
-  }
-  g_slist_free (uon->shares);
+  g_hash_table_destroy (uon->shares);
   uon->shares = NULL;
 
   g_hash_table_destroy (uon->buttons);
@@ -780,8 +765,9 @@
 					       gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
 
-  if (!g_slist_find (uon->uploads, path)) {
-    uon->uploads = g_slist_prepend (uon->uploads, path);
+  if (!g_hash_table_lookup (uon->uploads, path)) {
+    gchar *new_path = g_strdup (path);
+    g_hash_table_insert (uon->uploads, new_path, new_path);
     utime (path, NULL);
   }
 }
@@ -791,7 +777,7 @@
 						gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
 
-  uon->uploads = g_slist_remove (uon->uploads, path);
+  g_hash_table_remove (uon->uploads, path);
   utime (path, NULL);
 }
 
@@ -809,8 +795,9 @@
   else
     usepath = partial;
 
-  if (!g_slist_find (uon->uploads, usepath)) {
-    uon->downloads = g_slist_prepend (uon->downloads, g_strdup (usepath));
+  if (!g_hash_table_lookup (uon->uploads, usepath)) {
+    gchar *new_path = g_strdup (usepath);
+    g_hash_table_insert (uon->downloads, new_path, new_path);
     if (!g_file_test (usepath, G_FILE_TEST_EXISTS)) {
       fd = open (usepath, O_WRONLY | O_CREAT | O_NONBLOCK | O_NOCTTY,
 		 S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
@@ -834,7 +821,7 @@
   else
     usepath = partial;
 
-  uon->downloads = g_slist_remove (uon->downloads, usepath);
+  g_hash_table_remove (uon->downloads, usepath);
   utime (usepath, NULL);
 
   g_free (partial);
@@ -847,8 +834,10 @@
   gchar * path;
 
   path = g_hash_table_lookup (hash, "path");
-  if (!g_slist_find (uon->shares, path))
-    uon->shares = g_slist_prepend (uon->shares, path);
+  if (!g_hash_table_lookup (uon->shares, path)) {
+    gchar *new_share = g_strdup (path);
+    g_hash_table_insert (uon->shares, new_share, new_share);
+  }
 }
 
 /* Required Nautilus module handling methods */