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

no message

master
zcy 2021-11-17 17:25:49 +08:00
parent 22d1d4178a
commit 8d8b9839e5
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
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 17:06:03 * @LastEditTime: 2021-11-17 17:24:46
* @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
@ -60,22 +60,22 @@ public:
m_mux.unlock(); m_mux.unlock();
return 0; return 0;
} }
int EmplaceEnd(T v) int EmplaceEnd(T v)
{
m_mux.lock();
auto itr = m_data.begin();
for (int i = 0; itr != m_data.end(), itr++)
{ {
m_mux.lock(); i++;
auto itr = m_data.begin(); if (i == pos)
for (int i = 0; itr != m_data.end(), itr++) break;
{
i++;
if (i == pos)
break;
}
m_data.emplace(itr, v);
m_mux.unlock();
return 0;
} }
m_data.emplace(itr, v);
T PopFront() m_mux.unlock();
return 0;
}
using vIterator = typename std::list<T>::iterator;
vIterator PopFront()
{ {
if (!m_data.empty()) if (!m_data.empty())
{ {
@ -84,9 +84,11 @@ public:
auto ret1 = *ret; auto ret1 = *ret;
m_data.erase(ret); m_data.erase(ret);
m_mux.unlock(); m_mux.unlock();
return ret1;
} }
return m_data.end();
} }
T PopFrontAndWait() T PopFrontAndWait()
{ {
if (!m_data.empty()) if (!m_data.empty())

5
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 17:05:44 * @LastEditTime: 2021-11-17 17:17:37
* @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
@ -35,10 +35,11 @@ int main(int argc, char **argv)
ip.PushFront(102); ip.PushFront(102);
ip.PushFront(111); ip.PushFront(111);
void *p = &ip; ThreadSafeList<int> *p = &ip;
std::thread t1([p]{ std::thread t1([p]{
Sleep(4000); Sleep(4000);
((ThreadSafeList<int>*)p)->PushFront(123); ((ThreadSafeList<int>*)p)->PushFront(123);
}); });
std::cout<<ip.PopFrontAndWait()<<"\r\n"; std::cout<<ip.PopFrontAndWait()<<"\r\n";