Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing misplaced #endif #3837

Merged
merged 1 commit into from
May 5, 2019
Merged

Fixing misplaced #endif #3837

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions hpx/runtime/threads/detail/scheduled_thread_pool_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,6 @@ namespace hpx { namespace threads { namespace detail

return executed_phases - reset_executed_phases;
}
#endif

#if defined(HPX_HAVE_THREAD_IDLE_RATES)
template <typename Scheduler>
Expand Down Expand Up @@ -1279,8 +1278,8 @@ namespace hpx { namespace threads { namespace detail
return std::int64_t(
(double(tfunc_total) - double(exec_total)) * timestamp_scale_);
}
#endif
#endif
#endif // HPX_HAVE_THREAD_IDLE_RATES
#endif // HPX_HAVE_THREAD_CUMULATIVE_COUNTS

#if defined(HPX_HAVE_BACKGROUND_THREAD_COUNTERS) && defined(HPX_HAVE_THREAD_IDLE_RATES)
////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1530,7 +1529,7 @@ namespace hpx { namespace threads { namespace detail
(cleanup_total / double(tfunc_total - exec_total));
return std::int64_t(10000. * percent); // 0.01 percent
}
#endif
#endif // HPX_HAVE_THREAD_CREATION_AND_CLEANUP_RATES

template <typename Scheduler>
std::int64_t scheduled_thread_pool<Scheduler>::avg_idle_rate_all(bool reset)
Expand Down Expand Up @@ -1612,7 +1611,7 @@ namespace hpx { namespace threads { namespace detail
1. - (double(exec_time) / double(tfunc_time));
return std::int64_t(10000. * percent); // 0.01 percent
}
#endif
#endif // HPX_HAVE_THREAD_IDLE_RATES

template <typename Scheduler>
std::int64_t scheduled_thread_pool<Scheduler>::get_idle_loop_count(
Expand Down Expand Up @@ -2038,3 +2037,5 @@ namespace hpx { namespace threads { namespace detail
}
}
}}}

#endif