Attachment 102165 Details for Bug 79014 – Optimize-calendar-events-update-when-possible.

Optimize-calendar-events-update-when-possible.

0003-EDS-Optimize-calendar-events-update-when-possible.patch (text/plain), 5.52 KB, created by renato filho on 2014-07-02 21:40:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: renato filho

Created: 2014-07-02 21:40:52 UTC

Size: 5.52 KB

patch

obsolete

>From 3b20dfe6802e30766e098fec0b5116549ddce6cb Mon Sep 17 00:00:00 2001
>From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
>Date: Wed, 2 Jul 2014 16:49:09 -0300
>Subject: [PATCH 3/3] EDS: Optimize calendar events update when possible.
>
>Used the e_cal_client_modify_objects_sync function to modify a list of objects
>instead of modify the objects individually with e_cal_client_modify_object_sync.
>This reduce the dbus traffic and make the sync faster.
>---
> src/backends/evolution/EvolutionCalendarSource.cpp | 52 +++++++++++++---------
> 1 file changed, 31 insertions(+), 21 deletions(-)
>
>diff --git a/src/backends/evolution/EvolutionCalendarSource.cpp b/src/backends/evolution/EvolutionCalendarSource.cpp
>index 94cdc1e..68328c2 100644
>--- a/src/backends/evolution/EvolutionCalendarSource.cpp
>+++ b/src/backends/evolution/EvolutionCalendarSource.cpp
>@@ -673,24 +673,29 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
>                 } else {
>                     throwError(SE_HERE, "storing new item", gerror);
>                 }
>-
>+#ifdef USE_EDS_CLIENT
>+                GListCXX<icalcomponent, GSList> objs;
>+                BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
>+                    objs.push_front(*icalcomp);
>+                }
>+                if (!objs.empty() &&
>+                    !e_cal_client_modify_objects_sync(m_calendar, objs,
>+                                                      CALOBJ_MOD_THIS, NULL,
>+                                                      gerror)) {
>+                    throwError(SE_HERE, string("recreating item ") + luid, gerror);
>+                }
>+#else
>                 // Recreate any children removed earlier: when we get here,
>                 // the parent exists and we must update it.
>                 BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
>-                    if (
>-#ifdef USE_EDS_CLIENT
>-                        !e_cal_client_modify_object_sync(m_calendar, *icalcomp,
>-                                                         CALOBJ_MOD_THIS, NULL,
>-                                                         gerror)
>-#else
>-                        !e_cal_modify_object(m_calendar, *icalcomp,
>+                    if (!e_cal_modify_object(m_calendar, *icalcomp,
>                                              CALOBJ_MOD_THIS,
>                                              gerror)
>-#endif
>                         ) {
>                         throwError(SE_HERE, string("recreating item ") + newluid, gerror);
>                     }
>                 }
>+#endif
>             }
>         }
>     }
>@@ -769,16 +774,16 @@ EvolutionCalendarSource::InsertItemResult EvolutionCalendarSource::insertItem(co
>                 // Recreate any children removed earlier: when we get here,
>                 // the parent exists and we must update it.
> #ifdef USE_EDS_CLIENT
>-                GSList *objs = 0;
>+                GListCXX<icalcomponent, GSList> objs;
>                 BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
>-                    objs = g_slist_append(objs, *icalcomp);
>+                    objs.push_front(*icalcomp);
>                 }
>-                if (!e_cal_client_modify_objects_sync(m_calendar, objs,
>+                if (!objs.empty() &&
>+                    !e_cal_client_modify_objects_sync(m_calendar, objs,
>                                                       CALOBJ_MOD_THIS, NULL,
>                                                       gerror)) {
>                     throwError(SE_HERE, string("recreating item ") + luid, gerror);
>                 }
>-                g_slist_free(objs);
> #else
>                 BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
>                     if (!e_cal_modify_object(m_calendar, *icalcomp,
>@@ -893,6 +898,7 @@ void EvolutionCalendarSource::removeItem(const string &luid)
> 
>         // recreate children
>         bool first = true;
>+        GListCXX<icalcomponent, GSList> objs;
>         BOOST_FOREACH(boost::shared_ptr< eptr<icalcomponent> > &icalcomp, children) {
>             if (first) {
>                 char *uid;
>@@ -912,21 +918,25 @@ void EvolutionCalendarSource::removeItem(const string &luid)
> #endif
>                 first = false;
>             } else {
>-                if (
> #ifdef USE_EDS_CLIENT
>-                    !e_cal_client_modify_object_sync(m_calendar, *icalcomp,
>-                                                     CALOBJ_MOD_THIS, NULL,
>-                                                     gerror)
>+                objs.push_back(*icalcomp);
> #else
>-                    !e_cal_modify_object(m_calendar, *icalcomp,
>+                if (!e_cal_modify_object(m_calendar, *icalcomp,
>                                          CALOBJ_MOD_THIS,
>-                                         gerror)
>-#endif
>-                    ) {
>+                                         gerror)) {
>                     throwError(SE_HERE, string("recreating following item ") + luid, gerror);
>                 }
>+#endif
>             }
>         }
>+#ifdef USE_EDS_CLIENT
>+        if (!objs.empty() &&
>+            !e_cal_client_modify_objects_sync(m_calendar, objs,
>+                                               CALOBJ_MOD_THIS, NULL,
>+                                               gerror)) {
>+            throwError(SE_HERE, string("recreating following item ") + luid, gerror);
>+        }
>+#endif
>     } else {
>         // workaround for EDS 2.32 API semantic: succeeds even if
>         // detached recurrence doesn't exist and adds EXDATE,
>-- 
>2.0.0
>

Actions: View

Attachments on bug 79014: 99502 | 99503 | 102164 | 102165

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.