Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

Commit df9acc4

Browse files
jsquyresjsquyres
authored
Merge pull request #1343 from jsquyres/pr/v2.0.1/warnings-stomp
v2.0.2: compiler warnings stomp
2 parents 5aabc18 + c24dd38 commit df9acc4

File tree

7 files changed

+67
-40
lines changed

7 files changed

+67
-40
lines changed

‎ompi/debuggers/ompi_msgq_dll.c

+36-34
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
88
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights
99
* reserved.
10+
* Copyright (c) 2016 Intel, Inc. All rights reserved.
1011
* $COPYRIGHT$
1112
*
1213
* Additional copyrights may follow
@@ -441,42 +442,43 @@ int mqs_setup_process (mqs_process *process, const mqs_process_callbacks *pcb)
441442
{
442443
mqs_taddr_t typedefs_sizeof;
443444

444-
if(mqs_find_symbol (image, "MPIR_debug_typedefs_sizeof", &typedefs_sizeof) != mqs_ok)
445-
return err_no_store;
446-
p_info->sizes.short_size = ompi_fetch_int( process, /* sizeof (short) */
447-
typedefs_sizeof,
448-
p_info );
449-
typedefs_sizeof += p_info->sizes.int_size;
450-
p_info->sizes.int_size = ompi_fetch_int( process, /* sizeof (int) */
451-
typedefs_sizeof,
452-
p_info );
453-
typedefs_sizeof += p_info->sizes.int_size;
454-
p_info->sizes.long_size = ompi_fetch_int( process, /* sizeof (long) */
455-
typedefs_sizeof,
456-
p_info );
457-
typedefs_sizeof += p_info->sizes.int_size;
458-
p_info->sizes.long_long_size = ompi_fetch_int( process, /* sizeof (long long) */
459-
typedefs_sizeof,
460-
p_info );
461-
typedefs_sizeof += p_info->sizes.int_size;
462-
p_info->sizes.pointer_size = ompi_fetch_int( process, /* sizeof (void *) */
463-
typedefs_sizeof,
464-
p_info );
465-
typedefs_sizeof += p_info->sizes.int_size;
466-
p_info->sizes.bool_size = ompi_fetch_int( process, /* sizeof (bool) */
467-
typedefs_sizeof,
468-
p_info );
469-
typedefs_sizeof += p_info->sizes.int_size;
470-
p_info->sizes.size_t_size = ompi_fetch_int( process, /* sizeof (size_t) */
445+
if (mqs_find_symbol (image, "MPIR_debug_typedefs_sizeof", &typedefs_sizeof) != mqs_ok) {
446+
return err_no_store;
447+
}
448+
p_info->sizes.short_size = ompi_fetch_int( process, /* sizeof (short) */
449+
typedefs_sizeof,
450+
p_info );
451+
typedefs_sizeof += p_info->sizes.int_size;
452+
p_info->sizes.int_size = ompi_fetch_int( process, /* sizeof (int) */
453+
typedefs_sizeof,
454+
p_info );
455+
typedefs_sizeof += p_info->sizes.int_size;
456+
p_info->sizes.long_size = ompi_fetch_int( process, /* sizeof (long) */
457+
typedefs_sizeof,
458+
p_info );
459+
typedefs_sizeof += p_info->sizes.int_size;
460+
p_info->sizes.long_long_size = ompi_fetch_int( process, /* sizeof (long long) */
471461
typedefs_sizeof,
472462
p_info );
473-
DEBUG( VERBOSE_GENERAL,
474-
("sizes short = %d int = %d long = %d long long = %d "
475-
"void* = %d bool = %d size_t = %d\n",
476-
p_info->sizes.short_size, p_info->sizes.int_size,
477-
p_info->sizes.long_size, p_info->sizes.long_long_size,
478-
p_info->sizes.pointer_size, p_info->sizes.bool_size,
479-
p_info->sizes.size_t_size) );
463+
typedefs_sizeof += p_info->sizes.int_size;
464+
p_info->sizes.pointer_size = ompi_fetch_int( process, /* sizeof (void *) */
465+
typedefs_sizeof,
466+
p_info );
467+
typedefs_sizeof += p_info->sizes.int_size;
468+
p_info->sizes.bool_size = ompi_fetch_int( process, /* sizeof (bool) */
469+
typedefs_sizeof,
470+
p_info );
471+
typedefs_sizeof += p_info->sizes.int_size;
472+
p_info->sizes.size_t_size = ompi_fetch_int( process, /* sizeof (size_t) */
473+
typedefs_sizeof,
474+
p_info );
475+
DEBUG( VERBOSE_GENERAL,
476+
("sizes short = %d int = %d long = %d long long = %d "
477+
"void* = %d bool = %d size_t = %d\n",
478+
p_info->sizes.short_size, p_info->sizes.int_size,
479+
p_info->sizes.long_size, p_info->sizes.long_long_size,
480+
p_info->sizes.pointer_size, p_info->sizes.bool_size,
481+
p_info->sizes.size_t_size) );
480482
}
481483

482484
mqs_put_process_info (process, (mqs_process_info *)p_info);

‎ompi/mca/bml/r2/bml_r2.c

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
* and Technology (RIST). All rights reserved.
2020
* Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
2121
* reserved.
22+
* Copyright (c) 2016 Intel, Inc. All rights reserved.
2223
* $COPYRIGHT$
2324
*
2425
* Additional copyrights may follow

‎ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ int ompi_osc_pt2pt_frag_start_receive (ompi_osc_pt2pt_module_t *module)
16941694
return OMPI_ERR_OUT_OF_RESOURCE;
16951695
}
16961696

