Increase session saving chunk size for much better performance.

[pulseview.git] / pv / storesession.cpp

diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index eaa17ea5f98096519f88f44be1373a8a697c171c..52a6be34c490fe27cb9bcfb3cf263c5a47b530df 100644 (file)
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -69,7 +69,7 @@ using sigrok::OutputFlag;
 
 namespace pv {
 
-const size_t StoreSession::BlockSize = 1024 * 1024;
+const size_t StoreSession::BlockSize = 10 * 1024 * 1024;
 
 StoreSession::StoreSession(const std::string &file_name,
        const shared_ptr<OutputFormat> &output_format,
@@ -217,10 +217,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 {
        unsigned progress_scale = 0;
 
-       /// TODO: Wrap this in a std::unique_ptr when we transition to C++11
-       uint8_t *const ldata = new uint8_t[BlockSize];
-       assert(ldata);
-
        int aunit_size = 0;
        int lunit_size = 0;
        unsigned int lsamples_per_block = INT_MAX;
@@ -262,8 +258,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
                                const float *adata =
                                        asegment->get_samples(start_sample_, start_sample_ + packet_len);
 
-                               // The srzip format currently only supports packets with one
-                               // analog channel. See zip_append_analog() in srzip.c
                                auto analog = context->create_analog_packet(
                                        vector<shared_ptr<sigrok::Channel> >{achannel},
                                        (float *)adata, packet_len,
@@ -278,14 +272,17 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
                        }
 
                        if (lsegment) {
-                               lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+                               const uint8_t* ldata =
+                                       lsegment->get_samples(start_sample_, start_sample_ + packet_len);
 
                                const size_t length = packet_len * lunit_size;
-                               auto logic = context->create_logic_packet(ldata, length, lunit_size);
+                               auto logic = context->create_logic_packet((void*)ldata, length, lunit_size);
                                const string ldata_str = output_->receive(logic);
 
                                if (output_stream_.is_open())
                                        output_stream_ << ldata_str;
+
+                               delete[] ldata;
                        }
                } catch (Error error) {
                        error_ = tr("Error while saving: ") + error.what();
@@ -305,8 +302,6 @@ void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_li
 
        output_.reset();
        output_stream_.close();
-
-       delete[] ldata;
 }
 
 } // pv