History

Enable logging from exec for specific components. Remove trailing newlines from all existing logging calls.

arr committed 9 years ago

Commit dd0789c1 parent 3098fb816 files · +185 −112Browse files

Showing the changes to src/vm/scheduler.cpp (1 of 16 files). Show all

Unified · Split

src/vm/scheduler.cpp+12−12
@@ -25,7 +25,7 @@ vm_scheduler_control_t::~vm_scheduler_control_t() · 24 unmodified lines
2525
2626 void default_scheduler_t::worker_main(default_scheduler_t &instance)
2727 {
28− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: start\n");
28+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: start");
2929
3030 auto current_thread = std::shared_ptr<thread_instance_t>{};
3131
@@ -36,12 +36,12 @@ void default_scheduler_t::worker_main(default_scheduler_t &instance) · 4 unmodified lines
3636 current_thread = instance.next_thread(std::move(current_thread));
3737 if (current_thread == nullptr)
3838 {
39− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: stop\n");
39+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: stop");
4040 break;
4141 }
4242
4343 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
44− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: execute: %d\n", current_thread->vm_thread->get_thread_id());
44+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: execute: %d", current_thread->vm_thread->get_thread_id());
4545
4646 current_thread->vm_thread->execute(instance._vm, instance._vm_thread_quanta);
4747 }
@@ -113,7 +113,7 @@ default_scheduler_t::~default_scheduler_t() · 65 unmodified lines
113113 for (auto &w : _worker_pool)
114114 w.join();
115115
116− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: shutdown\n");
116+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: shutdown");
117117 }
118118
119119 bool default_scheduler_t::is_idle() const
@@ -134,7 +134,7 @@ const vm_thread_t& default_scheduler_t::schedule_thread(std::unique_ptr<runtime: · 14 unmodified lines
134134 throw vm_system_exception{ "Scheduled thread in invalid state" };
135135
136136 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
137− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: scheduled: %d\n", thread->get_thread_id());
137+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: scheduled: %d", thread->get_thread_id());
138138
139139 std::unique_lock<std::mutex> lock{ _vm_threads_lock };
140140
@@ -249,7 +249,7 @@ void default_scheduler_t::enqueue_blocked_thread(uint32_t thread_id) · 108 unmodified lines
249249 _blocked_vm_thread_ids.erase(blocked_iter);
250250
251251 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
252− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: enqueue blocked: %d\n", thread_id);
252+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: enqueue blocked: %d", thread_id);
253253
254254 const bool runnable_thread = enqueue_thread_unsafe(std::move(thread_container), vm_thread_state_t::ready);
255255 if (runnable_thread)
@@ -344,7 +344,7 @@ std::shared_ptr<default_scheduler_t::thread_instance_t> default_scheduler_t::nex · 88 unmodified lines
344344
345345 if (!_all_vm_threads.empty() && _blocked_vm_thread_ids.size() == _all_vm_threads.size())
346346 {
347− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::warning, "scheduler: deadlock detected\n");
347+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::warning, "scheduler: deadlock detected");
348348 assert(false && "VM thread deadlock detected");
349349 }
350350
@@ -352,7 +352,7 @@ std::shared_ptr<default_scheduler_t::thread_instance_t> default_scheduler_t::nex · 1 unmodified line
352352 return{};
353353
354354 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
355− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: waiting\n");
355+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: worker: waiting");
356356
357357 _worker_event.wait(lock);
358358
@@ -402,7 +402,7 @@ bool default_scheduler_t::enqueue_thread_unsafe(std::shared_ptr<thread_instance_ · 43 unmodified lines
402402 _runnable_vm_thread_ids.push_back(thread_id);
403403
404404 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
405− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: enqueue: %d\n", thread_id);
405+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: enqueue: %d", thread_id);
406406
407407 return true;
408408 }
@@ -414,7 +414,7 @@ bool default_scheduler_t::enqueue_thread_unsafe(std::shared_ptr<thread_instance_ · 5 unmodified lines
414414 _blocked_vm_thread_ids.insert(thread_id);
415415
416416 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
417− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: blocked: %d\n", thread_id);
417+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: blocked: %d", thread_id);
418418
419419 break;
420420 }
@@ -423,7 +423,7 @@ bool default_scheduler_t::enqueue_thread_unsafe(std::shared_ptr<thread_instance_ · 2 unmodified lines
423423 case vm_thread_state_t::exiting:
424424 {
425425 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
426− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: exiting: %d\n", thread_id);
426+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: exiting: %d", thread_id);
427427
428428 // Remove the thread
429429 auto thread_to_remove = _all_vm_threads.find(thread_id);
@@ -436,7 +436,7 @@ bool default_scheduler_t::enqueue_thread_unsafe(std::shared_ptr<thread_instance_ · 6 unmodified lines
436436 case vm_thread_state_t::broken:
437437 {
438438 if (debug::is_component_tracing_enabled<debug::component_trace_t::scheduler>())
439− debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: broken: %d\n", thread_id);
439+ debug::log_msg(debug::component_trace_t::scheduler, debug::log_level_t::debug, "scheduler: broken: %d", thread_id);
440440
441441 auto err_msg = thread_instance->vm_thread->get_error_message();
442442 assert(err_msg != nullptr);