Ticket #5482: purge_connections.patch

libs/libmyth/mythdbcon.h

@@ -61 +61 @@
 
     MSqlDatabase *m_schedCon;
     MSqlDatabase *m_DDCon;
+
+    void purgeConnections(void);
 };
 
 /// \brief MSqlDatabase Info, used by MSqlQuery. Do not use directly.

libs/libmyth/mythdbcon.cpp

@@ -203 +203 @@
 
     MSqlDatabase *db;
 
+    // If there exists too many unused/old DB-connections, close them.
+    purgeConnections();
+
     if (m_pool.isEmpty())
     {
         db = new MSqlDatabase("DBManager" + QString::number(m_connID++));
         VERBOSE(VB_IMPORTANT, QString("New DB connection, total: %1").arg(m_connID));
     }
     else
+    {
+        // Use the list as FIFO in order to rotate the used connections.
         db = m_pool.takeLast();
+    }
 
     m_lock.unlock();
 
@@ -224 +230 @@
 
     if (db)
     {
-        m_pool.append(db);
+        db->m_lastDBKick = QDateTime::currentDateTime();
+        m_pool.prepend(db);
     }
 
     m_lock.unlock();
     m_sem->release();
 }
 
+void MDBManager::purgeConnections()
+{
+    //
+    // Must be called with a valid MDBManager-lock!
+    //
+    int i;
+    QDateTime now;
+
+    now=QDateTime::currentDateTime();
+    for(i = 0; i < m_pool.size(); ++i)
+    {
+        if (m_pool[i]->m_lastDBKick.secsTo(now) > 3600)
+        {
+            // This connection has
+            // not been used in the past hour.
+            --m_connID;
+            delete m_pool[i];
+            continue;
+        }
+    }
+    return;
+}
+
+
 MSqlDatabase *MDBManager::getSchedCon()
 {
     if (!m_schedCon)