From 742956d46cd610515eb96a771d8b94ba8528cf5e Mon Sep 17 00:00:00 2001
From: Andy Huska <andy@qurrent.co>
Date: Sat, 17 Sep 2022 12:33:15 -0500
Subject: [PATCH 1/2] Working on finding a way to prevent bad_alloc crash, temp
 stuff in place like prealloc size, and frames list resize (prob need to keep
 list below size limit to prevent chaos...10M msgs or so mabe)

---
 canframemodel.cpp | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/canframemodel.cpp b/canframemodel.cpp
index 735236b..4945679 100644
--- a/canframemodel.cpp
+++ b/canframemodel.cpp
@@ -49,7 +49,7 @@ CANFrameModel::CANFrameModel(QObject *parent)
     if (QSysInfo::WordSize > 32)
     {
         qDebug() << "64 bit OS detected. Requesting a large preallocation";
-        preallocSize = 10000000;
+        preallocSize = 10000; //000;
     }
     else //if compiling for 32 bit you can't ask for gigabytes of preallocation so tone it down.
     {
@@ -673,13 +673,39 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
 
     if (!overwriteDups)
     {
-        frames.append(tempFrame);
-        if (filters[tempFrame.frameId()] && busFilters[tempFrame.bus])
+        bool alloc_ok = true;
+
+        for(int i=0; i<3; i++)
         {
-            if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count());
-            tempFrame.frameCount = 1;
-            filteredFrames.append(tempFrame);
-            if (autoRefresh) endInsertRows();
+            try
+            {
+                if(alloc_ok == false)
+                {
+                    qDebug() << "Trying to remove " << (frames.length() >> 3) << " from frames. Try #" << i ;
+                    frames.remove(0, frames.length() >> 3);
+                    qDebug() << "frames length now: " << (frames.length()) << "trying to alloc again" ;
+                    alloc_ok = true;
+                }
+
+                frames.append(tempFrame);
+                break;
+            }
+            catch (const std::exception& ex)
+            {
+                alloc_ok = false;
+                qDebug() << "addFrame failed to append.  frames.length(): " << frames.length() << " Exception: " << ex.what();
+            }
+        }
+
+        if(alloc_ok)
+        {
+            if (filters[tempFrame.frameId()] && busFilters[tempFrame.bus])
+            {
+                if (autoRefresh) beginInsertRows(QModelIndex(), filteredFrames.count(), filteredFrames.count());
+                tempFrame.frameCount = 1;
+                filteredFrames.append(tempFrame);
+                if (autoRefresh) endInsertRows();
+            }
         }
     }
     else //yes, overwrite dups
@@ -779,7 +805,7 @@ int CANFrameModel::sendBulkRefresh()
     if (lastUpdateNumFrames == 0 && !overwriteDups) return 0;
     if (filteredFrames.count() == 0) return 0;
 
-    qDebug() << "Bulk refresh of " << lastUpdateNumFrames;
+    //qDebug() << "Bulk refresh of " << lastUpdateNumFrames;
 
     beginResetModel();
     endResetModel();

From 195c90c4154cd22ddb2e2b22489f14608e894f33 Mon Sep 17 00:00:00 2001
From: Andy Huska <andy@qurrent.co>
Date: Sun, 18 Sep 2022 13:01:34 -0500
Subject: [PATCH 2/2] change the max amount of the reserved space for the
 frames and filteredFrames vectors to be 99% of the capacity instead of 95%.
 Reset initial capacity to be 10M frames for 64-bit machines now that testing
 is done. Want to make the capacity adjustable by user, too.

---
 canframemodel.cpp | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/canframemodel.cpp b/canframemodel.cpp
index 4945679..616978b 100644
--- a/canframemodel.cpp
+++ b/canframemodel.cpp
@@ -49,7 +49,7 @@ CANFrameModel::CANFrameModel(QObject *parent)
     if (QSysInfo::WordSize > 32)
     {
         qDebug() << "64 bit OS detected. Requesting a large preallocation";
-        preallocSize = 10000; //000;
+        preallocSize = 10000000;
     }
     else //if compiling for 32 bit you can't ask for gigabytes of preallocation so tone it down.
     {
@@ -679,14 +679,6 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
         {
             try
             {
-                if(alloc_ok == false)
-                {
-                    qDebug() << "Trying to remove " << (frames.length() >> 3) << " from frames. Try #" << i ;
-                    frames.remove(0, frames.length() >> 3);
-                    qDebug() << "frames length now: " << (frames.length()) << "trying to alloc again" ;
-                    alloc_ok = true;
-                }
-
                 frames.append(tempFrame);
                 break;
             }
@@ -754,6 +746,20 @@ void CANFrameModel::addFrame(const CANFrame& frame, bool autoRefresh = false)
 
 void CANFrameModel::addFrames(const CANConnection*, const QVector<CANFrame>& pFrames)
 {
+    if(frames.length() > frames.capacity() * 0.99)
+    {
+        qDebug() << "Frames count: " << frames.length() << " of " << frames.capacity() << " capacity, removing first " << frames.capacity() * 0.05 << " frames";
+        frames.remove(0, frames.capacity() * 0.05);
+        qDebug() << "Frames removed, new count: " << frames.length();
+    }
+
+    if(filteredFrames.length() > filteredFrames.capacity() * 0.99)
+    {
+        qDebug() << "filteredFrames count: " << filteredFrames.length() << " of " << filteredFrames.capacity() << " capacity, removing first " << filteredFrames.capacity() * 0.05 << " frames";
+        filteredFrames.remove(0, filteredFrames.capacity() * 0.05);
+        qDebug() << "filteredFrames removed, new count: " << filteredFrames.length();
+    }
+
     foreach(const CANFrame& frame, pFrames)
     {
         addFrame(frame);