X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fstoresession.cpp;h=3d7b058a87034b6c02cc4109347e798b94702b40;hb=7d9dd6f4f619bf53a3b19096f6c4f02bbe1a257b;hp=9a481dd86696ba60ae5e4b61c03bd9719156b1c8;hpb=c51ae0b4200f11bfcb352677cfd07b62ac12230c;p=pulseview.git
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index 9a481dd..3d7b058 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -14,38 +14,25 @@
* 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 .
*/
#include
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include
-#include
-
#include "storesession.hpp"
-#include
-#include
#include
#include
#include
#include
+#include
+#include
#include
-#include
+#include
#include
-using boost::shared_lock;
-using boost::shared_mutex;
-
using std::deque;
-using std::dynamic_pointer_cast;
using std::ios_base;
using std::lock_guard;
using std::make_pair;
@@ -53,10 +40,8 @@ using std::map;
using std::min;
using std::mutex;
using std::pair;
-using std::set;
using std::shared_ptr;
using std::string;
-using std::thread;
using std::unordered_set;
using std::vector;
@@ -69,12 +54,12 @@ 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,
+StoreSession::StoreSession(const string &file_name,
const shared_ptr &output_format,
const map &options,
- const std::pair sample_range,
+ const pair sample_range,
const Session &session) :
file_name_(file_name),
output_format_(output_format),
@@ -105,22 +90,20 @@ const QString& StoreSession::error() const
bool StoreSession::start()
{
- const unordered_set< shared_ptr > sigs(session_.signals());
+ const unordered_set< shared_ptr > sigs(session_.signalbases());
shared_ptr any_segment;
shared_ptr lsegment;
- vector< shared_ptr > achannel_list;
+ vector< shared_ptr > achannel_list;
vector< shared_ptr > asegment_list;
- for (shared_ptr signal : sigs) {
+ for (shared_ptr signal : sigs) {
if (!signal->enabled())
continue;
- shared_ptr data = signal->data();
-
- if (dynamic_pointer_cast(data)) {
+ if (signal->type() == data::SignalBase::LogicChannel) {
// All logic channels share the same data segments
- shared_ptr ldata = dynamic_pointer_cast(data);
+ shared_ptr ldata = signal->logic_data();
const deque< shared_ptr > &lsegments =
ldata->logic_segments();
@@ -134,10 +117,9 @@ bool StoreSession::start()
any_segment = lsegment;
}
- if (dynamic_pointer_cast(data)) {
+ if (signal->type() == data::SignalBase::AnalogChannel) {
// Each analog channel has its own segments
- shared_ptr adata =
- dynamic_pointer_cast(data);
+ shared_ptr adata = signal->analog_data();
const deque< shared_ptr > &asegments =
adata->analog_segments();
@@ -150,7 +132,7 @@ bool StoreSession::start()
asegment_list.push_back(asegments.front());
any_segment = asegments.front();
- achannel_list.push_back(signal->channel());
+ achannel_list.push_back(signal);
}
}
@@ -160,19 +142,30 @@ bool StoreSession::start()
}
// Check whether the user wants to export a certain sample range
+ uint64_t end_sample;
+
if (sample_range_.first == sample_range_.second) {
+ // No sample range specified, save everything we have
start_sample_ = 0;
sample_count_ = any_segment->get_sample_count();
} else {
if (sample_range_.first > sample_range_.second) {
start_sample_ = sample_range_.second;
- sample_count_ = sample_range_.first - sample_range_.second;
+ end_sample = min(sample_range_.first, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
} else {
start_sample_ = sample_range_.first;
- sample_count_ = sample_range_.second - sample_range_.first;
+ end_sample = min(sample_range_.second, any_segment->get_sample_count());
+ sample_count_ = end_sample - start_sample_;
}
}
+ // Make sure the sample range is valid
+ if (start_sample_ > any_segment->get_sample_count()) {
+ error_ = tr("Can't save range without sample data.");
+ return false;
+ }
+
// Begin storing
try {
const auto context = session_.device_manager().context();
@@ -189,7 +182,7 @@ bool StoreSession::start()
{{ConfigKey::SAMPLERATE, Glib::Variant::create(
any_segment->samplerate())}});
output_->receive(meta);
- } catch (Error error) {
+ } catch (Error& error) {
error_ = tr("Error while saving: ") + error.what();
return false;
}
@@ -210,16 +203,12 @@ void StoreSession::cancel()
interrupt_ = true;
}
-void StoreSession::store_proc(vector< shared_ptr > achannel_list,
+void StoreSession::store_proc(vector< shared_ptr > achannel_list,
vector< shared_ptr > asegment_list,
shared_ptr lsegment)
{
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;
@@ -238,31 +227,29 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_lis
// Qt needs the progress values to fit inside an int. If they would
// not, scale the current and max values down until they do.
while ((sample_count_ >> progress_scale) > INT_MAX)
- progress_scale ++;
+ progress_scale++;
unit_count_ = sample_count_ >> progress_scale;
const unsigned int samples_per_block =
- std::min(asamples_per_block, lsamples_per_block);
+ min(asamples_per_block, lsamples_per_block);
while (!interrupt_ && sample_count_) {
progress_updated();
const uint64_t packet_len =
- std::min((uint64_t)samples_per_block, sample_count_);
+ min((uint64_t)samples_per_block, sample_count_);
try {
const auto context = session_.device_manager().context();
for (unsigned int i = 0; i < achannel_list.size(); i++) {
- shared_ptr achannel = achannel_list.at(i);
+ shared_ptr achannel = (achannel_list.at(i))->channel();
shared_ptr asegment = asegment_list.at(i);
- const float *adata =
- asegment->get_samples(start_sample_, start_sample_ + packet_len);
+ float *adata = new float[packet_len];
+ asegment->get_samples(start_sample_, start_sample_ + packet_len, adata);
- // 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 >{achannel},
(float *)adata, packet_len,
@@ -277,16 +264,19 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_lis
}
if (lsegment) {
- lsegment->get_samples(ldata, start_sample_, start_sample_ + packet_len);
+ const size_t data_size = packet_len * lunit_size;
+ uint8_t* ldata = new uint8_t[data_size];
+ lsegment->get_samples(start_sample_, start_sample_ + packet_len, ldata);
- 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, data_size, lunit_size);
const string ldata_str = output_->receive(logic);
if (output_stream_.is_open())
output_stream_ << ldata_str;
+
+ delete[] ldata;
}
- } catch (Error error) {
+ } catch (Error& error) {
error_ = tr("Error while saving: ") + error.what();
break;
}
@@ -299,12 +289,11 @@ void StoreSession::store_proc(vector< shared_ptr > achannel_lis
// Zeroing the progress variables indicates completion
units_stored_ = unit_count_ = 0;
+ store_successful();
progress_updated();
output_.reset();
output_stream_.close();
-
- delete[] ldata;
}
-} // pv
+} // namespace pv