Merge lp:~3v1n0/bamf/cache-exec-string into lp:bamf

[Marco Trevisan (Treviño)]

BamfLegacyWindow: cache the window Exec string

We might use this value multiple times during the BAMF execution,
and we don't need to recompute it everytime. Caching looks a good compromise.

Caching the window exec-string, as w might use this value multiple times during the BAMF execution and we don't need to recompute it everytime. Caching looks a good compromise.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:624
http://jenkins.qa.ubuntu.com/job/bamf-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/bamf-saucy-armhf-ci/59

Click here to trigger a rebuild:
http://s-jenkins:8080/job/bamf-ci/77/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice. LGTM

review: Approve

=== modified file 'src/bamf-application.c'
--- src/bamf-application.c	2013-07-23 22:47:22 +0000
+++ src/bamf-application.c	2013-07-23 22:47:22 +0000
@@ -319,9 +319,8 @@
 
       if (!icon)
         {
-          char *exec = bamf_legacy_window_get_exec_string (legacy_window);
+          const char *exec = bamf_legacy_window_get_exec_string (legacy_window);
           icon = bamf_matcher_get_trimmed_exec (bamf_matcher_get_default (), exec);
-          g_free (exec);
 
           if (icon_name_is_valid (icon))
             {

=== modified file 'src/bamf-legacy-window-test.c'
--- src/bamf-legacy-window-test.c	2013-06-21 14:38:53 +0000
+++ src/bamf-legacy-window-test.c	2013-07-23 22:47:22 +0000
@@ -231,14 +231,14 @@
   return self->wm_class_instance;
 }
 
-char *
+const char *
 bamf_legacy_window_test_get_exec_string (BamfLegacyWindow *legacy_window)
 {
   BamfLegacyWindowTest *self;
 
   self = BAMF_LEGACY_WINDOW_TEST (legacy_window);
 
-  return g_strdup (self->exec);
+  return self->exec;
 }
 
 char *

=== modified file 'src/bamf-legacy-window.c'
--- src/bamf-legacy-window.c	2013-06-21 14:38:29 +0000
+++ src/bamf-legacy-window.c	2013-07-23 22:47:22 +0000
@@ -51,7 +51,8 @@
 struct _BamfLegacyWindowPrivate
 {
   WnckWindow * legacy_window;
-  char       * mini_icon_path;
+  gchar      * mini_icon_path;
+  gchar      * exec_string;
   gboolean     is_closed;
 };
 
@@ -218,10 +219,9 @@
   return result;
 }
 
-char *
+const char *
 bamf_legacy_window_get_exec_string (BamfLegacyWindow *self)
 {
-  gchar *result = NULL;
   gint pid = 0, i = 0;
   gchar **argv = NULL;
   GString *exec = NULL;
@@ -232,6 +232,9 @@
   if (BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_exec_string)
     return BAMF_LEGACY_WINDOW_GET_CLASS (self)->get_exec_string (self);
 
+  if (self->priv->exec_string)
+    return self->priv->exec_string;
+
   pid = bamf_legacy_window_get_pid (self);
 
   if (pid == 0)
@@ -251,9 +254,10 @@
 
   g_free (argv);
 
-  result = g_strdup (exec->str);
+  self->priv->exec_string = g_strdup (exec->str);
   g_string_free (exec, TRUE);
-  return result;
+
+  return self->priv->exec_string;
 }
 
 const char *
@@ -564,7 +568,6 @@
 
   self = BAMF_LEGACY_WINDOW (object);
 
-
   if (self->priv->mini_icon_path)
     {
       file = g_file_new_for_path (self->priv->mini_icon_path);
@@ -575,6 +578,12 @@
       self->priv->mini_icon_path = NULL;
     }
 
+  if (self->priv->exec_string)
+    {
+      g_free (self->priv->exec_string);
+      self->priv->exec_string = NULL;
+    }
+
   g_signal_handlers_disconnect_by_data (wnck_screen_get_default (), self);
 
   if (self->priv->legacy_window)

=== modified file 'src/bamf-legacy-window.h'
--- src/bamf-legacy-window.h	2013-06-21 14:38:29 +0000
+++ src/bamf-legacy-window.h	2013-07-23 22:47:22 +0000
@@ -77,7 +77,7 @@
   const char * (*get_class_name)          (BamfLegacyWindow *legacy_window);
   const char * (*get_class_instance_name) (BamfLegacyWindow *legacy_window);
   const char * (*save_mini_icon)          (BamfLegacyWindow *legacy_window);
-  char       * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
+  const char * (*get_exec_string)         (BamfLegacyWindow *legacy_window);
   char       * (*get_process_name)        (BamfLegacyWindow *legacy_window);
   char       * (*get_app_id)              (BamfLegacyWindow *legacy_window);
   char       * (*get_unique_bus_name)     (BamfLegacyWindow *legacy_window);
@@ -149,7 +149,7 @@
 
 const char       * bamf_legacy_window_save_mini_icon       (BamfLegacyWindow *self);
 
-char             * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);
+const char       * bamf_legacy_window_get_exec_string      (BamfLegacyWindow *self);
 
 char             * bamf_legacy_window_get_process_name     (BamfLegacyWindow *self);
 

=== modified file 'src/bamf-matcher.c'
--- src/bamf-matcher.c	2013-07-23 22:47:22 +0000
+++ src/bamf-matcher.c	2013-07-23 22:47:22 +0000
@@ -1350,7 +1350,7 @@
 {
   BamfMatcherPrivate *priv;
   GList *result = NULL, *table_list, *l;
-  char *exec_string;
+  const char *exec_string;
   char *trimmed;
 
   g_return_val_if_fail (BAMF_IS_MATCHER (self), NULL);
@@ -1376,7 +1376,6 @@
             }
           g_free (trimmed);
         }
-      g_free (exec_string);
     }
 
   if (result)
@@ -1794,9 +1793,8 @@
       const gchar *app_desktop_class;
 
       const char *win_instance_name = bamf_legacy_window_get_class_instance_name (window);
-      char *exec_string = bamf_legacy_window_get_exec_string (window);
+      const char *exec_string = bamf_legacy_window_get_exec_string (window);
       char *trimmed_exec = bamf_matcher_get_trimmed_exec (self, exec_string);
-      g_free (exec_string);
 
       if (trimmed_exec || win_class_name || win_instance_name)
         {
@@ -1819,9 +1817,8 @@
                         continue;
 
                       BamfLegacyWindow *w = bamf_window_get_window (BAMF_WINDOW (ll->data));
-                      char *wexec = bamf_legacy_window_get_exec_string (w);
+                      const char *wexec = bamf_legacy_window_get_exec_string (w);
                       char *wtrimmed = bamf_matcher_get_trimmed_exec (self, wexec);
-                      g_free (wexec);
 
                       if (g_strcmp0 (trimmed_exec, wtrimmed) == 0)
                         {