Commit5fbc670

committed

Make session management thread-safe.

1 parent62897e0 commit5fbc670Copy full SHA for 5fbc670

File tree

+36

-4

lines changed

+36

-4

lines changed

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,24 @@`
`5`	`5`	`// http://www.boost.org/LICENSE_1_0.txt)`
`6`	`6`
`7`	`7`	`#include<http/server/simple_sessions.hpp>`
	`8`	`+#include<cassert>`
`8`	`9`
`9`	`10`	`namespacenetwork {`
`10`	`11`	`namespacehttp {`
`11`	`12`
`12`	`13`	`session&simple_sessions::lookup(boost::string_ref session_id) {`
`13`		`- std::string real_session_id = session_id.empty() ?`
`14`		`-std::to_string(next_session_id_.fetch_add(1, std::memory_order::memory_order_seq_cst))`
`15`		`- :static_cast<std::string>(session_id);`
	`14`	`+ std::string real_session_id =`
	`15`	`+ session_id.empty() ?std::to_string(next_session_id_.fetch_add(`
	`16`	`+1, std::memory_order::memory_order_seq_cst)) :`
	`17`	`+static_cast<std::string>(session_id);`
	`18`	`+assert(real_session_id !="");`
	`19`	`+ std::lock_guard<std::mutex>lock_sessions(sessions_mutex_);`
`16`	`20`	`std::pair<session_map_type::iterator,bool> result =`
`17`	`21`	`sessions_.insert(make_pair(std::move(real_session_id),session()));`
`18`		`- result.first->second.set("id", real_session_id);`
	`22`	`+if (result.second) {`
	`23`	`+ result.first->second.set("id", result.first->first);`
	`24`	`+assert(result.first->second["id"] !="");`
	`25`	`+ }`
`19`	`26`	`return result.first->second;`
`20`	`27`	`}`
`21`	`28`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`#include<http/server/session.hpp>`
`12`	`12`	`#include<boost/utility/string_ref.hpp>`
`13`	`13`	`#include<atomic>`
	`14`	`+#include<thread>`
`14`	`15`
`15`	`16`	`namespacenetwork {`
`16`	`17`	`namespacehttp {`
`@@ -25,6 +26,7 @@ struct simple_sessions {`
`25`	`26`	`session &lookup(boost::string_ref session_id);`
`26`	`27`	`private:`
`27`	`28`	`typedef std::unordered_map<std::string, session> session_map_type;`
	`29`	`+ std::mutex sessions_mutex_;`
`28`	`30`	`session_map_type sessions_;`
`29`	`31`	`std::atomic_uint_fast64_t next_session_id_;`
`30`	`32`	`};`

Lines changed: 23 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`#include<gtest/gtest.h>`
`8`	`8`	`#include<http/server/simple_sessions.hpp>`
	`9`	`+#include<future>`
`9`	`10`
`10`	`11`	`namespacehttp= network::http;`
`11`	`12`	`namespacenet= network;`
`@@ -35,4 +36,26 @@ TEST(simple_sessions_test, update) {`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
	`39`	`+TEST(simple_sessions_test, threaded_sessions) {`
	`40`	`+ http::simple_sessions simple_sessions;`
	`41`	`+auto f0 =std::async([&]() {`
	`42`	`+ http::session &session = simple_sessions.lookup("");`
	`43`	`+return session["id"];`
	`44`	`+ });`
	`45`	`+auto f1 =std::async([&]() {`
	`46`	`+ http::session &session = simple_sessions.lookup("");`
	`47`	`+return session["id"];`
	`48`	`+ });`
	`49`	`+auto f2 =std::async([&]() {`
	`50`	`+ http::session &session = simple_sessions.lookup("");`
	`51`	`+return session["id"];`
	`52`	`+ });`
	`53`	`+ std::string session0 = f0.get(),`
	`54`	`+ session1 = f1.get(),`
	`55`	`+ session2 = f2.get();`
	`56`	`+EXPECT_NE(session0, session1);`
	`57`	`+EXPECT_NE(session1, session2);`
	`58`	`+EXPECT_NE(session0, session2);`
	`59`	`+}`
	`60`	`+`
`38`	`61`	`}// namespace`

Comments

(0)