test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-12-04 21:09:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed one bug in tbox

Browse Source
This commit is contained in:
zsx 2018-07-27 16:26:27 +08:00
parent 2843c3197d
commit 0da7b9bd8a
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib_acl_cpp/include/acl_cpp/stdlib/tbox.hpp
View File

@ -42,16 +42,34 @@ template<typename T>
class tbox : public noncopyable class tbox : public noncopyable
{ {
public: public:
tbox(void) : size_(0) , cond_(&lock_) {} /**
* 构造方法
* @param free_obj {bool} 当 tbox 销毁时，是否自动检查并释放
* 未被消费的动态对象
*/
tbox(bool free_obj = false)
: size_(0), free_obj_(free_obj), cond_(&lock_) {}
~tbox(void) ~tbox(void)
{ {
for (typename std::list<T*>::iterator it = tbox_.begin(); clear(free_obj_);
it != tbox_.end(); ++it) }
/**
* 清理消息队列中未被消费的消息对象
* @param free_obj {bool} 释放调用 delete 方法删除消息对象
*/
void clear(bool free_obj = false)
{ {
if (free_obj) {
for (typename std::list<T*>::iterator it =
tbox_.begin(); it != tbox_.end(); ++it) {
delete *it; delete *it;
} }
} }
tbox_.clear();
}
/** /**
* 发送消息对象 * 发送消息对象
@ -95,7 +113,8 @@ public:
return t; return t;
} }
if (wait_ms >= 0 && !cond_.wait(n, true)) { // 注意调用顺序，必须先调用 wait 再判断 wait_ms
if (!cond_.wait(n, true) && wait_ms >= 0) {
lock_.unlock(); lock_.unlock();
if (found) { if (found) {
*found = false; *found = false;
@ -128,6 +147,7 @@ public:
private: private:
std::list<T*> tbox_; std::list<T*> tbox_;
size_t size_; size_t size_;
bool free_obj_;
thread_mutex lock_; thread_mutex lock_;
thread_cond cond_; thread_cond cond_;