zcy
/
generallib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thread_safe 添加条件变量

master
zcy 2021-11-17 17:07:34 +08:00
parent bb433e232d
commit 22d1d4178a
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
general/src/threadsafe/thread_safe_list.hpp
View File

@ -1,7 +1,7 @@
/* /*
* @Author: caiyuzheng * @Author: caiyuzheng
* @Date: 2021-10-06 23:05:26 * @Date: 2021-10-06 23:05:26
* @LastEditTime: 2021-11-17 15:58:26 * @LastEditTime: 2021-11-17 17:06:03
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \generallib\general\src\threadsafe\thread_safe_list.h * @FilePath: \generallib\general\src\threadsafe\thread_safe_list.h
@ -24,9 +24,12 @@ public:
~ThreadSafeList() ~ThreadSafeList()
{ {
} }
ThreadSafeList(ThreadSafeList<T> &b){
this->m_data = b.m_data;
}
int
PushBack(T v) int PushBack(T v)
{ {
m_mux.lock(); m_mux.lock();
m_data.push_back(v); m_data.push_back(v);
@ -38,6 +41,7 @@ public:
m_mux.lock(); m_mux.lock();
m_data.push_front(v); m_data.push_front(v);
m_mux.unlock(); m_mux.unlock();
m_cv.notify_one();
return 0; return 0;
} }
int Emplace(int pos, T v) int Emplace(int pos, T v)
@ -94,11 +98,11 @@ public:
m_mux.unlock(); m_mux.unlock();
return ret1; return ret1;
}else{ }else{
m_cv.wait(&m_mux); std::unique_lock<std::mutex> guard(m_mux);
m_cv.wait(guard);
auto ret = m_data.begin(); auto ret = m_data.begin();
auto ret1 = *ret; auto ret1 = *ret;
m_data.erase(ret); m_data.erase(ret);
m_mux.unlock();
return ret1; return ret1;
} }
} }

12
test/src/cpp11/cpp11_test.cpp
View File

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-03-15 23:07:25 * @Date: 2021-03-15 23:07:25
* @LastEditTime: 2021-11-17 15:58:56 * @LastEditTime: 2021-11-17 17:05:44
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \cpp11\cpp11_test.cpp * @FilePath: \cpp11\cpp11_test.cpp
@ -30,15 +30,23 @@ extern "C"{
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i = 0;
ThreadSafeList<int> ip; ThreadSafeList<int> ip;
ip.PushFront(102); ip.PushFront(102);
ip.PushFront(111); ip.PushFront(111);
void *p = &ip;
std::thread t1([p]{
Sleep(4000);
((ThreadSafeList<int>*)p)->PushFront(123);
});
std::cout<<ip.PopFrontAndWait()<<"\r\n"; std::cout<<ip.PopFrontAndWait()<<"\r\n";
std::cout<<ip.PopFrontAndWait()<<"\r\n"; std::cout<<ip.PopFrontAndWait()<<"\r\n";
std::cout<<ip.PopFrontAndWait()<<"\r\n"; std::cout<<ip.PopFrontAndWait()<<"\r\n";
t1.join();
// std::cout<<"test start"<<endl; // std::cout<<"test start"<<endl;
// try{ // try{
// std::cout<<"cpu count is "<<CoreCount()<<std::endl; // std::cout<<"cpu count is "<<CoreCount()<<std::endl;