Commit 9b7c4cd3 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'unstable' into topic/opencl

parents 1a8be147 f40031d0
...@@ -84,7 +84,7 @@ class logging_impl : public logging { ...@@ -84,7 +84,7 @@ class logging_impl : public logging {
void operator()() { void operator()() {
ostringstream fname; ostringstream fname;
fname << "libcppa_" << getpid() << "_" << time(0) << ".log"; fname << "libcppa_" << getpid() << "_" << time(0) << ".log";
fstream out(fname.str().c_str(), ios::app); fstream out(fname.str().c_str(), ios::out);
unique_ptr<log_event> event; unique_ptr<log_event> event;
for (;;) { for (;;) {
event.reset(m_queue.pop()); event.reset(m_queue.pop());
......
...@@ -133,7 +133,7 @@ void thread_pool_scheduler::worker_loop(thread_pool_scheduler::worker* w) { ...@@ -133,7 +133,7 @@ void thread_pool_scheduler::worker_loop(thread_pool_scheduler::worker* w) {
} }
thread_pool_scheduler::thread_pool_scheduler() { thread_pool_scheduler::thread_pool_scheduler() {
m_num_threads = std::max<size_t>(std::thread::hardware_concurrency()*2, 4); m_num_threads = std::max<size_t>(std::thread::hardware_concurrency(), 4);
} }
thread_pool_scheduler::thread_pool_scheduler(size_t num_worker_threads) { thread_pool_scheduler::thread_pool_scheduler(size_t num_worker_threads) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment