Skip to content

Commit

Permalink
Merge pull request openucx#1519 from yosefe/topic/ucp-log-data-use-gl…
Browse files Browse the repository at this point in the history
…obal-opts

UCP/CONTEXT: Use ucs_global_opts for log data size.
  • Loading branch information
yosefe authored May 17, 2017
2 parents f13bc13 + bd61b7b commit 6f9d5bc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 1 addition & 5 deletions src/ucp/core/ucp_context.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,6 @@ static ucs_config_field_t ucp_config_table[] = {
" Otherwise the CPU mode is selected.",
ucs_offsetof(ucp_config_t, ctx.atomic_mode), UCS_CONFIG_TYPE_ENUM(ucp_atomic_modes)},

{"LOG_DATA", "0",
"Size of packet data that is dumped to the log system in debug mode (0 - nothing).",
ucs_offsetof(ucp_config_t, ctx.log_data_size), UCS_CONFIG_TYPE_MEMUNITS},

{"MAX_WORKER_NAME", UCS_PP_MAKE_STRING(UCP_WORKER_NAME_MAX),
"Maximal length of worker name. Affects the size of worker address in debug builds.",
ucs_offsetof(ucp_config_t, ctx.max_worker_name), UCS_CONFIG_TYPE_UINT},
Expand Down Expand Up @@ -851,7 +847,7 @@ void ucp_cleanup(ucp_context_h context)
void ucp_dump_payload(ucp_context_h context, char *buffer, size_t max,
const void *data, size_t length)
{
size_t data_size = context->config.ext.log_data_size;
size_t data_size = ucs_global_opts.log_data_size;
char *p, *endp;
size_t offset;

Expand Down
2 changes: 0 additions & 2 deletions src/ucp/core/ucp_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ typedef struct ucp_context_config {
size_t zcopy_thresh;
/** Estimation of bcopy bandwidth */
size_t bcopy_bw;
/** Size of packet data that is dumped to the log system in debug mode */
size_t log_data_size;
/** Maximal size of worker name for debugging */
unsigned max_worker_name;
/** Atomic mode */
Expand Down

0 comments on commit 6f9d5bc

Please sign in to comment.