Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 19:54:57 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #65 from wjwwood/fix_locking

Browse Source 
fix usage of scoped locks
This commit is contained in:
William Woodall 2014-07-02 15:03:41 -07:00
commit 033b009480
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/serial.cc
View File

@ -123,14 +123,14 @@ Serial::read_ (uint8_t *buffer, size_t size)
size_t size_t
Serial::read (uint8_t *buffer, size_t size) Serial::read (uint8_t *buffer, size_t size)
{ {
ScopedReadLock (this->pimpl_); ScopedReadLock lock(this->pimpl_);
return this->pimpl_->read (buffer, size); return this->pimpl_->read (buffer, size);
} }
size_t size_t
Serial::read (std::vector<uint8_t> &buffer, size_t size) Serial::read (std::vector<uint8_t> &buffer, size_t size)
{ {
ScopedReadLock (this->pimpl_); ScopedReadLock lock(this->pimpl_);
uint8_t *buffer_ = new uint8_t[size]; uint8_t *buffer_ = new uint8_t[size];
size_t bytes_read = this->pimpl_->read (buffer_, size); size_t bytes_read = this->pimpl_->read (buffer_, size);
buffer.insert (buffer.end (), buffer_, buffer_+bytes_read); buffer.insert (buffer.end (), buffer_, buffer_+bytes_read);
@ -141,7 +141,7 @@ Serial::read (std::vector<uint8_t> &buffer, size_t size)
size_t size_t
Serial::read (std::string &buffer, size_t size) Serial::read (std::string &buffer, size_t size)
{ {
ScopedReadLock (this->pimpl_); ScopedReadLock lock(this->pimpl_);
uint8_t *buffer_ = new uint8_t[size]; uint8_t *buffer_ = new uint8_t[size];
size_t bytes_read = this->pimpl_->read (buffer_, size); size_t bytes_read = this->pimpl_->read (buffer_, size);
buffer.append (reinterpret_cast<const char*>(buffer_), bytes_read); buffer.append (reinterpret_cast<const char*>(buffer_), bytes_read);
@ -160,7 +160,7 @@ Serial::read (size_t size)
size_t size_t
Serial::readline (string &buffer, size_t size, string eol) Serial::readline (string &buffer, size_t size, string eol)
{ {
ScopedReadLock (this->pimpl_); ScopedReadLock lock(this->pimpl_);
size_t eol_len = eol.length (); size_t eol_len = eol.length ();
uint8_t *buffer_ = static_cast<uint8_t*> uint8_t *buffer_ = static_cast<uint8_t*>
(alloca (size * sizeof (uint8_t))); (alloca (size * sizeof (uint8_t)));
@ -195,7 +195,7 @@ Serial::readline (size_t size, string eol)
vector<string> vector<string>
Serial::readlines (size_t size, string eol) Serial::readlines (size_t size, string eol)
{ {
ScopedReadLock (this->pimpl_); ScopedReadLock lock(this->pimpl_);
std::vector<std::string> lines; std::vector<std::string> lines;
size_t eol_len = eol.length (); size_t eol_len = eol.length ();
uint8_t *buffer_ = static_cast<uint8_t*> uint8_t *buffer_ = static_cast<uint8_t*>
@ -236,7 +236,7 @@ Serial::readlines (size_t size, string eol)
size_t size_t
Serial::write (const string &data) Serial::write (const string &data)
{ {
ScopedWriteLock(this->pimpl_); ScopedWriteLock lock(this->pimpl_);
return this->write_ (reinterpret_cast<const uint8_t*>(data.c_str()), return this->write_ (reinterpret_cast<const uint8_t*>(data.c_str()),
data.length()); data.length());
} }
@ -244,14 +244,14 @@ Serial::write (const string &data)
size_t size_t
Serial::write (const std::vector<uint8_t> &data) Serial::write (const std::vector<uint8_t> &data)
{ {
ScopedWriteLock(this->pimpl_); ScopedWriteLock lock(this->pimpl_);
return this->write_ (&data[0], data.size()); return this->write_ (&data[0], data.size());
} }
size_t size_t
Serial::write (const uint8_t *data, size_t size) Serial::write (const uint8_t *data, size_t size)
{ {
ScopedWriteLock(this->pimpl_); ScopedWriteLock lock(this->pimpl_);
return this->write_(data, size); return this->write_(data, size);
} }
@ -264,8 +264,8 @@ Serial::write_ (const uint8_t *data, size_t length)
void void
Serial::setPort (const string &port) Serial::setPort (const string &port)
{ {
ScopedReadLock(this->pimpl_); ScopedReadLock rlock(this->pimpl_);
ScopedWriteLock(this->pimpl_); ScopedWriteLock wlock(this->pimpl_);
bool was_open = pimpl_->isOpen (); bool was_open = pimpl_->isOpen ();
if (was_open) close(); if (was_open) close();
pimpl_->setPort (port); pimpl_->setPort (port);
@ -351,21 +351,21 @@ Serial::getFlowcontrol () const
void Serial::flush () void Serial::flush ()
{ {
ScopedReadLock(this->pimpl_); ScopedReadLock rlock(this->pimpl_);
ScopedWriteLock(this->pimpl_); ScopedWriteLock wlock(this->pimpl_);
pimpl_->flush (); pimpl_->flush ();
read_cache_.clear (); read_cache_.clear ();
} }
void Serial::flushInput () void Serial::flushInput ()
{ {
ScopedReadLock(this->pimpl_); ScopedReadLock lock(this->pimpl_);
pimpl_->flushInput (); pimpl_->flushInput ();
} }
void Serial::flushOutput () void Serial::flushOutput ()
{ {
ScopedWriteLock(this->pimpl_); ScopedWriteLock lock(this->pimpl_);
pimpl_->flushOutput (); pimpl_->flushOutput ();
read_cache_.clear (); read_cache_.clear ();
} }