generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into ChaiScript_5_0_CPP_11

Browse Source 
Conflicts:
	include/chaiscript/chaiscript_threading.hpp
	include/chaiscript/dispatchkit/boxed_value.hpp
	include/chaiscript/dispatchkit/proxy_functions_detail.hpp
	samples/example.cpp
	src/test_module.cpp
	unittests/multithreaded_test.cpp
This commit is contained in:
Jason Turner
2013-05-27 08:48:59 -06:00
parent 6e71409a52 101225aa68
commit 1708024372
7 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
unittests/multithreaded_test.cpp
View File

@@ -24,13 +24,17 @@ int expected_value(int num_iters)
void do_work(chaiscript::ChaiScript &c, int id)
{
std::stringstream ss;
ss << "MyVar" << rand();
c.add(chaiscript::var(5), ss.str());
ss.str("");
ss << id;
c.use("multithreaded_work.inc");
c("do_chai_work(4000, " + ss.str() + ");");
try{
std::stringstream ss;
ss << "MyVar" << rand();
c.add(chaiscript::var(5), ss.str());
ss.str("");
ss << id;
c.use("multithreaded_work.inc");
c("do_chai_work(4000, " + ss.str() + ");");
} catch (const std::exception &e) {
std::cout << "exception: " << e.what() << " thread: " << id;
}
}
int main()
@@ -80,6 +84,7 @@ int main()
}
for (int i = 0; i < num_threads; ++i)
{
std::stringstream ss;