Changeset 14736

Timestamp:

Apr 24, 2016, 7:56:41 AM (6 years ago)

Author:

mikedld

Message:

Reduce torrents model memory requirements (Qt client)

Keep torrents sorted by ID. This allows to remove ID to row/torrent mappings
(using binary search instead) and thus also reduce complexity a bit.

Location:

trunk/qt

Files:

• TorrentModel.cc (modified) (10 diffs)
• TorrentModel.h (modified) (3 diffs)

trunk/qt/TorrentModel.cc

@@ -18 +18 @@
 #include "TorrentModel.h"
 
+namespace
+{
+  struct TorrentIdLessThan
+  {
+    bool operator () (Torrent * left, Torrent * right) const
+    {
+      return left->id () < right->id ();
+    }
+
+    bool operator () (int leftId, Torrent * right) const
+    {
+      return leftId < right->id ();
+    }
+
+    bool operator () (Torrent * left, int rightId) const
+    {
+      return left->id () < rightId;
+    }
+  };
+}
+
 void
 TorrentModel::clear ()
@@ -23 +44 @@
   beginResetModel ();
 
-  myIdToRow.clear ();
-  myIdToTorrent.clear ();
   qDeleteAll (myTorrents);
   myTorrents.clear ();
@@ -77 +96 @@
 TorrentModel::addTorrent (Torrent * t)
 {
-  myIdToTorrent.insert (t->id (), t);
-  myIdToRow.insert (t->id (), myTorrents.size ());
-  myTorrents.append (t);
+  const torrents_t::iterator torrentIt = qLowerBound (myTorrents.begin (), myTorrents.end (), t, TorrentIdLessThan ());
+  const int row = torrentIt == myTorrents.end () ? myTorrents.size () : torrentIt - myTorrents.begin ();
+
+  beginInsertRows (QModelIndex(), row, row);
+  myTorrents.insert (torrentIt, t);
+  endInsertRows ();
+}
+
+void
+TorrentModel::addTorrents (torrents_t&& torrents, QSet<int>& addIds)
+{
+  if (myTorrents.isEmpty ())
+    {
+      qSort (torrents.begin (), torrents.end (), TorrentIdLessThan ());
+
+      beginInsertRows (QModelIndex (), 0, torrents.size () - 1);
+      myTorrents.swap (torrents);
+      endInsertRows ();
+
+      addIds += getIds ();
+    }
+  else
+    {
+      for (Torrent * const tor: torrents)
+        {
+          addTorrent (tor);
+          addIds.insert (tor->id ());
+        }
+    }
 }
 
@@ -99 +144 @@
 TorrentModel::getTorrentFromId (int id)
 {
-  id_to_torrent_t::iterator it (myIdToTorrent.find (id));
-  return it == myIdToTorrent.end() ? 0 : it.value ();
+  const torrents_t::const_iterator torrentIt = qBinaryFind (myTorrents.begin (), myTorrents.end (), id, TorrentIdLessThan ());
+  return torrentIt == myTorrents.end () ? nullptr : *torrentIt;
 }
 
@@ -106 +151 @@
 TorrentModel::getTorrentFromId (int id) const
 {
-  id_to_torrent_t::const_iterator it (myIdToTorrent.find (id));
-  return it == myIdToTorrent.end() ? 0 : it.value ();
+  const torrents_t::const_iterator torrentIt = qBinaryFind (myTorrents.begin (), myTorrents.end (), id, TorrentIdLessThan ());
+  return torrentIt == myTorrents.end () ? nullptr : *torrentIt;
 }
 
@@ -117 +162 @@
 TorrentModel::onTorrentChanged (int torrentId)
 {
-  const int row (myIdToRow.value (torrentId, -1));
-  if (row >= 0)
-    {
-      QModelIndex qmi (index (row, 0));
-      emit dataChanged (qmi, qmi);
-    }
+  const torrents_t::iterator torrentIt = qBinaryFind (myTorrents.begin (), myTorrents.end (), torrentId, TorrentIdLessThan ());
+  if (torrentIt == myTorrents.end ())
+    return;
+
+  const int row = torrentIt - myTorrents.begin ();
+  const QModelIndex qmi (index (row, 0));
+
+  emit dataChanged (qmi, qmi);
 }
 
@@ -141 +188 @@
 TorrentModel::updateTorrents (tr_variant * torrents, bool isCompleteList)
 {
-  QList<Torrent*> newTorrents;
+  torrents_t newTorrents;
   QSet<int> oldIds;
   QSet<int> addIds;
   QSet<int> newIds;
 
-  if  (isCompleteList)
+  if (isCompleteList)
     oldIds = getIds ();
 
@@ -158 +205 @@
           if (tr_variantDictFindInt (child, TR_KEY_id, &id))
             {
-              newIds.insert (id);
+              if (isCompleteList)
+                newIds.insert (id);
 
               Torrent * tor = getTorrentFromId (id);
@@ -184 +232 @@
 
   if (!newTorrents.isEmpty ())
-    {
-      const int oldCount (rowCount ());
-      const int newCount (oldCount + newTorrents.size ());
-      QSet<int> ids;
-
-      beginInsertRows (QModelIndex(), oldCount, newCount - 1);
-
-      for (Torrent * const tor: newTorrents)
-        {
-          addTorrent (tor);
-          addIds.insert (tor->id ());
-        }
-
-      endInsertRows ();
-    }
+    addTorrents (std::move (newTorrents), addIds);
 
   if (!addIds.isEmpty())
@@ -215 +249 @@
 TorrentModel::removeTorrent (int id)
 {
-  const int row = myIdToRow.value (id, -1);
-  if (row >= 0)
-    {
-      Torrent * tor = myIdToTorrent.value (id, 0);
-
-      beginRemoveRows (QModelIndex(), row, row);
-      // make the myIdToRow map consistent with list view/model
-      for (auto i = myIdToRow.begin(); i != myIdToRow.end(); ++i)
-        if (i.value() > row)
-          --i.value();
-      myIdToRow.remove (id);
-      myIdToTorrent.remove (id);
-      myTorrents.remove (myTorrents.indexOf (tor));
-      endRemoveRows ();
-
-      delete tor;
-    }
+  const torrents_t::iterator torrentIt = qBinaryFind (myTorrents.begin (), myTorrents.end (), id, TorrentIdLessThan ());
+  if (torrentIt == myTorrents.end ())
+    return;
+
+  Torrent * const tor = *torrentIt;
+  const int row = torrentIt - myTorrents.begin ();
+
+  beginRemoveRows (QModelIndex(), row, row);
+  myTorrents.remove (row);
+  endRemoveRows ();
+
+  delete tor;
 }
 

trunk/qt/TorrentModel.h

@@ -11 +11 @@
 
 #include <QAbstractListModel>
-#include <QMap>
 #include <QSet>
 #include <QVector>
@@ -60 +59 @@
 
   private:
-    typedef QMap<int, int> id_to_row_t;
-    typedef QMap<int, Torrent*> id_to_torrent_t;
     typedef QVector<Torrent*> torrents_t;
 
   private:
     void addTorrent (Torrent *);
+    void addTorrents (torrents_t&& torrents, QSet<int>& addIds);
     QSet<int> getIds () const;
 
@@ -74 +72 @@
     const Prefs& myPrefs;
 
-    id_to_row_t myIdToRow;
-    id_to_torrent_t myIdToTorrent;
     torrents_t myTorrents;
 };