Skip to content

Commit

Permalink
Started to work on fixing #722: Fix binding const member functions as…
Browse files Browse the repository at this point in the history
… actions
  • Loading branch information
hkaiser committed Mar 3, 2013
1 parent 75d952e commit 2ee4d74
Show file tree
Hide file tree
Showing 24 changed files with 40,220 additions and 20,702 deletions.
3 changes: 2 additions & 1 deletion docs/CMakeLists.txt
Expand Up @@ -39,7 +39,8 @@ set(doxygen_dependencies
${hpx_SOURCE_DIR}/hpx/exception.hpp
${hpx_SOURCE_DIR}/hpx/runtime/actions/action_support.hpp
${hpx_SOURCE_DIR}/hpx/runtime/actions/plain_action.hpp
${hpx_SOURCE_DIR}/hpx/runtime/actions/component_action.hpp
${hpx_SOURCE_DIR}/hpx/runtime/actions/component_non_const_action.hpp
${hpx_SOURCE_DIR}/hpx/runtime/actions/component_const_action.hpp
${hpx_SOURCE_DIR}/hpx/performance_counters/manage_counter_type.hpp)

foreach(doxygen_input ${doxygen_dependencies})
Expand Down
16 changes: 8 additions & 8 deletions hpx/hpx_fwd.hpp
Expand Up @@ -1060,7 +1060,7 @@ namespace hpx
///
/// \note The active counters are those which have been specified on
/// the command line while executing the application (see command
/// line option --hpx:print-counter)
/// line option \--hpx:print-counter)
HPX_API_EXPORT void start_active_counters(error_code& ec = throws);

/// \brief Resets all active performance counters.
Expand All @@ -1076,7 +1076,7 @@ namespace hpx
///
/// \note The active counters are those which have been specified on
/// the command line while executing the application (see command
/// line option --hpx:print-counter)
/// line option \--hpx:print-counter)
HPX_API_EXPORT void reset_active_counters(error_code& ec = throws);

/// \brief Stop all active performance counters.
Expand All @@ -1092,13 +1092,13 @@ namespace hpx
///
/// \note The active counters are those which have been specified on
/// the command line while executing the application (see command
/// line option --hpx:print-counter)
/// line option \--hpx:print-counter)
HPX_API_EXPORT void stop_active_counters(error_code& ec = throws);

/// \brief Query all active performance counters, optionally naming the
/// point in code marked by this function,
/// \brief Evaluate and utput all active performance counters, optionally
/// naming the point in code marked by this function.
///
/// \param reset [in] this is an optional falg allowing to reset
/// \param reset [in] this is an optional flag allowing to reset
/// the counter value after it has been evaluated.
/// \param description [in] this is an optional value naming the point in
/// the code marked by the call to this function.
Expand All @@ -1113,11 +1113,11 @@ namespace hpx
///
/// \note The output generated by this function is redirected to the
/// destination specified by the corresponding command line
/// options (see --hpx:print-counter-destination).
/// options (see \--hpx:print-counter-destination).
///
/// \note The active counters are those which have been specified on
/// the command line while executing the application (see command
/// line option --hpx:print-counter)
/// line option \--hpx:print-counter)
HPX_API_EXPORT void evaluate_active_counters(bool reset = false,
char const* description = 0, error_code& ec = throws);
}
Expand Down
37 changes: 12 additions & 25 deletions hpx/performance_counters/server/base_performance_counter.hpp
Expand Up @@ -113,42 +113,29 @@ namespace hpx { namespace performance_counters { namespace server

/// The \a get_counter_info_action retrieves a performance counters
/// information.
typedef hpx::actions::result_action0<
base_performance_counter const, counter_info,
&base_performance_counter::get_counter_info_nonvirt
> get_counter_info_action;
HPX_DEFINE_COMPONENT_CONST_ACTION(base_performance_counter,
get_counter_info_nonvirt, get_counter_info_action);

/// The \a get_counter_value_action queries the value of a performance
/// counter.
typedef hpx::actions::result_action1<
base_performance_counter, counter_value, bool,
&base_performance_counter::get_counter_value_nonvirt
> get_counter_value_action;
HPX_DEFINE_COMPONENT_ACTION(base_performance_counter,
get_counter_value_nonvirt, get_counter_value_action);

/// The \a set_counter_value_action
typedef hpx::actions::action1<
base_performance_counter,
counter_value const&,
&base_performance_counter::set_counter_value_nonvirt
> set_counter_value_action;
HPX_DEFINE_COMPONENT_ACTION(base_performance_counter,
set_counter_value_nonvirt, set_counter_value_action);

/// The \a reset_counter_value_action
typedef hpx::actions::action0<
base_performance_counter,
&base_performance_counter::reset_counter_value_nonvirt
> reset_counter_value_action;
HPX_DEFINE_COMPONENT_ACTION(base_performance_counter,
reset_counter_value_nonvirt, reset_counter_value_action);

/// The \a start_action
typedef hpx::actions::result_action0<
base_performance_counter, bool,
&base_performance_counter::start_nonvirt
> start_action;
HPX_DEFINE_COMPONENT_ACTION(base_performance_counter,
start_nonvirt, start_action);

/// The \a stop_action
typedef hpx::actions::result_action0<
base_performance_counter, bool,
&base_performance_counter::stop_nonvirt
> stop_action;
HPX_DEFINE_COMPONENT_ACTION(base_performance_counter,
stop_nonvirt, stop_action);

/// This is the default hook implementation for decorate_action which
/// does no hooking at all.
Expand Down

0 comments on commit 2ee4d74

Please sign in to comment.