Permalink
Browse files

Remove leftover security options and documentation

  • Loading branch information...
msimberg committed Nov 6, 2018
1 parent 7464c0b commit 56c1747d9fd66e9cd789292a792f66e2cee31568
@@ -73,12 +73,6 @@ custom directory for ``BOOST``, specify ``BOOST_ROOT=/custom/boost/root``.
tools, which customizes the generated information for your application and
improves the generated diagnostics.
.. option:: SODIUM_ROOT:PATH
Specifies where to look for the |sodium|_ library. The Sodium library is
necessary to enable the security related functionality (see
``HPX_HAVE_SECURITY``).
In addition, some of the examples may need the following variables:
.. option:: HDF5_ROOT:PATH
@@ -441,7 +441,6 @@ The ``hpx.parcel`` configuration section
array_optimization = ${HPX_PARCEL_ARRAY_OPTIMIZATION:1}
zero_copy_optimization = ${HPX_PARCEL_ZERO_COPY_OPTIMIZATION:$[hpx.parcel.array_optimization]}
async_serialization = ${HPX_PARCEL_ASYNC_SERIALIZATION:1}
enable_security = ${HPX_PARCEL_ENABLE_SECURITY:0}
message_handlers = ${HPX_PARCEL_MESSAGE_HANDLERS:0}
.. _ini_hpx_parcel:
@@ -500,9 +499,6 @@ The ``hpx.parcel`` configuration section
* This property defines whether this :term:`locality` is allowed to spawn a
new thread for serialization (this is both for encoding and decoding
parcels). The default is ``1``.
* * ``hpx.parcel.enable_security``
* This property defines whether this :term:`locality` is encrypting
parcels. The default is ``0``.
* * ``hpx.parcel.message_handlers``
* This property defines whether message handlers are loaded. The default is
``0``.
@@ -516,7 +512,6 @@ The following settings relate to the TCP/IP parcelport.
array_optimization = ${HPX_PARCEL_TCP_ARRAY_OPTIMIZATION:$[hpx.parcel.array_optimization]}
zero_copy_optimization = ${HPX_PARCEL_TCP_ZERO_COPY_OPTIMIZATION:$[hpx.parcel.zero_copy_optimization]}
async_serialization = ${HPX_PARCEL_TCP_ASYNC_SERIALIZATION:$[hpx.parcel.async_serialization]}
enable_security = ${HPX_PARCEL_TCP_ENABLE_SECURITY:$[hpx.parcel.enable_security]}
parcel_pool_size = ${HPX_PARCEL_TCP_PARCEL_POOL_SIZE:$[hpx.threadpools.parcel_pool_size]}
max_connections = ${HPX_PARCEL_TCP_MAX_CONNECTIONS:$[hpx.parcel.max_connections]}
max_connections_per_locality = ${HPX_PARCEL_TCP_MAX_CONNECTIONS_PER_LOCALITY:$[hpx.parcel.max_connections_per_locality]}
@@ -549,10 +544,6 @@ The following settings relate to the TCP/IP parcelport.
new thread for serialization in the TCP/IP parcelport (this is both for
encoding and decoding parcels). The default is the same value as set for
``hpx.parcel.async_serialization``.
* * ``hpx.parcel.tcp.enable_security``
* This property defines whether this :term:`locality` is encrypting parcels
in the TCP/IP parcelport. The default is the same value as set for
``hpx.parcel.enable_security``.
* * ``hpx.parcel.tcp.parcel_pool_size``
* The value of this property defines the number of OS-threads created for
the internal parcel thread pool of the TCP :term:`parcel` port. The default is
@@ -591,7 +582,6 @@ equivalent cmake variable is ``HPX_WITH_PARCELPORT_MPI`` and has to be set to
zero_copy_optimization = ${HPX_HAVE_PARCEL_MPI_ZERO_COPY_OPTIMIZATION:$[hpx.parcel.zero_copy_optimization]}
use_io_pool = ${HPX_HAVE_PARCEL_MPI_USE_IO_POOL:$1}
async_serialization = ${HPX_HAVE_PARCEL_MPI_ASYNC_SERIALIZATION:$[hpx.parcel.async_serialization]}
enable_security = ${HPX_HAVE_PARCEL_MPI_ENABLE_SECURITY:$[hpx.parcel.enable_security]}
parcel_pool_size = ${HPX_HAVE_PARCEL_MPI_PARCEL_POOL_SIZE:$[hpx.threadpools.parcel_pool_size]}
max_connections = ${HPX_HAVE_PARCEL_MPI_MAX_CONNECTIONS:$[hpx.parcel.max_connections]}
max_connections_per_locality = ${HPX_HAVE_PARCEL_MPI_MAX_CONNECTIONS_PER_LOCALITY:$[hpx.parcel.max_connections_per_locality]}
@@ -643,10 +633,6 @@ equivalent cmake variable is ``HPX_WITH_PARCELPORT_MPI`` and has to be set to
new thread for serialization in the MPI parcelport (this is both for
encoding and decoding parcels). The default is the same value as set for
``hpx.parcel.async_serialization``.
* * ``hpx.parcel.mpi.enable_security``
* This property defines whether this :term:`locality` is encrypting parcels
in the MPI parcelport. The default is the same value as set for
``hpx.parcel.enable_security``.
* * ``hpx.parcel.mpi.parcel_pool_size``
* The value of this property defines the number of OS-threads created for
the internal parcel thread pool of the MPI :term:`parcel` port. The default is
@@ -48,9 +48,7 @@ This section gives definitions for some of the terms used throughout the
as the coarse grained parallelism achieved through concurrency of multiple
processes of an executing user job. |hpx| processes provide a hierarchical
name space within the framework of the active global address space and
support multiple means of internal state access from external sources. It
also incorporates capabilities based access rights for protection and
security.
support multiple means of internal state access from external sources.
Parcel
View
@@ -126,19 +126,17 @@ namespace hpx
///< An unknown error occurred
bad_plugin_type = 49,
///< The specified plugin type is not known or otherwise invalid
security_error = 50,
///< An error occurred in the security component
filesystem_error = 51,
filesystem_error = 50,
///< The specified file does not exist or other filesystem related error
bad_function_call = 52,
bad_function_call = 51,
///< equivalent of std::bad_function_call
task_canceled_exception = 53,
task_canceled_exception = 52,
///< parallel::v2::task_canceled_exception
task_block_not_active = 54,
task_block_not_active = 53,
///< task_region is not active
out_of_range = 55,
out_of_range = 54,
///< Equivalent to std::out_of_range
length_error = 56,
length_error = 55,
///< Equivalent to std::length_error
/// \cond NOINTERNAL
@@ -202,13 +200,12 @@ namespace hpx
/* 47 */ "duplicate_component_id",
/* 48 */ "unknown_error",
/* 49 */ "bad_plugin_type",
/* 50 */ "security_error",
/* 51 */ "filesystem_error",
/* 52 */ "bad_function_call",
/* 53 */ "task_canceled_exception",
/* 54 */ "task_block_not_active",
/* 55 */ "out_of_range",
/* 56 */ "length_error",
/* 50 */ "filesystem_error",
/* 51 */ "bad_function_call",
/* 52 */ "task_canceled_exception",
/* 53 */ "task_block_not_active",
/* 54 */ "out_of_range",
/* 55 */ "length_error",
/* */ ""
};
@@ -101,9 +101,6 @@ namespace hpx { namespace plugins
"zero_copy_optimization = ${HPX_PARCEL_" + name_uc +
"_ZERO_COPY_OPTIMIZATION:"
"$[hpx.parcel.zero_copy_optimization]}",
"enable_security = ${HPX_PARCEL_" + name_uc +
"_ENABLE_SECURITY:"
"$[hpx.parcel.enable_security]}",
"async_serialization = ${HPX_PARCEL_" + name_uc +
"_ASYNC_SERIALIZATION:"
"$[hpx.parcel.async_serialization]}",
@@ -686,8 +686,6 @@ namespace hpx { namespace actions
terminate_action_id,
terminate_all_action_id,
update_agas_cache_action_id,
register_worker_security_action_id,
notify_worker_security_action_id,
base_lco_with_value_gid_get,
base_lco_with_value_gid_set,
@@ -316,11 +316,6 @@ namespace hpx { namespace parcelset
return allow_zero_copy_optimizations_;
}
bool enable_security() const
{
return enable_security_;
}
bool async_serialization() const
{
return async_serialization_;
@@ -369,9 +364,6 @@ namespace hpx { namespace parcelset
bool allow_array_optimizations_;
bool allow_zero_copy_optimizations_;
/// enable security
bool enable_security_;
/// async serialization of parcels
bool async_serialization_;
View
@@ -28,7 +28,6 @@
#define LPCS_(lvl) LHPX_(lvl, " [PCS] ") /* performance counters */
#define LAS_(lvl) LHPX_(lvl, " [AS] ") /* addressing service */
#define LBT_(lvl) LHPX_(lvl, " [BT] ") /* bootstrap */
#define LSEC_(lvl) LHPX_(lvl, " [SEC] ") /* security */
///////////////////////////////////////////////////////////////////////////////
namespace hpx { namespace util
@@ -275,7 +274,6 @@ namespace hpx { namespace util { namespace detail
#define LPCS_(lvl) if(true) {} else hpx::util::detail::dummy_log
#define LAS_(lvl) if(true) {} else hpx::util::detail::dummy_log
#define LBT_(lvl) if(true) {} else hpx::util::detail::dummy_log
#define LSEC_(lvl) if(true) {} else hpx::util::detail::dummy_log
#define LFATAL_ if(true) {} else hpx::util::detail::dummy_log
@@ -1577,7 +1577,6 @@ namespace hpx { namespace parcelset
"array_optimization = ${HPX_PARCEL_ARRAY_OPTIMIZATION:1}",
"zero_copy_optimization = ${HPX_PARCEL_ZERO_COPY_OPTIMIZATION:"
"$[hpx.parcel.array_optimization]}",
"enable_security = ${HPX_PARCEL_ENABLE_SECURITY:0}",
"async_serialization = ${HPX_PARCEL_ASYNC_SERIALIZATION:1}",
#if defined(HPX_HAVE_PARCEL_COALESCING)
"message_handlers = ${HPX_PARCEL_MESSAGE_HANDLERS:1}"
@@ -39,7 +39,6 @@ namespace hpx { namespace parcelset
max_outbound_message_size_(ini.get_max_outbound_message_size()),
allow_array_optimizations_(true),
allow_zero_copy_optimizations_(true),
enable_security_(false),
async_serialization_(false),
priority_(hpx::util::get_entry_as<int>(ini,
"hpx.parcel." + type + ".priority", "0")),
@@ -63,12 +62,6 @@ namespace hpx { namespace parcelset
}
}
if (hpx::util::get_entry_as<int>(
ini, key + ".enable_security", "0") != 0)
{
enable_security_ = true;
}
if (hpx::util::get_entry_as<int>(
ini, key + ".async_serialization", "0") != 0)
{

0 comments on commit 56c1747

Please sign in to comment.