mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix a cleanup-handler related issue in sstream.cpp / sched_remote.cpp

metadata
Wenzel Jakob 2013-12-03 15:42:40 +01:00
parent 687b56e73d
commit 6777864990
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcore/sched_remote.cpp
View File

@ -73,6 +73,9 @@ RemoteWorker::RemoteWorker(const std::string &name, Stream *stream) : Worker(nam
RemoteWorker::~RemoteWorker() { RemoteWorker::~RemoteWorker() {
Log(EDebug, "Shutting down"); Log(EDebug, "Shutting down");
if (!m_reader || !m_mutex || !m_memStream)
return;
LockGuard lock(m_mutex); LockGuard lock(m_mutex);
m_reader->shutdown(); m_reader->shutdown();
m_memStream->writeShort(StreamBackend::EQuit); m_memStream->writeShort(StreamBackend::EQuit);

5
src/libcore/sstream.cpp
View File

@ -39,6 +39,9 @@
MTS_NAMESPACE_BEGIN MTS_NAMESPACE_BEGIN
static StatsCounter bytesRcvd("Network", "Bytes received");
static StatsCounter bytesSent("Network", "Bytes sent");
namespace namespace
{ {
#if defined(WIN32) #if defined(WIN32)
@ -155,7 +158,6 @@ SocketStream::~SocketStream() {
} }
void SocketStream::read(void *ptr, size_t size) { void SocketStream::read(void *ptr, size_t size) {
static StatsCounter bytesRcvd("Network", "Bytes received");
const size_t total = size; const size_t total = size;
char *data = (char *) ptr; char *data = (char *) ptr;
while (size > 0) { while (size > 0) {
@ -180,7 +182,6 @@ void SocketStream::read(void *ptr, size_t size) {
} }
void SocketStream::write(const void *ptr, size_t size) { void SocketStream::write(const void *ptr, size_t size) {
static StatsCounter bytesSent("Network", "Bytes sent");
const size_t total = size; const size_t total = size;
char *data = (char *) ptr; char *data = (char *) ptr;
while (size > 0) { while (size > 0) {