ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Just don't ask. We'll fix this right if this is the issue.

Browse Source
This commit is contained in:
JoelKatz
2013-03-06 23:30:13 -08:00
parent 0f4e021b9d
commit fbd854e2e9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpp/websocketpp/src/messages/data.hpp
View File

@@ -84,7 +84,7 @@ public:
element_ptr get() { element_ptr get() {
boost::lock_guard<boost::recursive_mutex> lock(m_lock); boost::lock_guard<boost::recursive_mutex> lock(m_lock);
element_ptr p; element_ptr p, q;
/*std::cout << "message requested (" /*std::cout << "message requested ("
<< m_cur_elements-m_avaliable.size() << m_cur_elements-m_avaliable.size()
@@ -95,7 +95,8 @@ public:
if (!m_avaliable.empty()) { if (!m_avaliable.empty()) {
p = m_avaliable.front(); p = m_avaliable.front();
m_avaliable.pop(); q = p;
m_avaliable.pop(); // FIXME can call intrusive_ptr_release(line 217) which can deadlock
m_used[p->get_index()] = p; m_used[p->get_index()] = p;
} else { } else {
if (m_cur_elements == m_max_elements) { if (m_cur_elements == m_max_elements) {
@@ -210,6 +211,7 @@ private:
typedef websocketpp::processor::hybi_util::masking_key_type masking_key_type; typedef websocketpp::processor::hybi_util::masking_key_type masking_key_type;
friend void intrusive_ptr_add_ref(const data * s) { friend void intrusive_ptr_add_ref(const data * s) {
boost::unique_lock<boost::mutex> lock(s->m_lock);
++s->m_ref_count; ++s->m_ref_count;
} }