X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdevices%2Finputfile.cpp;h=4ffd2dfa22cbc702d6ad7dfeb476042ec2d73639;hb=1f419596224bd8f73fc8c59b52b8775685249a07;hp=c30bcd33db570d1b56ff219b94928b322dc57924;hpb=cda515676ce6c2fa81e1cecacba3ea26ec2ee50e;p=pulseview.git

diff --git a/pv/devices/inputfile.cpp b/pv/devices/inputfile.cpp
index c30bcd3..4ffd2df 100644
--- a/pv/devices/inputfile.cpp
+++ b/pv/devices/inputfile.cpp
@@ -14,26 +14,37 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
 #include <fstream>
+#include <vector>
 
 #include <QString>
 
 #include "inputfile.hpp"
 
+using std::map;
+using std::shared_ptr;
+using std::streamsize;
+using std::string;
+using std::ifstream;
+using std::ios;
+using std::vector;
+
 namespace pv {
 namespace devices {
 
-const std::streamsize InputFile::BufferSize = 16384;
+// Use a 4MB chunk size for reading a file into memory. Larger values don't
+// seem to provide any substancial performance improvements, but can cause
+// UI lag and a visually "stuttering" display of the data currently loading.
+const streamsize InputFile::BufferSize = (4 * 1024 * 1024);
 
-InputFile::InputFile(const std::shared_ptr<sigrok::Context> &context,
-	const std::string &file_name,
-	std::shared_ptr<sigrok::InputFormat> format,
-	const std::map<std::string, Glib::VariantBase> &options) :
+InputFile::InputFile(const shared_ptr<sigrok::Context> &context,
+	const string &file_name,
+	shared_ptr<sigrok::InputFormat> format,
+	const map<string, Glib::VariantBase> &options) :
 	File(file_name),
 	context_(context),
 	format_(format),
@@ -56,19 +67,20 @@ void InputFile::open()
 
 	// open() should add the input device to the session but
 	// we can't open the device without sending some data first
-	f = new std::ifstream(file_name_, std::ios::binary);
+	f = new ifstream(file_name_, ios::binary);
+
+	vector<char> buffer(BufferSize);
 
-	char buffer[BufferSize];
-	f->read(buffer, BufferSize);
-	const std::streamsize size = f->gcount();
+	f->read(buffer.data(), BufferSize);
+	const streamsize size = f->gcount();
 	if (size == 0)
 		return;
 
-	input_->send(buffer, size);
+	input_->send(buffer.data(), size);
 
 	try {
 		device_ = input_->device();
-	} catch (sigrok::Error) {
+	} catch (sigrok::Error&) {
 		return;
 	}
 
@@ -87,22 +99,22 @@ void InputFile::start()
 
 void InputFile::run()
 {
-	char buffer[BufferSize];
-
 	if (!f) {
 		// Previous call to run() processed the entire file already
-		f = new std::ifstream(file_name_, std::ios::binary);
+		f = new ifstream(file_name_, ios::binary);
 		input_->reset();
 	}
 
+	vector<char> buffer(BufferSize);
+
 	interrupt_ = false;
 	while (!interrupt_ && !f->eof()) {
-		f->read(buffer, BufferSize);
-		const std::streamsize size = f->gcount();
+		f->read(buffer.data(), BufferSize);
+		const streamsize size = f->gcount();
 		if (size == 0)
 			break;
 
-		input_->send(buffer, size);
+		input_->send(buffer.data(), size);
 
 		if (size != BufferSize)
 			break;