From 6c26346c8dce329b1dc643f92f027061c235bd06 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 3 Aug 2015 13:23:06 +0200
Subject: [PATCH 14/47] AgentManager: avoid recursion
 agentTypeAdded->readAgentTypes->agentTypeAdded

and the same with agent instances.
With 20 instances, this would make the dbus call agentInstances()
20 times, when getting the notification that akonadi is starting up
(so all processes are doing this at the same time, very bad for performance).

New solution: read agent types+instances at startup if Akonadi::Control is online,
otherwise when getting the notification that it is, or when getting the
signal that a type/instance was added. Always emit signals, but of course
when doing this from the constructor nobody is listening (no problem, fast).
The old code was using a different code path to avoid emitting signals for
the initially loaded types+instances, so the behavior is the same.

REVIEW: 124603
---
 akonadi/agentmanager.cpp | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/akonadi/agentmanager.cpp b/akonadi/agentmanager.cpp
index a9ac8a69a..ec7608b81 100644
--- a/akonadi/agentmanager.cpp
+++ b/akonadi/agentmanager.cpp
@@ -56,10 +56,7 @@ void AgentManagerPrivate::agentTypeAdded(const QString &identifier)
         return;
     }
 
-    const AgentType type = fillAgentType(identifier);
-    if (type.isValid()) {
-        mTypes.insert(identifier, type);
-
+    if (mTypes.isEmpty()) {
         // The Akonadi ServerManager assumes that the server is up and running as soon
         // as it knows about at least one agent type.
         // If we emit the typeAdded() signal here, it therefore thinks the server is
@@ -72,6 +69,11 @@ void AgentManagerPrivate::agentTypeAdded(const QString &identifier)
         //
         // Therefore, we read all agent types from the server here so they are known.
         readAgentTypes();
+    }
+
+    const AgentType type = fillAgentType(identifier);
+    if (type.isValid()) {
+        mTypes.insert(identifier, type);
 
         emit mParent->typeAdded(type);
     }
@@ -197,8 +199,10 @@ void AgentManagerPrivate::readAgentTypes()
     const QDBusReply<QStringList> types = mManager->agentTypes();
     if (types.isValid()) {
         foreach (const QString &type, types.value()) {
-            if (!mTypes.contains(type)) {
-                agentTypeAdded(type);
+            const AgentType agentType = fillAgentType(type);
+            if (agentType.isValid()) {
+                mTypes.insert(type, agentType);
+                emit mParent->typeAdded(agentType);
             }
         }
     }
@@ -209,8 +213,10 @@ void AgentManagerPrivate::readAgentInstances()
     const QDBusReply<QStringList> instances = mManager->agentInstances();
     if (instances.isValid()) {
         foreach (const QString &instance, instances.value()) {
-            if (!mInstances.contains(instance)) {
-                agentInstanceAdded(instance);
+            const AgentInstance agentInstance = fillAgentInstance(instance);
+            if (agentInstance.isValid()) {
+                mInstances.insert(instance, agentInstance);
+                emit mParent->instanceAdded(agentInstance);
             }
         }
     }
@@ -296,8 +302,12 @@ AgentInstance AgentManagerPrivate::fillAgentInstanceLight(const QString &identif
 void AgentManagerPrivate::serviceOwnerChanged(const QString &, const QString &oldOwner, const QString &)
 {
     if (oldOwner.isEmpty()) {
-        readAgentTypes();
-        readAgentInstances();
+        if (mTypes.isEmpty()) { // just to be safe
+            readAgentTypes();
+        }
+        if (mInstances.isEmpty()) {
+            readAgentInstances();
+        }
     }
 }
 
@@ -333,22 +343,8 @@ void AgentManagerPrivate::createDBusInterface()
                      mParent, SLOT(agentInstanceOnlineChanged(QString,bool)));
 
     if (mManager->isValid()) {
-        QDBusReply<QStringList> result = mManager->agentTypes();
-        if (result.isValid()) {
-            foreach (const QString &type, result.value()) {
-                const AgentType agentType = fillAgentType(type);
-                mTypes.insert(type, agentType);
-            }
-        }
-        result = mManager->agentInstances();
-        if (result.isValid()) {
-            foreach (const QString &instance, result.value()) {
-                const AgentInstance agentInstance = fillAgentInstance(instance);
-                mInstances.insert(instance, agentInstance);
-            }
-        }
-    } else {
-        kWarning() << "AgentManager failed to get a valid AgentManager DBus interface. Error is:" << mManager->lastError().type() << mManager->lastError().name() << mManager->lastError().message();
+        readAgentTypes();
+        readAgentInstances();
     }
 }
 
-- 
2.14.1