# Conflicts:
#	hpx/runtime/agas/component_namespace.hpp
#	hpx/runtime/agas/primary_namespace.hpp
#	hpx/runtime/agas/symbol_namespace.hpp
#	src/runtime/agas/addressing_service.cpp
#	src/runtime/agas/detail/bootstrap_component_namespace.cpp
#	src/runtime/agas/detail/bootstrap_locality_namespace.cpp
#	src/runtime/agas/detail/hosted_component_namespace.cpp
#	src/runtime/agas/primary_namespace.cpp
#	src/runtime/agas/server/primary_namespace_server.cpp
#	src/runtime/agas/symbol_namespace.cpp
#	src/util/logging.cpp

The barrier was implemented using a K-ary tree approach with the algorithm
as presented here:
http://www.cs.fsu.edu/~asriniva/papers/HiPC15.pdf

The arity is configurable through hpx.lcos.collectives.arity and the cut off when
to switch to the tree based algorithm is hpx.lcos.collectives.cut_off.

- flyby: adapt to new sync/async API
- making things compile for MSVC
- adding missing headers
- removed old barrier component

Those numbers have been determined experimentally on edison

Conflicts:
	hpx/lcos/server/barrier.hpp
	src/lcos/barrier.cpp

This change prevents the condition variable to wait in non HPX thread contexts.