Navigation Menu

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.

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 2277: build failure with PAPI #2280

Merged
merged 2 commits into from Aug 4, 2016
Merged

Fixing 2277: build failure with PAPI #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f1e954
Add missing commas in initializer list
K-ballo Aug 4, 2016
132e955
Add missing #includes and other minor fixes for PAPI
K-ballo Aug 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/performance_counters/papi/papi_startup.cpp
View file
Open in desktop
Expand Up @@ -20,8 +20,14 @@
#include <hpx/util/thread_mapper.hpp>
#include <hpx/components/performance_counters/papi/server/papi.hpp>
#include <hpx/components/performance_counters/papi/util/papi.hpp>
#include <hpx/runtime.hpp>
#include <hpx/runtime/components/component_commandline.hpp>
#include <hpx/runtime/components/component_factory_base.hpp>
#include <hpx/runtime/components/component_startup_shutdown.hpp>
#include <hpx/runtime/components/server/create_component.hpp>
#include <hpx/runtime/startup_function.hpp>
#include <hpx/performance_counters/counter_creators.hpp>
#include <hpx/performance_counters/manage_counter_type.hpp>
#include <hpx/exception.hpp>

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -291,7 +297,7 @@ namespace hpx { namespace performance_counters { namespace papi
}
}

bool check_startup(hpx::util::function_nonser<void()>& startup_func,
bool check_startup(hpx::startup_function_type startup_func,
bool& pre_startup)
{
// PAPI initialization
Expand Down
1 change: 1 addition & 0 deletions src/components/performance_counters/papi/server/papi.cpp
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@

#if defined(HPX_HAVE_PAPI)

#include <hpx/runtime.hpp>
#include <hpx/runtime/components/server/component.hpp>
#include <hpx/runtime/components/derived_component_factory.hpp>
#include <hpx/runtime/actions/continuation.hpp>
Expand Down
15 changes: 9 additions & 6 deletions src/components/performance_counters/papi/util/papi.cpp
View file
Open in desktop
Expand Up @@ -5,14 +5,17 @@

#include <hpx/config.hpp>


#if defined(HPX_HAVE_PAPI)

#include <hpx/config/asio.hpp>
#include <hpx/exception.hpp>
#include <hpx/runtime.hpp>
#include <hpx/util/parse_command_line.hpp>
#include <hpx/util/thread_mapper.hpp>
#include <hpx/components/performance_counters/papi/util/papi.hpp>


#include <boost/format.hpp>
#include <boost/asio/ip/host_name.hpp>
#include <boost/generator_iterator.hpp>
Expand All @@ -31,12 +34,12 @@ namespace hpx { namespace performance_counters { namespace papi { namespace util

// PAPI domain description strings
std::map<std::string, int> const papi_domain_map = {
{"user", PAPI_DOM_USER}
{"kernel", PAPI_DOM_KERNEL}
{"other", PAPI_DOM_OTHER}
{"super", PAPI_DOM_SUPERVISOR}
{"all", PAPI_DOM_ALL}
{"min", PAPI_DOM_MIN}
{"user", PAPI_DOM_USER},
{"kernel", PAPI_DOM_KERNEL},
{"other", PAPI_DOM_OTHER},
{"super", PAPI_DOM_SUPERVISOR},
{"all", PAPI_DOM_ALL},
{"min", PAPI_DOM_MIN},
{"max", PAPI_DOM_MAX}
};

Expand Down