Merge lp:~tintou/appcenter/optimizations into lp:~ricotz/appcenter/optimizations

[Corentin Noël]

I think it's better like this, tell me if it's a bad idea

[Rico Tzschichholz (ricotz)]

The boolean variable is not meant to catch race-conditions with threads, but simply the case if there is no matching package found or an error occurred, which the API suggests could happen.

If this function gets actually called in a multi-threaded environment adding a lock would make sense though.

[Zisu Andrei (matzipan)]

Rejecting as per Rico's comment.

[Zisu Andrei (matzipan)]

Whoops. Appears I can't do that myself. Rico?

Unmerged revisions

331. By Corentin Noël on 2016-10-27

Use existing variables.

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-10-26 14:24:07 +0000
+++ src/Core/Package.vala	2016-10-27 12:59:03 +0000
@@ -40,7 +40,6 @@
     public State state { public get; private set; default = State.NOT_INSTALLED; }
 
     private Pk.Package? package = null;
-    private bool package_retrieved = false;
 
     public double progress {
         get {
@@ -289,16 +288,16 @@
             return null;
         }
 
-        if (package_retrieved)
-            return package;
-
-        try {
-            package = AppCenterCore.Client.get_default ().get_app_package (component.get_pkgnames ()[0], 0LL);
-        } catch (Error e) {
-            critical (e.message);
+        lock (package) {
+            if (package == null) {
+                try {
+                    package = AppCenterCore.Client.get_default ().get_app_package (component.get_pkgnames ()[0], 0LL);
+                } catch (Error e) {
+                    critical (e.message);
+                }
+            }
         }
 
-        package_retrieved = true;
         return package;
     }
 }