Skip to content

Commit e3b925f

Browse files
committed
Enable show_help output on tools
Don't restrict the plog/stdfd component to only work on gateways - it needs to also support tools. Signed-off-by: Ralph Castain <[email protected]>
1 parent df0280b commit e3b925f

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/mca/plog/base/plog_base_stubs.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ static void localcbfunc(pmix_status_t status, void *cbdata)
6666
PMIX_RELEASE_THREAD(&mycount->lock);
6767
}
6868

69-
pmix_status_t pmix_plog_base_log(const pmix_proc_t *source, const pmix_info_t data[], size_t ndata,
69+
pmix_status_t pmix_plog_base_log(const pmix_proc_t *source,
70+
const pmix_info_t data[], size_t ndata,
7071
const pmix_info_t directives[], size_t ndirs,
7172
pmix_op_cbfunc_t cbfunc, void *cbdata)
7273
{
@@ -95,7 +96,8 @@ pmix_status_t pmix_plog_base_log(const pmix_proc_t *source, const pmix_info_t da
9596
* can only be on one list at a time */
9697
PMIX_ACQUIRE_THREAD(&pmix_plog_globals.lock);
9798

98-
pmix_output_verbose(2, pmix_plog_base_framework.framework_output, "plog:log called");
99+
pmix_output_verbose(2, pmix_plog_base_framework.framework_output,
100+
"plog:log called");
99101

100102
/* initialize the tracker */
101103
mycount = PMIX_NEW(pmix_mycount_t);

src/mca/plog/stdfd/plog_stdfd.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,9 @@ static pmix_status_t mylog(const pmix_proc_t *source, const pmix_info_t data[],
111111
return PMIX_ERR_NOT_AVAILABLE;
112112
}
113113

114-
/* if we are not a gateway, then we don't handle this */
115-
if (!PMIX_PEER_IS_GATEWAY(pmix_globals.mypeer)) {
114+
/* if we are not a gateway or tool, then we don't handle this */
115+
if (!PMIX_PEER_IS_GATEWAY(pmix_globals.mypeer) &&
116+
!PMIX_PEER_IS_TOOL(pmix_globals.mypeer)) {
116117
return PMIX_ERR_TAKE_NEXT_OPTION;
117118
}
118119

src/util/pmix_show_help.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,9 @@ static pmix_status_t match(const char *a, const char *b)
191191
}
192192

193193

194-
static pmix_status_t pmix_get_tli(const char *filename, const char *topic, tuple_list_item_t **tli_)
194+
static pmix_status_t pmix_get_tli(const char *filename,
195+
const char *topic,
196+
tuple_list_item_t **tli_)
195197
{
196198
tuple_list_item_t *tli = *tli_;
197199

0 commit comments

Comments
 (0)