1697-
for (int i = 0 ; i < module->recv_frag_count ; ++i) {
1697+
for (unsigned int i = 0 ; i < module->recv_frag_count ; ++i) {
16981698
OBJ_CONSTRUCT(module->recv_frags + i, ompi_osc_pt2pt_receive_t);
16991699
module->recv_frags[i].module = module;
17001700
module->recv_frags[i].buffer = malloc (mca_osc_pt2pt_component.buffer_size + sizeof (ompi_osc_pt2pt_frag_header_t));

‎ompi/mca/osc/pt2pt/osc_pt2pt_module.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int ompi_osc_pt2pt_free(ompi_win_t *win)
9393
OBJ_DESTRUCT(&module->peer_lock);
9494

9595
if (NULL != module->recv_frags) {
96-
for (int i = 0 ; i < module->recv_frag_count ; ++i) {
96+
for (unsigned int i = 0 ; i < module->recv_frag_count ; ++i) {
9797
OBJ_DESTRUCT(module->recv_frags + i);
9898
}
9999

‎opal/mca/btl/tcp/btl_tcp.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* reserved.
1515
* Copyright (c) 2016 Research Organization for Information Science
1616
* and Technology (RIST). All rights reserved.
17+
* Copyright (c) 2016 Intel, Inc. All rights reserved.
1718
*
1819
* $COPYRIGHT$
1920
*
@@ -94,7 +95,7 @@ int mca_btl_tcp_add_procs( struct mca_btl_base_module_t* btl,
9495

9596
OPAL_THREAD_LOCK(&tcp_proc->proc_lock);
9697

97-
for (uint32_t j = 0 ; j < (int)tcp_proc->proc_endpoint_count ; ++j) {
98+
for (uint32_t j = 0 ; j < (uint32_t)tcp_proc->proc_endpoint_count ; ++j) {
9899
tcp_endpoint = tcp_proc->proc_endpoints[j];
99100
if (tcp_endpoint->endpoint_btl == tcp_btl) {
100101
existing_found = true;
@@ -512,7 +513,7 @@ void mca_btl_tcp_dump(struct mca_btl_base_module_t* base_btl,
512513
opal_list_item_t *item;
513514

514515
for(item = opal_list_get_first(&btl->tcp_endpoints);
515-
item != opal_list_get_end(&btl->tcp_endpoints);
516+
item != opal_list_get_end(&btl->tcp_endpoints);
516517
item = opal_list_get_next(item)) {
517518
MCA_BTL_TCP_ENDPOINT_DUMP(10, (mca_btl_base_endpoint_t*)item, false, "TCP");
518519
}

‎opal/mca/pmix/s1/pmix_s1.c

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
22
/*
3-
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved.
3+
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
44
* Copyright (c) 2014-2015 Research Organization for Information Science
55
* and Technology (RIST). All rights reserved.
66
* $COPYRIGHT$
@@ -372,6 +372,18 @@ static int s1_init(void)
372372
goto err_exit;
373373
}
374374
OBJ_DESTRUCT(&kv);
375+
/* push this into the dstore for subsequent fetches */
376+
OBJ_CONSTRUCT(&kv, opal_value_t);
377+
kv.key = strdup(OPAL_PMIX_MAX_PROCS);
378+
kv.type = OPAL_UINT32;
379+
kv.data.uint32 = i;
380+
if (OPAL_SUCCESS != (ret = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) {
381+
OPAL_ERROR_LOG(ret);
382+
OBJ_DESTRUCT(&kv);
383+
goto err_exit;
384+
}
385+
OBJ_DESTRUCT(&kv);
386+
375387

376388
/* get job size */
377389
ret = PMI_Get_size(&i);

‎opal/mca/pmix/s2/pmix_s2.c

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
66
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
77
* rights reserved.
8-
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
8+
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
99
* Copyright (c) 2014-2015 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* $COPYRIGHT$
@@ -288,6 +288,17 @@ static int s2_init(void)
288288
goto err_exit;
289289
}
290290
OBJ_DESTRUCT(&kv);
291+
/* push this into the dstore for subsequent fetches */
292+
OBJ_CONSTRUCT(&kv, opal_value_t);
293+
kv.key = strdup(OPAL_PMIX_MAX_PROCS);
294+
kv.type = OPAL_UINT32;
295+
kv.data.uint32 = i;
296+
if (OPAL_SUCCESS != (ret = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) {
297+
OPAL_ERROR_LOG(ret);
298+
OBJ_DESTRUCT(&kv);
299+
goto err_exit;
300+
}
301+
OBJ_DESTRUCT(&kv);
291302

292303
char *pmapping = (char*)malloc(PMI2_MAX_VALLEN);
293304
if( pmapping == NULL ){

0 commit comments

Comments
 (0)