3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Memory optimization of SLA export,

Browse source 
logging of memory consumption during SLA slicing (just on Windows as of now).
This commit is contained in:
bubnikv 2019-04-25 18:03:17 +02:00
parent e9d629f248
commit ca50d1b55a
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libslic3r/Rasterizer/Rasterizer.hpp
View file

@ -20,29 +20,26 @@ class RawBytes {
void operator()(std::uint8_t *rawptr);
};
std::unique_ptr<std::uint8_t, MinzDeleter> m_buffer = nullptr;
size_t m_size = 0;
std::vector<std::uint8_t> m_buffer;
public:
RawBytes() = default;
RawBytes(std::uint8_t *rawptr, size_t s): m_buffer(rawptr), m_size(s) {}
RawBytes(std::uint8_t *rawptr, size_t s): m_buffer(rawptr, rawptr + s) { MinzDeleter()(rawptr); }
size_t size() const { return m_size; }
const uint8_t * data() { return m_buffer.get(); }
size_t size() const { return m_buffer.size(); }
const uint8_t * data() { return m_buffer.data(); }
// /////////////////////////////////////////////////////////////////////////
// FIXME: the following is needed for MSVC2013 compatibility
// /////////////////////////////////////////////////////////////////////////
RawBytes(const RawBytes&) = delete;
RawBytes(RawBytes&& mv):
m_buffer(std::move(mv.m_buffer)), m_size(mv.m_size) {}
RawBytes(RawBytes&& mv) : m_buffer(std::move(mv.m_buffer)) {}
RawBytes& operator=(const RawBytes&) = delete;
RawBytes& operator=(RawBytes&& mv) {
m_buffer.swap(mv.m_buffer);
m_size = mv.m_size;
m_buffer = std::move(mv.m_buffer);
return *this;
}

2
src/libslic3r/SLAPrint.cpp
View file

@ -1823,7 +1823,7 @@ void SLAPrint::StatusReporter::operator()(
SLAPrint &p, double st, const std::string &msg, unsigned flags)
{
m_st = st;
BOOST_LOG_TRIVIAL(info) << st << "% " << msg;
BOOST_LOG_TRIVIAL(info) << st << "% " << msg << log_memory_info();
p.set_status(int(std::round(st)), msg, flags);
}