Skip to content

Commit

Permalink
Leave managed base_lco_with_value the default
Browse files Browse the repository at this point in the history
  • Loading branch information
@hkaiser
hkaiser committed Jul 13, 2017
1 parent 325cf17 commit 6430975
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions hpx/lcos/base_lco_with_value.hpp
View file
Expand Up @@ -199,7 +199,7 @@ namespace hpx { namespace traits
{
static components::component_type get()
{
return components::component_base_lco_with_value_managed;
return components::component_base_lco_with_value;
}

static void set(components::component_type)
Expand All @@ -216,7 +216,7 @@ namespace hpx { namespace traits
{
static components::component_type get()
{
return components::component_base_lco_with_value;
return components::component_base_lco_with_value_unmanaged;
}

static void set(components::component_type)
Expand Down
4 changes: 2 additions & 2 deletions hpx/lcos/detail/promise_lco.hpp
View file
Expand Up @@ -191,7 +191,7 @@ namespace traits {

template <typename Result, typename RemoteResult>
struct component_type_database<
lcos::detail::promise_lco<Result, RemoteResult>>
lcos::detail::promise_lco<Result, RemoteResult> >
{
static components::component_type value;

Expand All @@ -203,7 +203,7 @@ namespace traits {
if (value == components::component_invalid)
{
value = derived_component_type(++detail::unique_type,
components::component_base_lco_with_value_managed);
components::component_base_lco_with_value);
}
return value;
}
Expand Down
24 changes: 12 additions & 12 deletions hpx/runtime/components/component_type.hpp
View file
Expand Up @@ -41,18 +41,18 @@ namespace hpx { namespace components
component_base_lco = 4,

// Base component for LCOs that produce values.
component_base_lco_with_value = 5,
component_base_lco_with_value_unmanaged = 5,

// (Managed) base component for LCOs that produce values.
component_base_lco_with_value_managed = 6,
component_base_lco_with_value = 6,

// Synchronization latch, barrier, and flex_barrier LCOs.
component_latch = ((7 << 16) | component_base_lco_with_value_managed),
component_latch = ((7 << 16) | component_base_lco_with_value),
component_barrier = ((8 << 16) | component_base_lco),
component_flex_barrier = ((9 << 16) | component_base_lco),

// An LCO representing a value which may not have been computed yet.
component_promise = ((10 << 16) | component_base_lco_with_value_managed),
component_promise = ((10 << 16) | component_base_lco_with_value),

// AGAS locality services.
component_agas_locality_namespace = 11,
Expand Down Expand Up @@ -123,27 +123,27 @@ namespace hpx { namespace components

// special case for lco's
if (lhs_base == component_base_lco &&
(rhs_base == component_base_lco_with_value ||
rhs_base == component_base_lco_with_value_managed))
(rhs_base == component_base_lco_with_value_unmanaged ||
rhs_base == component_base_lco_with_value))
{
return true;
}

if (rhs_base == component_base_lco &&
(lhs_base == component_base_lco_with_value ||
lhs_base == component_base_lco_with_value_managed))
(lhs_base == component_base_lco_with_value_unmanaged ||
lhs_base == component_base_lco_with_value))
{
return true;
}

if (lhs_base == component_base_lco_with_value &&
rhs_base == component_base_lco_with_value_managed)
if (lhs_base == component_base_lco_with_value_unmanaged &&
rhs_base == component_base_lco_with_value)
{
return true;
}

if (lhs_base == component_base_lco_with_value_managed &&
rhs_base == component_base_lco_with_value)
if (lhs_base == component_base_lco_with_value &&
rhs_base == component_base_lco_with_value_unmanaged)
{
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions hpx/runtime/trigger_lco.hpp
View file
Expand Up @@ -423,7 +423,7 @@ namespace hpx
>::type local_result_type;

if (components::get_base_type(addr.type_) ==
components::component_base_lco_with_value_managed)
components::component_base_lco_with_value)
{
typedef typename lcos::base_lco_with_value<
local_result_type, remote_result_type,
Expand All @@ -437,7 +437,7 @@ namespace hpx
{
HPX_ASSERT(
components::get_base_type(addr.type_) ==
components::component_base_lco_with_value);
components::component_base_lco_with_value_unmanaged);

typedef typename lcos::base_lco_with_value<
local_result_type, remote_result_type,
Expand All @@ -459,7 +459,7 @@ namespace hpx
>::type local_result_type;

if (components::get_base_type(addr.type_) ==
components::component_base_lco_with_value_managed)
components::component_base_lco_with_value)
{
typedef typename lcos::base_lco_with_value<
local_result_type, remote_result_type,
Expand All @@ -475,7 +475,7 @@ namespace hpx
{
HPX_ASSERT(
components::get_base_type(addr.type_) ==
components::component_base_lco_with_value);
components::component_base_lco_with_value_unmanaged);

typedef typename lcos::base_lco_with_value<
local_result_type, remote_result_type,
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/components/component_type.cpp
View file
Expand Up @@ -23,8 +23,8 @@ namespace hpx { namespace components
"component_memory", /* 2 */
"component_memory_block", /* 3 */
"component_base_lco", /* 4 */
"component_base_lco_with_value", /* 5 */
"component_base_lco_with_value_managed", /* 6 */
"component_base_lco_with_value_unmanaged", /* 5 */
"component_base_lco_with_value", /* 6 */
"component_latch", /* 7 (0x70006) */
"component_barrier", /* 8 (0x80004) */
"component_flex_barrier", /* 9 (0x90004) */
Expand Down

0 comments on commit 6430975

Please sign in to comment.