* 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>
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
-
#include "storesession.hpp"
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
#include <pv/data/analog.hpp>
#include <pv/data/analogsegment.hpp>
#include <pv/data/logic.hpp>
#include <pv/data/logicsegment.hpp>
+#include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
#include <pv/devices/device.hpp>
-#include <pv/view/signal.hpp>
+#include <pv/session.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-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;
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;
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<OutputFormat> &output_format,
const map<string, VariantBase> &options,
- const std::pair<uint64_t, uint64_t> sample_range,
+ const pair<uint64_t, uint64_t> sample_range,
const Session &session) :
file_name_(file_name),
output_format_(output_format),
bool StoreSession::start()
{
- const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+ const unordered_set< shared_ptr<data::SignalBase> > sigs(session_.signalbases());
shared_ptr<data::Segment> any_segment;
shared_ptr<data::LogicSegment> lsegment;
- vector< shared_ptr<sigrok::Channel> > achannel_list;
+ vector< shared_ptr<data::SignalBase> > achannel_list;
vector< shared_ptr<data::AnalogSegment> > asegment_list;
- for (shared_ptr<view::Signal> signal : sigs) {
+ for (shared_ptr<data::SignalBase> signal : sigs) {
if (!signal->enabled())
continue;
- shared_ptr<data::SignalData> data = signal->data();
-
- if (dynamic_pointer_cast<data::Logic>(data)) {
+ if (signal->type() == data::SignalBase::LogicChannel) {
// All logic channels share the same data segments
- shared_ptr<data::Logic> ldata = dynamic_pointer_cast<data::Logic>(data);
+ shared_ptr<data::Logic> ldata = signal->logic_data();
const deque< shared_ptr<data::LogicSegment> > &lsegments =
ldata->logic_segments();
any_segment = lsegment;
}
- if (dynamic_pointer_cast<data::Analog>(data)) {
+ if (signal->type() == data::SignalBase::AnalogChannel) {
// Each analog channel has its own segments
- shared_ptr<data::Analog> adata =
- dynamic_pointer_cast<data::Analog>(data);
+ shared_ptr<data::Analog> adata = signal->analog_data();
const deque< shared_ptr<data::AnalogSegment> > &asegments =
adata->analog_segments();
asegment_list.push_back(asegments.front());
any_segment = asegments.front();
- achannel_list.push_back(signal->channel());
+ achannel_list.push_back(signal);
}
}
interrupt_ = true;
}
-void StoreSession::store_proc(vector< shared_ptr<sigrok::Channel> > achannel_list,
+void StoreSession::store_proc(vector< shared_ptr<data::SignalBase> > achannel_list,
vector< shared_ptr<data::AnalogSegment> > asegment_list,
shared_ptr<data::LogicSegment> 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;
// 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<sigrok::Channel> achannel = achannel_list.at(i);
+ shared_ptr<sigrok::Channel> achannel = (achannel_list.at(i))->channel();
shared_ptr<data::AnalogSegment> 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<shared_ptr<sigrok::Channel> >{achannel},
(float *)adata, packet_len,
}
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) {
error_ = tr("Error while saving: ") + error.what();
// 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