Cleanup warnings in opal and orte layers when building optimized on Mac
Этот коммит содержится в:
родитель
d668612f16
Коммит
64b695669a
@ -474,7 +474,10 @@ int32_t opal_convertor_set_position_nocheck( opal_convertor_t* convertor,
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
#define OPAL_CONVERTOR_COMPUTE_REMOTE_SIZE(convertor, datatype, bdt_mask) \
|
#define OPAL_CONVERTOR_COMPUTE_REMOTE_SIZE(convertor, datatype, bdt_mask) \
|
||||||
assert(0 == (bdt_mask))
|
{ \
|
||||||
|
assert(0 == (bdt_mask)); \
|
||||||
|
(void)bdt_mask; /* silence compiler warning */ \
|
||||||
|
}
|
||||||
#endif /* OPAL_ENABLE_HETEROGENEOUS_SUPPORT */
|
#endif /* OPAL_ENABLE_HETEROGENEOUS_SUPPORT */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -499,7 +499,9 @@ hwloc_topology_dup(hwloc_topology_t *newp,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
hwloc_topology_init(&new);
|
if (0 != hwloc_topology_init(&new)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
new->flags = old->flags;
|
new->flags = old->flags;
|
||||||
memcpy(new->ignored_types, old->ignored_types, sizeof(old->ignored_types));
|
memcpy(new->ignored_types, old->ignored_types, sizeof(old->ignored_types));
|
||||||
@ -3046,6 +3048,7 @@ hwloc__check_children(struct hwloc_obj *parent)
|
|||||||
assert(prev_firstchild < firstchild);
|
assert(prev_firstchild < firstchild);
|
||||||
prev_firstchild = firstchild;
|
prev_firstchild = firstchild;
|
||||||
}
|
}
|
||||||
|
(void)prev_firstchild; // silence compiler warning
|
||||||
}
|
}
|
||||||
|
|
||||||
/* checks for all children */
|
/* checks for all children */
|
||||||
|
@ -63,7 +63,7 @@ static void myerr(pmix_status_t status,
|
|||||||
iptr = OBJ_NEW(opal_value_t);
|
iptr = OBJ_NEW(opal_value_t);
|
||||||
iptr->key = strdup(info[n].key);
|
iptr->key = strdup(info[n].key);
|
||||||
pmix1_value_unload(iptr, &info[n].value);
|
pmix1_value_unload(iptr, &info[n].value);
|
||||||
opal_list_append(&plist, &nm->super);
|
opal_list_append(&plist, &iptr->super);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* call the base errhandler */
|
/* call the base errhandler */
|
||||||
|
@ -77,7 +77,7 @@ static void myerr(pmix_status_t status,
|
|||||||
iptr = OBJ_NEW(opal_value_t);
|
iptr = OBJ_NEW(opal_value_t);
|
||||||
iptr->key = strdup(info[n].key);
|
iptr->key = strdup(info[n].key);
|
||||||
pmix1_value_unload(iptr, &info[n].value);
|
pmix1_value_unload(iptr, &info[n].value);
|
||||||
opal_list_append(&plist, &nm->super);
|
opal_list_append(&plist, &iptr->super);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* call the base errhandler */
|
/* call the base errhandler */
|
||||||
|
@ -217,10 +217,12 @@ opal_progress_set_event_flag(int flag)
|
|||||||
void
|
void
|
||||||
opal_progress_event_users_increment(void)
|
opal_progress_event_users_increment(void)
|
||||||
{
|
{
|
||||||
|
#if OPAL_ENABLE_DEBUG
|
||||||
int32_t val;
|
int32_t val;
|
||||||
val = opal_atomic_add_32(&num_event_users, 1);
|
val = opal_atomic_add_32(&num_event_users, 1);
|
||||||
|
|
||||||
OPAL_OUTPUT((debug_output, "progress: event_users_increment setting count to %d", val));
|
OPAL_OUTPUT((debug_output, "progress: event_users_increment setting count to %d", val));
|
||||||
|
#endif
|
||||||
|
|
||||||
#if OPAL_PROGRESS_USE_TIMERS
|
#if OPAL_PROGRESS_USE_TIMERS
|
||||||
/* force an update next round (we'll be past the delta) */
|
/* force an update next round (we'll be past the delta) */
|
||||||
@ -235,10 +237,12 @@ opal_progress_event_users_increment(void)
|
|||||||
void
|
void
|
||||||
opal_progress_event_users_decrement(void)
|
opal_progress_event_users_decrement(void)
|
||||||
{
|
{
|
||||||
|
#if OPAL_ENABLE_DEBUG
|
||||||
int32_t val;
|
int32_t val;
|
||||||
val = opal_atomic_sub_32(&num_event_users, 1);
|
val = opal_atomic_sub_32(&num_event_users, 1);
|
||||||
|
|
||||||
OPAL_OUTPUT((debug_output, "progress: event_users_decrement setting count to %d", val));
|
OPAL_OUTPUT((debug_output, "progress: event_users_decrement setting count to %d", val));
|
||||||
|
#endif
|
||||||
|
|
||||||
#if !OPAL_PROGRESS_USE_TIMERS
|
#if !OPAL_PROGRESS_USE_TIMERS
|
||||||
/* start now in delaying if it's easy */
|
/* start now in delaying if it's easy */
|
||||||
|
@ -40,8 +40,10 @@ AC_DEFUN([MCA_orte_plm_slurm_CONFIG],[
|
|||||||
|
|
||||||
# check to see if this is a Cray nativized slurm env.
|
# check to see if this is a Cray nativized slurm env.
|
||||||
|
|
||||||
|
slurm_cray_env=0
|
||||||
ORTE_CHECK_ALPS([plm_slurm_cray],
|
ORTE_CHECK_ALPS([plm_slurm_cray],
|
||||||
[AC_DEFINE_UNQUOTED([SLURM_CRAY_ENV],[1],
|
[slurm_cray_env=1])
|
||||||
[defined to 1 if slurm cray env, 0 otherwise])])
|
|
||||||
|
|
||||||
|
AC_DEFINE_UNQUOTED([SLURM_CRAY_ENV],[$slurm_cray_env],
|
||||||
|
[defined to 1 if slurm cray env, 0 otherwise])
|
||||||
])dnl
|
])dnl
|
||||||
|
@ -329,7 +329,9 @@ static inline int process_out_of_order_msg ( orte_qos_ack_channel_t *ack_chan,
|
|||||||
rc = ORTE_ERR_DUPLICATE_MSG;
|
rc = ORTE_ERR_DUPLICATE_MSG;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
opal_hotel_checkin(&ack_chan->outstanding_msgs, (void*)msg, &room_num);
|
if (OPAL_SUCCESS != (rc = opal_hotel_checkin(&ack_chan->outstanding_msgs, (void*)msg, &room_num))) {
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
OPAL_OUTPUT_VERBOSE((1, orte_qos_base_framework.framework_output,
|
OPAL_OUTPUT_VERBOSE((1, orte_qos_base_framework.framework_output,
|
||||||
"process_out_of_order_msg checked in msg %d in room %d\n",
|
"process_out_of_order_msg checked in msg %d in room %d\n",
|
||||||
msg->seq_num, room_num));
|
msg->seq_num, room_num));
|
||||||
@ -484,17 +486,19 @@ static int ack_cmp (void *channel, opal_list_t *attributes) {
|
|||||||
|
|
||||||
static void ack_send_callback (orte_rml_send_t *msg)
|
static void ack_send_callback (orte_rml_send_t *msg)
|
||||||
{
|
{
|
||||||
orte_qos_ack_channel_t *ack_chan;
|
|
||||||
/* complete the request back to the user only upon receiving the ack
|
/* complete the request back to the user only upon receiving the ack
|
||||||
nothing to do here, just make sure that the request is in the hotel */
|
nothing to do here, just make sure that the request is in the hotel */
|
||||||
OPAL_OUTPUT_VERBOSE((1, orte_qos_base_framework.framework_output,
|
OPAL_OUTPUT_VERBOSE((1, orte_qos_base_framework.framework_output,
|
||||||
"%s ack_send_callback for msg = %p seq num =%d\n",
|
"%s ack_send_callback for msg = %p seq num =%d\n",
|
||||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
|
||||||
(void*)msg, msg->seq_num));
|
(void*)msg, msg->seq_num));
|
||||||
ack_chan = (orte_qos_ack_channel_t *) msg->channel->qos_channel_ptr;
|
|
||||||
/* if msg->status != SUCCESS - then evict all messages in the window and
|
/* if msg->status != SUCCESS - then evict all messages in the window and
|
||||||
complete them?? */
|
complete them?? */
|
||||||
if(ORTE_SUCCESS == msg->status) {
|
if(ORTE_SUCCESS == msg->status) {
|
||||||
|
#if OPAL_ENABLE_DEBUG
|
||||||
|
orte_qos_ack_channel_t *ack_chan;
|
||||||
|
ack_chan = (orte_qos_ack_channel_t *) msg->channel->qos_channel_ptr;
|
||||||
|
#endif
|
||||||
// nothing to do
|
// nothing to do
|
||||||
assert((orte_qos_ack_channel_get_msg_room(ack_chan, msg->seq_num)) != -1);
|
assert((orte_qos_ack_channel_get_msg_room(ack_chan, msg->seq_num)) != -1);
|
||||||
} else {
|
} else {
|
||||||
@ -531,7 +535,9 @@ void orte_qos_ack_msg_ack_timeout_callback (struct opal_hotel_t *hotel,
|
|||||||
void orte_qos_ack_recv_msg_timeout_callback (struct opal_hotel_t *hotel,
|
void orte_qos_ack_recv_msg_timeout_callback (struct opal_hotel_t *hotel,
|
||||||
int room_num, void *occupant)
|
int room_num, void *occupant)
|
||||||
{
|
{
|
||||||
|
#if OPAL_ENABLE_DEBUG
|
||||||
orte_rml_recv_t *msg = (orte_rml_recv_t *) occupant;
|
orte_rml_recv_t *msg = (orte_rml_recv_t *) occupant;
|
||||||
|
#endif
|
||||||
#if 0
|
#if 0
|
||||||
orte_qos_ack_channel_t *ack_chan;
|
orte_qos_ack_channel_t *ack_chan;
|
||||||
orte_rml_channel_t *channel;
|
orte_rml_channel_t *channel;
|
||||||
@ -664,7 +670,9 @@ void orte_qos_ack_msg_send_callback ( int status,
|
|||||||
orte_rml_tag_t tag,
|
orte_rml_tag_t tag,
|
||||||
void* cbdata)
|
void* cbdata)
|
||||||
{
|
{
|
||||||
|
#if OPAL_ENABLE_DEBUG
|
||||||
orte_rml_channel_t *channel = (orte_rml_channel_t*) cbdata;
|
orte_rml_channel_t *channel = (orte_rml_channel_t*) cbdata;
|
||||||
|
#endif
|
||||||
OPAL_OUTPUT_VERBOSE ((0, orte_qos_base_framework.framework_output,
|
OPAL_OUTPUT_VERBOSE ((0, orte_qos_base_framework.framework_output,
|
||||||
" orte_qos_ack_msg_send_callback channel num =%d status =%d",
|
" orte_qos_ack_msg_send_callback channel num =%d status =%d",
|
||||||
channel->channel_num, status));
|
channel->channel_num, status));
|
||||||
|
@ -922,7 +922,16 @@ static void recv_data(int fd, short args, void *cbdata)
|
|||||||
OBJ_DESTRUCT(&ndtmp);
|
OBJ_DESTRUCT(&ndtmp);
|
||||||
if (NULL != dash_host) {
|
if (NULL != dash_host) {
|
||||||
tpn = opal_argv_join(dash_host, ',');
|
tpn = opal_argv_join(dash_host, ',');
|
||||||
orte_set_attribute(&app->attributes, ORTE_APP_DASH_HOST, ORTE_ATTR_LOCAL, (void*)tpn, OPAL_STRING);
|
for (idx=0; idx < jdata->apps->size; idx++) {
|
||||||
|
if (NULL == (app = (orte_app_context_t*)opal_pointer_array_get_item(jdata->apps, idx))) {
|
||||||
|
orte_show_help("help-ras-slurm.txt", "slurm-dyn-alloc-failed", true, jtrk->cmd);
|
||||||
|
ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_ALLOC_FAILED);
|
||||||
|
opal_argv_free(dash_host);
|
||||||
|
free(tpn);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
orte_set_attribute(&app->attributes, ORTE_APP_DASH_HOST, ORTE_ATTR_LOCAL, (void*)tpn, OPAL_STRING);
|
||||||
|
}
|
||||||
opal_argv_free(dash_host);
|
opal_argv_free(dash_host);
|
||||||
free(tpn);
|
free(tpn);
|
||||||
}
|
}
|
||||||
|
@ -93,10 +93,10 @@ void orte_rml_base_close_channel_send_callback ( int status,
|
|||||||
// this is the send call back for open channel request
|
// this is the send call back for open channel request
|
||||||
orte_rml_close_channel_t *req = (orte_rml_close_channel_t*) cbdata;
|
orte_rml_close_channel_t *req = (orte_rml_close_channel_t*) cbdata;
|
||||||
orte_process_name_t peer = req->channel->peer;
|
orte_process_name_t peer = req->channel->peer;
|
||||||
OPAL_OUTPUT_VERBOSE((1, orte_rml_base_framework.framework_output,
|
opal_output_verbose(5, orte_rml_base_framework.framework_output,
|
||||||
"%s rml_close_channel_send_callback to peer %s status = %d",
|
"%s rml_close_channel_send_callback to peer %s status = %d",
|
||||||
ORTE_NAME_PRINT(sender),
|
ORTE_NAME_PRINT(sender),
|
||||||
ORTE_NAME_PRINT(&peer), status));
|
ORTE_NAME_PRINT(&peer), status);
|
||||||
req->status = status;
|
req->status = status;
|
||||||
// if the message could not be sent log error
|
// if the message could not be sent log error
|
||||||
if (ORTE_SUCCESS != req->status)
|
if (ORTE_SUCCESS != req->status)
|
||||||
|
@ -378,6 +378,7 @@ void orte_data_server(int status, orte_process_name_t* sender,
|
|||||||
|
|
||||||
/* unpack any info elements */
|
/* unpack any info elements */
|
||||||
count = 1;
|
count = 1;
|
||||||
|
uid = UINT32_MAX;
|
||||||
while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &iptr, &count, OPAL_VALUE))) {
|
while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &iptr, &count, OPAL_VALUE))) {
|
||||||
/* if this is the userid, separate it out */
|
/* if this is the userid, separate it out */
|
||||||
if (0 == strcmp(iptr->key, OPAL_PMIX_USERID)) {
|
if (0 == strcmp(iptr->key, OPAL_PMIX_USERID)) {
|
||||||
@ -389,7 +390,7 @@ void orte_data_server(int status, orte_process_name_t* sender,
|
|||||||
/* ignore anything else for now */
|
/* ignore anything else for now */
|
||||||
OBJ_RELEASE(iptr);
|
OBJ_RELEASE(iptr);
|
||||||
}
|
}
|
||||||
if (ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
|
if (ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc || UINT32_MAX == uid) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
opal_argv_free(keys);
|
opal_argv_free(keys);
|
||||||
goto SEND_ERROR;
|
goto SEND_ERROR;
|
||||||
@ -539,6 +540,7 @@ void orte_data_server(int status, orte_process_name_t* sender,
|
|||||||
|
|
||||||
/* unpack any info elements */
|
/* unpack any info elements */
|
||||||
count = 1;
|
count = 1;
|
||||||
|
uid = UINT32_MAX;
|
||||||
while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &iptr, &count, OPAL_VALUE))) {
|
while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &iptr, &count, OPAL_VALUE))) {
|
||||||
/* if this is the userid, separate it out */
|
/* if this is the userid, separate it out */
|
||||||
if (0 == strcmp(iptr->key, OPAL_PMIX_USERID)) {
|
if (0 == strcmp(iptr->key, OPAL_PMIX_USERID)) {
|
||||||
@ -547,7 +549,7 @@ void orte_data_server(int status, orte_process_name_t* sender,
|
|||||||
/* ignore anything else for now */
|
/* ignore anything else for now */
|
||||||
OBJ_RELEASE(iptr);
|
OBJ_RELEASE(iptr);
|
||||||
}
|
}
|
||||||
if (ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc) {
|
if (ORTE_ERR_UNPACK_READ_PAST_END_OF_BUFFER != rc || UINT32_MAX == uid) {
|
||||||
ORTE_ERROR_LOG(rc);
|
ORTE_ERROR_LOG(rc);
|
||||||
opal_argv_free(keys);
|
opal_argv_free(keys);
|
||||||
goto SEND_ERROR;
|
goto SEND_ERROR;
|
||||||
|
@ -272,10 +272,6 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
|
|||||||
if (ORTE_FLAG_TEST(nd, ORTE_NODE_FLAG_SLOTS_GIVEN)) {
|
if (ORTE_FLAG_TEST(nd, ORTE_NODE_FLAG_SLOTS_GIVEN)) {
|
||||||
ORTE_FLAG_SET(node, ORTE_NODE_FLAG_SLOTS_GIVEN);
|
ORTE_FLAG_SET(node, ORTE_NODE_FLAG_SLOTS_GIVEN);
|
||||||
}
|
}
|
||||||
/* don't ignore a slots directive */
|
|
||||||
if (slots_given) {
|
|
||||||
node->slots = slots;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user