Skip to content

Commit 207b267

Browse files
authored
Merge pull request #7455 from rhc54/topic/warn
Silence a bunch of warnings
2 parents 6f28a18 + a01884a commit 207b267

File tree

4 files changed

+111
-192
lines changed

4 files changed

+111
-192
lines changed

.gitignore

Lines changed: 68 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -448,188 +448,74 @@ opal/tools/wrappers/opal.pc
448448
opal/util/show_help_lex.c
449449
opal/util/keyval/keyval_lex.c
450450

451-
orte/doxygen
452-
453-
orte/include/orte/version.h
454-
orte/include/orte/frameworks.h
455-
456-
orte/mca/filem/orte_filem.7
457-
458-
orte/mca/rmaps/rank_file/rmaps_rank_file_lex.c
459-
orte/mca/rmaps/rank_file/rankfile_lex.c
460-
461-
orte/mca/snapc/orte_snapc.7
462-
463-
orte/mca/sstore/orte_sstore.7
464-
465-
orte/test/mpi/abort
466-
orte/test/mpi/accept
467-
orte/test/mpi/attach
468-
orte/test/mpi/bad_exit
469-
orte/test/mpi/bcast_loop
470-
orte/test/mpi/binding
471-
orte/test/mpi/concurrent_spawn
472-
orte/test/mpi/connect
473-
orte/test/mpi/crisscross
474-
orte/test/mpi/delayed_abort
475-
orte/test/mpi/hello_barrier
476-
orte/test/mpi/hello_nodename
477-
orte/test/mpi/hello_output
478-
orte/test/mpi/hello_show_help
479-
orte/test/mpi/hello
480-
orte/test/mpi/hello++
481-
orte/test/mpi/interlib
482-
orte/test/mpi/loop_child
483-
orte/test/mpi/loop_spawn
484-
orte/test/mpi/mpi_barrier
485-
orte/test/mpi/mpi_no_op
486-
orte/test/mpi/mpi_spin
487-
orte/test/mpi/multi_abort
488-
orte/test/mpi/parallel_r8
489-
orte/test/mpi/parallel_r64
490-
orte/test/mpi/parallel_w8
491-
orte/test/mpi/parallel_w64
492-
orte/test/mpi/pinterlib
493-
orte/test/mpi/pmix
494-
orte/test/mpi/pubsub
495-
orte/test/mpi/read_write
496-
orte/test/mpi/reduce-hang
497-
orte/test/mpi/ring
498-
orte/test/mpi/segv
499-
orte/test/mpi/simple_spawn
500-
orte/test/mpi/slave
501-
orte/test/mpi/spawn_multiple
502-
orte/test/mpi/xlib
503-
orte/test/mpi/ziaprobe
504-
orte/test/mpi/ziatest
505-
orte/test/mpi/*.dwarf
506-
orte/test/mpi/junk*
507-
orte/test/mpi/sio
508-
orte/test/mpi/sendrecv_blaster
509-
orte/test/mpi/early_abort
510-
orte/test/mpi/spawn_problem/ch_rec
511-
orte/test/mpi/spawn_problem/output
512-
orte/test/mpi/spawn_problem/start
513-
orte/test/mpi/debugger
514-
orte/test/mpi/server_port_name.txt
515-
orte/test/mpi/singleton_client_server
516-
orte/test/mpi/intercomm_create
517-
orte/test/mpi/spawn_tree
518-
orte/test/mpi/init-exit77
519-
orte/test/mpi/mpi_info
520-
orte/test/mpi/info_spawn
521-
orte/test/mpi/client
522-
orte/test/mpi/server
523-
orte/test/mpi/paccept
524-
orte/test/mpi/pconnect
525-
orte/test/mpi/thread_init
526-
orte/test/mpi/memcached-dummy
527-
orte/test/mpi/coll_test
528-
orte/test/mpi/badcoll
529-
orte/test/mpi/iof
530-
orte/test/mpi/no-disconnect
531-
orte/test/mpi/nonzero
532-
orte/test/mpi/add_host
533-
534-
orte/test/system/radix
535-
orte/test/system/sigusr_trap
536-
orte/test/system/orte_no_op
537-
orte/test/system/no_op
538-
orte/test/system/hello
539-
orte/test/system/hello_nodename
540-
orte/test/system/hello_null
541-
orte/test/system/spin
542-
orte/test/system/orte_nodename
543-
orte/test/system/orte_proc_subscribe
544-
orte/test/system/orte_spawn
545-
orte/test/system/orte_stage_gate
546-
orte/test/system/orte_loop_spawn
547-
orte/test/system/orte_loop_child
548-
orte/test/system/orte_abort
549-
orte/test/system/get_limits
550-
orte/test/system/orte_ring
551-
orte/test/system/spawn_child
552-
orte/test/system/orte_tool
553-
orte/test/system/binom
554-
orte/test/system/iof_stress
555-
orte/test/system/oob_stress
556-
orte/test/system/iof_delay
557-
orte/test/system/orte_barrier
558-
orte/test/system/orte_mcast
559-
orte/test/system/mcast
560-
orte/test/system/mcast_recv
561-
orte/test/system/opal_interface
562-
orte/test/system/orte_spin
563-
orte/test/system/segfault
564-
orte/test/system/sysinfo
565-
orte/test/system/orte_exit
566-
orte/test/system/orte_db
567-
orte/test/system/orte_state
568-
orte/test/system/orte_sensor
569-
orte/test/system/event-threads
570-
orte/test/system/test-time
571-
orte/test/system/psm_keygen
572-
orte/test/system/pspawn
573-
orte/test/system/regex
574-
orte/test/system/orte_errors
575-
orte/test/system/evthread-test
576-
orte/test/system/evpri-test
577-
orte/test/system/opal-evpri-test
578-
orte/test/system/evpri-test2
579-
orte/test/system/mapper
580-
orte/test/system/reducer
581-
orte/test/system/opal_hotel
582-
orte/test/system/orte_dfs
583-
orte/test/system/orte_allocate
584-
orte/test/system/getenv_pmi
585-
orte/test/system/pmi_abort
586-
orte/test/system/opal_hwloc
587-
orte/test/system/opal_db
588-
orte/test/system/ulfm
589-
orte/test/system/pmixtool
590-
orte/test/system/orte_notify
591-
orte/test/system/threads
592-
593-
orte/tools/orte-checkpoint/orte-checkpoint
594-
orte/tools/orte-checkpoint/orte-checkpoint.1
595-
orte/tools/orte-checkpoint/ompi-checkpoint.1
596-
orte/tools/orte-clean/orte-clean
597-
orte/tools/orte-clean/orte-clean.1
598-
orte/tools/orte-dvm/orte-dvm
599-
orte/tools/orte-dvm/orte-dvm.1
600-
ompi/mca/rte/orte/ompi-dvm.1
601-
orte/tools/orte-info/orte-info
602-
orte/tools/orte-info/orte-info.1
603-
orte/tools/orte-migrate/orte-migrate
604-
orte/tools/orte-migrate/orte-migrate.1
605-
orte/tools/orte-migrate/ompi-migrate.1
606-
orte/tools/orte-ps/orte-ps
607-
orte/tools/orte-ps/orte-ps.1
608-
orte/tools/orte-restart/orte-restart
609-
orte/tools/orte-restart/orte-restart.1
610-
orte/tools/orte-restart/ompi-restart.1
611-
orte/tools/orte-server/orte-server
612-
orte/tools/orte-server/orte-server.1
613-
orte/tools/orte-submit/orte-submit
614-
orte/tools/orte-submit/orte-submit.1
615-
ompi/mca/rte/orte/ompi-submit.1
616-
orte/tools/orte-top/orte-top
617-
orte/tools/orte-top/orte-top.1
618-
orte/tools/orted/orted
619-
orte/tools/orted/orted.1
620-
orte/tools/orterun/orterun
621-
orte/tools/orterun/orterun.1
622-
orte/tools/ompi-prun/ompi-prun
623-
orte/tools/ompi-prun/ompi-prun.1
624-
orte/tools/wrappers/ortecc-wrapper-data.txt
625-
orte/tools/wrappers/ortec++-wrapper-data.txt
626-
orte/tools/wrappers/ortecc.1
627-
orte/tools/wrappers/ortec++.1
628-
orte/tools/wrappers/orte_wrapper_script
629-
orte/tools/wrappers/orte.pc
630-
631-
orte/util/hostfile/hostfile_lex.c
632-
orte/util/hostfile/orte_hosts.7
451+
test/simple/abort
452+
test/simple/accept
453+
test/simple/attach
454+
test/simple/bad_exit
455+
test/simple/bcast_loop
456+
test/simple/binding
457+
test/simple/concurrent_spawn
458+
test/simple/connect
459+
test/simple/crisscross
460+
test/simple/delayed_abort
461+
test/simple/hello_barrier
462+
test/simple/hello_nodename
463+
test/simple/hello_output
464+
test/simple/hello_show_help
465+
test/simple/hello
466+
test/simple/hello++
467+
test/simple/interlib
468+
test/simple/loop_child
469+
test/simple/loop_spawn
470+
test/simple/mpi_barrier
471+
test/simple/mpi_no_op
472+
test/simple/mpi_spin
473+
test/simple/multi_abort
474+
test/simple/parallel_r8
475+
test/simple/parallel_r64
476+
test/simple/parallel_w8
477+
test/simple/parallel_w64
478+
test/simple/pinterlib
479+
test/simple/pmix
480+
test/simple/pubsub
481+
test/simple/read_write
482+
test/simple/reduce-hang
483+
test/simple/ring
484+
test/simple/segv
485+
test/simple/simple_spawn
486+
test/simple/slave
487+
test/simple/spawn_multiple
488+
test/simple/xlib
489+
test/simple/ziaprobe
490+
test/simple/ziatest
491+
test/simple/*.dwarf
492+
test/simple/junk*
493+
test/simple/sio
494+
test/simple/sendrecv_blaster
495+
test/simple/early_abort
496+
test/simple/spawn_problem/ch_rec
497+
test/simple/spawn_problem/output
498+
test/simple/spawn_problem/start
499+
test/simple/debugger
500+
test/simple/server_port_name.txt
501+
test/simple/singleton_client_server
502+
test/simple/intercomm_create
503+
test/simple/spawn_tree
504+
test/simple/init-exit77
505+
test/simple/mpi_info
506+
test/simple/info_spawn
507+
test/simple/client
508+
test/simple/server
509+
test/simple/paccept
510+
test/simple/pconnect
511+
test/simple/thread_init
512+
test/simple/memcached-dummy
513+
test/simple/coll_test
514+
test/simple/badcoll
515+
test/simple/iof
516+
test/simple/no-disconnect
517+
test/simple/nonzero
518+
test/simple/add_host
633519

634520
oshmem/include/shmem.h
635521
oshmem/include/shmem_portable_platform.h

ompi/mca/osc/rdma/osc_rdma_dynamic.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (c) 2014-2016 Los Alamos National Security, LLC. All rights
44
* reserved.
55
* Copyright (c) 2020 Google, LLC. All rights reserved.
6+
* Copyright (c) 2020 Intel, Inc. All rights reserved.
67
* $COPYRIGHT$
78
*
89
* Additional copyrights may follow
@@ -100,7 +101,7 @@ static ompi_osc_rdma_region_t *find_insertion_point (ompi_osc_rdma_region_t *reg
100101
return (ompi_osc_rdma_region_t *)((intptr_t) regions + min_index * region_size);
101102
}
102103

103-
if (region->base > base || (region->base == base && region->len > region_size)) {
104+
if (region->base > base || (region->base == base && (size_t)region->len > region_size)) {
104105
return find_insertion_point (regions, min_index, mid_index-1, base, region_size, region_index);
105106
}
106107

@@ -113,8 +114,8 @@ static bool ompi_osc_rdma_find_conflicting_attachment (ompi_osc_rdma_handle_t *h
113114

114115
OPAL_LIST_FOREACH(attachment, &handle->attachments, ompi_osc_rdma_attachment_t) {
115116
intptr_t region_bound = attachment->base + attachment->len;
116-
if (base >= attachment->base && base < region_bound ||
117-
bound > attachment->base && bound <= region_bound) {
117+
if ((base >= attachment->base && base < region_bound) ||
118+
(bound > attachment->base && bound <= region_bound)) {
118119
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "existing region {%p, %p} overlaps region {%p, %p}",
119120
(void *) attachment->base, (void *) region_bound, (void *) base, (void *) bound);
120121
return true;
@@ -295,8 +296,7 @@ int ompi_osc_rdma_detach (struct ompi_win_t *win, const void *base)
295296
ompi_osc_rdma_handle_t *rdma_region_handle;
296297
osc_rdma_counter_t region_count, region_id;
297298
ompi_osc_rdma_region_t *region;
298-
void *bound;
299-
int start_index = INT_MAX, region_index;
299+
int region_index;
300300

301301
if (module->flavor != MPI_WIN_FLAVOR_DYNAMIC) {
302302
return OMPI_ERR_WIN;
@@ -313,9 +313,9 @@ int ompi_osc_rdma_detach (struct ompi_win_t *win, const void *base)
313313
rdma_region_handle = module->dynamic_handles[region_index];
314314
region = (ompi_osc_rdma_region_t *) ((intptr_t) module->state->regions + region_index * module->region_size);
315315
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_INFO, "checking attachments at index %d {.base=%p, len=%lu} for attachment %p"
316-
", region handle=%p", region_index, (void *) region->base, region->len, base, rdma_region_handle);
316+
", region handle=%p", region_index, (void *) region->base, (unsigned long)region->len, base, (void*)rdma_region_handle);
317317

318-
if (region->base > (uintptr_t) base || (region->base + region->len) < (uintptr_t) base) {
318+
if ((uintptr_t)region->base > (uintptr_t) base || (uintptr_t)(region->base + region->len) < (uintptr_t) base) {
319319
continue;
320320
}
321321

opal/mca/shmem/posix/shmem_posix_common_utils.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* Copyright (c) 2010-2011 Los Alamos National Security, LLC.
1515
* All rights reserved.
1616
* Copyright (c) 2011 NVIDIA Corporation. All rights reserved.
17-
* Copyright (c) 2014 Intel, Inc. All rights reserved.
17+
* Copyright (c) 2014-2020 Intel, Inc. All rights reserved.
1818
* Copyright (c) 2019 Triad National Security, LLC. All rights
1919
* reserved.
2020
*
@@ -91,8 +91,6 @@ shmem_posix_shm_open(char *posix_file_name_buff, size_t size)
9191
* of here. we can't be selected :-(.
9292
*/
9393
else {
94-
const char *hn;
95-
hn = opal_gethostname();
9694
opal_output_verbose(10, opal_shmem_base_framework.framework_output,
9795
"shmem_posix_shm_open: disqualifying posix because "
9896
"shm_open(2) failed with error: %s (errno %d)\n",

test/simple/Makefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn \
2+
concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child \
3+
bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help \
4+
crisscross read_write ziatest slave reduce-hang ziaprobe ziatest bcast_loop \
5+
parallel_w8 parallel_w64 parallel_r8 parallel_r64 sio sendrecv_blaster early_abort \
6+
debugger singleton_client_server intercomm_create spawn_tree init-exit77 mpi_info \
7+
info_spawn server client ring binding badcoll attach xlib \
8+
no-disconnect nonzero interlib pinterlib add_host
9+
10+
all: $(PROGS)
11+
12+
# These guys need additional -I flags
13+
14+
hello_output: hello_output.c
15+
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@
16+
17+
hello_show_help: hello_show_help.c
18+
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@
19+
20+
xlib: xlib.c
21+
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ -lpmix
22+
23+
pinterlib: pinterlib.c
24+
$(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ -lpmix
25+
26+
CC = mpicc
27+
CFLAGS = -g --openmpi:linkall
28+
CFLAGS_INTERNAL = -I../../.. -I../../../orte/include -I../../../opal/include
29+
CXX = mpic++ --openmpi:linkall
30+
CXXFLAGS = -g
31+
FC = mpifort -openmpi:linkall
32+
FCFLAGS = -g
33+
34+
clean:
35+
rm -f $(PROGS) *~

0 commit comments

Comments
 (0)