From e07b95bdd5729d0d5a49e355b3ab14381206b397 Mon Sep 17 00:00:00 2001 From: Aurelien Bouteiller Date: Wed, 25 Jul 2007 22:28:04 +0000 Subject: [PATCH] Fixed: warnings with printf(%d, size_t) Fixed: All copyrights are now correct up to 2007 Fixed: Build system now works with VPATHs Changed: protocol_example is now ignored by default This commit was SVN r15627. --- ompi/mca/pml/v/Makefile.am | 6 +----- ompi/mca/pml/v/configure.m4 | 12 +++++++++++- ompi/mca/pml/v/configure.params | 8 ++------ ompi/mca/pml/v/pml_v.c | 2 +- ompi/mca/pml/v/pml_v.h | 2 +- ompi/mca/pml/v/pml_v_component.c | 3 ++- ompi/mca/pml/v/pml_v_protocol.h | 10 ++++++++++ ompi/mca/pml/v/pml_v_protocol_base.c | 10 ++++++++++ ompi/mca/pml/v/pml_v_protocol_base.h | 10 ++++++++++ ompi/mca/pml/v/protocol_example/.ompi_ignore | 0 ompi/mca/pml/v/protocol_example/Makefile.am | 6 +----- .../mca/pml/v/protocol_example/configure.params | 6 +----- .../pml/v/protocol_example/vprotocol_example.c | 2 +- .../pml/v/protocol_example/vprotocol_example.h | 2 +- .../v/protocol_example/vprotocol_example_comm.c | 2 +- .../vprotocol_example_component.c | 2 +- .../protocol_example/vprotocol_example_probe.c | 2 +- .../v/protocol_example/vprotocol_example_proc.c | 6 +++--- .../vprotocol_example_progress.c | 2 +- .../v/protocol_example/vprotocol_example_recv.c | 13 ++++++------- .../v/protocol_example/vprotocol_example_send.c | 8 ++++---- .../protocol_example/vprotocol_example_start.c | 17 +++++++++++------ .../protocol_example/vprotocol_example_start.h | 10 ++++++++++ .../v/protocol_example/vprotocol_example_wait.c | 10 ++++++++++ .../v/protocol_example/vprotocol_example_wait.h | 10 ++++++++++ ompi/mca/pml/v/protocol_pessimist/Makefile.am | 6 +----- .../pml/v/protocol_pessimist/configure.params | 6 +----- .../v/protocol_pessimist/vprotocol_pessimist.c | 9 +++++++++ .../v/protocol_pessimist/vprotocol_pessimist.h | 10 ++++++++++ .../vprotocol_pessimist_comm.c | 10 ++++++++++ .../vprotocol_pessimist_component.c | 2 +- .../vprotocol_pessimist_event.c | 10 ++++++++++ .../vprotocol_pessimist_event.h | 10 ++++++++++ .../vprotocol_pessimist_eventlog.c | 10 ++++++++++ .../vprotocol_pessimist_eventlog.h | 10 ++++++++++ .../vprotocol_pessimist_probe.c | 2 +- .../vprotocol_pessimist_proc.c | 2 +- .../vprotocol_pessimist_progress.c | 10 ++++++++++ .../vprotocol_pessimist_recv.c | 2 +- .../vprotocol_pessimist_request.c | 10 ++++++++++ .../vprotocol_pessimist_request.h | 10 ++++++++++ .../vprotocol_pessimist_send.c | 2 +- .../vprotocol_pessimist_sender_based.c | 10 ++++++++++ .../vprotocol_pessimist_sender_based.h | 10 ++++++++++ .../vprotocol_pessimist_start.c | 10 ++++++++++ .../vprotocol_pessimist_start.h | 10 ++++++++++ .../vprotocol_pessimist_wait.c | 10 ++++++++++ .../vprotocol_pessimist_wait.h | 10 ++++++++++ 48 files changed, 276 insertions(+), 66 deletions(-) create mode 100644 ompi/mca/pml/v/protocol_example/.ompi_ignore diff --git a/ompi/mca/pml/v/Makefile.am b/ompi/mca/pml/v/Makefile.am index 4d65166695..a51643268b 100644 --- a/ompi/mca/pml/v/Makefile.am +++ b/ompi/mca/pml/v/Makefile.am @@ -1,10 +1,6 @@ # -# Copyright (c) 2004-2005 The Trustees of Indiana University. +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. # All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# All rights reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/ompi/mca/pml/v/configure.m4 b/ompi/mca/pml/v/configure.m4 index 1fa7513a98..d74bb8cdd1 100644 --- a/ompi/mca/pml/v/configure.m4 +++ b/ompi/mca/pml/v/configure.m4 @@ -1,9 +1,19 @@ +# +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + AC_DEFUN([MCA_pml_v_CONFIG],[ protocol_subdirs="" while read protocol; do echo "Adding $protocol to pml_v subdirs" protocol_subdirs="$protocol $protocol_subdirs" - done autogen.vprotocols +>autogen.vprotocols for protocol in protocol_*; do ( cd $pd_ompi_topdir diff --git a/ompi/mca/pml/v/pml_v.c b/ompi/mca/pml/v/pml_v.c index d9e6f8bb0b..0c3b6bbe95 100644 --- a/ompi/mca/pml/v/pml_v.c +++ b/ompi/mca/pml/v/pml_v.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/pml_v.h b/ompi/mca/pml/v/pml_v.h index 55038d3d18..550c68e8ad 100644 --- a/ompi/mca/pml/v/pml_v.h +++ b/ompi/mca/pml/v/pml_v.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/pml_v_component.c b/ompi/mca/pml/v/pml_v_component.c index 3218a26df1..9b79def08f 100644 --- a/ompi/mca/pml/v/pml_v_component.c +++ b/ompi/mca/pml/v/pml_v_component.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * @@ -7,6 +7,7 @@ * * $HEADER$ */ + #include "ompi_config.h" #include #include diff --git a/ompi/mca/pml/v/pml_v_protocol.h b/ompi/mca/pml/v/pml_v_protocol.h index 6cba12f310..e15167b165 100644 --- a/ompi/mca/pml/v/pml_v_protocol.h +++ b/ompi/mca/pml/v/pml_v_protocol.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __INCLUDE_V_PROTOCOL_H_ #define __INCLUDE_V_PROTOCOL_H_ diff --git a/ompi/mca/pml/v/pml_v_protocol_base.c b/ompi/mca/pml/v/pml_v_protocol_base.c index 8f5e020bde..8185a95fc3 100644 --- a/ompi/mca/pml/v/pml_v_protocol_base.c +++ b/ompi/mca/pml/v/pml_v_protocol_base.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "opal/event/event.h" diff --git a/ompi/mca/pml/v/pml_v_protocol_base.h b/ompi/mca/pml/v/pml_v_protocol_base.h index d67836dd10..c8b14c5224 100644 --- a/ompi/mca/pml/v/pml_v_protocol_base.h +++ b/ompi/mca/pml/v/pml_v_protocol_base.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __INCLUDE_V_PROTOCOL_BASE_H_ #define __INCLUDE_V_PROTOCOL_BASE_H_ diff --git a/ompi/mca/pml/v/protocol_example/.ompi_ignore b/ompi/mca/pml/v/protocol_example/.ompi_ignore new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ompi/mca/pml/v/protocol_example/Makefile.am b/ompi/mca/pml/v/protocol_example/Makefile.am index 65bce37b91..b494cfc996 100644 --- a/ompi/mca/pml/v/protocol_example/Makefile.am +++ b/ompi/mca/pml/v/protocol_example/Makefile.am @@ -1,10 +1,6 @@ # -# Copyright (c) 2004-2005 The Trustees of Indiana University. +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. # All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# All rights reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/ompi/mca/pml/v/protocol_example/configure.params b/ompi/mca/pml/v/protocol_example/configure.params index 392b0568e6..5309ce72a0 100644 --- a/ompi/mca/pml/v/protocol_example/configure.params +++ b/ompi/mca/pml/v/protocol_example/configure.params @@ -1,11 +1,7 @@ # -*- shell-script -*- # -# Copyright (c) 2004-2005 The Trustees of Indiana University. +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. # All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# All rights reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example.c b/ompi/mca/pml/v/protocol_example/vprotocol_example.c index d2d61906d0..f672ef1e95 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example.h b/ompi/mca/pml/v/protocol_example/vprotocol_example.h index 4ac994c862..7b44a7212e 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example.h +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_comm.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_comm.c index 93dc81f2bd..647728913d 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_comm.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_comm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_component.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_component.c index 9a82e2d536..7a3ffd14f1 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_component.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_component.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_probe.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_probe.c index 26d726fa29..69ede2cfd5 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_probe.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_probe.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_proc.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_proc.c index 62e0148741..9ca77db948 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_proc.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_proc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * @@ -14,12 +14,12 @@ int mca_vprotocol_example_add_procs(struct ompi_proc_t **procs, size_t nprocs) { - V_OUTPUT_VERBOSE(30, "adding %d procs", nprocs); + V_OUTPUT_VERBOSE(30, "adding %ld procs", (long) nprocs); return mca_pml_v.host_pml.pml_add_procs(procs, nprocs); } int mca_vprotocol_example_del_procs(struct ompi_proc_t **procs, size_t nprocs) { - V_OUTPUT_VERBOSE(30, "removing %d procs", nprocs); + V_OUTPUT_VERBOSE(30, "removing %ld procs", (long) nprocs); return mca_pml_v.host_pml.pml_del_procs(procs, nprocs); } diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_progress.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_progress.c index 69e3dfaa28..1081bd961a 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_progress.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_progress.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_recv.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_recv.c index 070e721c5b..30ae9dc742 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_recv.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * @@ -23,7 +23,7 @@ int mca_vprotocol_example_irecv_init(void *addr, int ret; ret = mca_pml_v.host_pml.pml_irecv_init(addr, count, datatype, src, tag, comm, request); - V_OUTPUT_VERBOSE(50, "posted\tirecv_init %ld\tcomm %d\tfrom %d\ttag %d\tsize %d", ((mca_pml_base_request_t *)*request)->req_sequence, comm->c_contextid, src, tag, count); + V_OUTPUT_VERBOSE(50, "posted\tirecv_init %ld\tcomm %d\tfrom %d\ttag %d\tsize %ld", ((mca_pml_base_request_t *)*request)->req_sequence, comm->c_contextid, src, tag, (long) count); return ret; } @@ -36,10 +36,9 @@ int mca_vprotocol_example_irecv(void *addr, struct ompi_request_t **request) { int ret; - ompi_status_public_t *status; ret = mca_pml_v.host_pml.pml_irecv(addr, count, datatype, src, tag, comm, request); - V_OUTPUT_VERBOSE(50, "posted\tirecv %ld\tcomm %d\tfrom %d\ttag %d\tsize %d", ((mca_pml_base_request_t *)*request)->req_sequence, comm->c_contextid, src, tag, count); + V_OUTPUT_VERBOSE(50, "posted\tirecv %ld\tcomm %d\tfrom %d\ttag %d\tsize %ld", ((mca_pml_base_request_t *)*request)->req_sequence, comm->c_contextid, src, tag, (long) count); return ret; } @@ -52,13 +51,13 @@ int mca_vprotocol_example_recv(void *addr, ompi_status_public_t * status ) { int ret; - V_OUTPUT_VERBOSE(50, "posted\trecv \tcomm %d\tfrom %d\ttag %d\tsize %d", comm->c_contextid, src, tag, count); + V_OUTPUT_VERBOSE(50, "posted\trecv \tcomm %d\tfrom %d\ttag %d\tsize %ld", comm->c_contextid, src, tag, (long) count); ret = mca_pml_v.host_pml.pml_recv(addr, count, datatype, src, tag, comm, status); # ifdef OMPI_ENABLE_DEBUG if(status) - V_OUTPUT_VERBOSE(75, "deliver\trecv \tcomm %d\tfrom %d(%d)\ttag %d(%d)\tsize %d(%d)\tstatus %d", comm->c_contextid, src, status->MPI_SOURCE, tag, status->MPI_TAG, count, status->_count, status->MPI_ERROR); + V_OUTPUT_VERBOSE(75, "deliver\trecv \tcomm %d\tfrom %d(%d)\ttag %d(%d)\tsize %ld(%ld)\tstatus %d", comm->c_contextid, src, status->MPI_SOURCE, tag, status->MPI_TAG, (long) count, (long) status->_count, status->MPI_ERROR); else - V_OUTPUT_VERBOSE(75, "deliver\trecv \tcomm %d\tfrom %d\ttag %d\tsize %d", comm->c_contextid, src, tag, count); + V_OUTPUT_VERBOSE(75, "deliver\trecv \tcomm %d\tfrom %d\ttag %d\tsize %ld", comm->c_contextid, src, tag, (long) count); # endif return ret; } diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_send.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_send.c index 7cc38a7e7d..22c769ddc7 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_send.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_send.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * @@ -21,7 +21,7 @@ int mca_vprotocol_example_isend_init(void *addr, struct ompi_communicator_t* comm, struct ompi_request_t **request ) { - V_OUTPUT_VERBOSE(50, "request\tpisend \tcomm %d\tto %d\ttag %d\tsize %d", comm->c_contextid, dst, tag, count); + V_OUTPUT_VERBOSE(50, "request\tpisend \tcomm %d\tto %d\ttag %d\tsize %ld", comm->c_contextid, dst, tag, (long) count); return mca_pml_v.host_pml.pml_isend_init(addr, count, datatype, dst, tag, sendmode, comm, request); } @@ -34,7 +34,7 @@ int mca_vprotocol_example_isend(void *addr, struct ompi_communicator_t *comm, struct ompi_request_t **request) { - V_OUTPUT_VERBOSE(50, "request\tisend \tcomm %d\tto %d\ttag %d\tsize %d", comm->c_contextid, dst, tag, count); + V_OUTPUT_VERBOSE(50, "request\tisend \tcomm %d\tto %d\ttag %d\tsize %ld", comm->c_contextid, dst, tag, (long) count); return mca_pml_v.host_pml.pml_isend(addr, count, datatype, dst, tag, sendmode, comm, request); } @@ -46,6 +46,6 @@ int mca_vprotocol_example_send(void *addr, mca_pml_base_send_mode_t sendmode, struct ompi_communicator_t *comm) { - V_OUTPUT_VERBOSE(50, "request\tsend \tcomm %d\tto %d\ttag %d\tsize %d", comm->c_contextid, dst, tag, count); + V_OUTPUT_VERBOSE(50, "request\tsend \tcomm %d\tto %d\ttag %d\tsize %ld", comm->c_contextid, dst, tag, (long) count); return mca_pml_v.host_pml.pml_send(addr, count, datatype, dst, tag, sendmode, comm); } diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_start.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_start.c index c2b9b80e36..77c5c14229 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_start.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_start.c @@ -1,14 +1,19 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_example.h" #include "vprotocol_example_start.h" OMPI_DECLSPEC int mca_vprotocol_example_start(size_t count, ompi_request_t **requests) { - V_OUTPUT_VERBOSE(50, "starting %d requests", count); -# ifdef OMPI_ENABLE_DEBUG - - - -#endif + V_OUTPUT_VERBOSE(50, "starting %ld requests", (long) count); return mca_pml_v.host_pml.pml_start(count, requests); } diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_start.h b/ompi/mca/pml/v/protocol_example/vprotocol_example_start.h index d89f5f77de..91d56ee16d 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_start.h +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_start.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __VPROTOCOL_EXAMPLE_START_H__ #define __VPROTOCOL_EXAMPLE_START_H__ diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.c b/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.c index 924fe465a8..a74ce7dfea 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.c +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_example.h" #include "vprotocol_example_wait.h" diff --git a/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.h b/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.h index 33a55c6aa2..1c20047eaf 100644 --- a/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.h +++ b/ompi/mca/pml/v/protocol_example/vprotocol_example_wait.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __VPROTOCOL_EXAMPLE_WAIT_H__ #define __VPROTOCOL_EXAMPLE_WAIT_H__ diff --git a/ompi/mca/pml/v/protocol_pessimist/Makefile.am b/ompi/mca/pml/v/protocol_pessimist/Makefile.am index 233b58a159..39b9119f93 100644 --- a/ompi/mca/pml/v/protocol_pessimist/Makefile.am +++ b/ompi/mca/pml/v/protocol_pessimist/Makefile.am @@ -1,10 +1,6 @@ # -# Copyright (c) 2004-2005 The Trustees of Indiana University. +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. # All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# All rights reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/ompi/mca/pml/v/protocol_pessimist/configure.params b/ompi/mca/pml/v/protocol_pessimist/configure.params index ea704b5a80..651c829bac 100644 --- a/ompi/mca/pml/v/protocol_pessimist/configure.params +++ b/ompi/mca/pml/v/protocol_pessimist/configure.params @@ -1,11 +1,7 @@ # -*- shell-script -*- # -# Copyright (c) 2004-2005 The Trustees of Indiana University. +# Copyright (c) 2004-2007 The Trustees of the University of Tennessee. # All rights reserved. -# Copyright (c) 2004-2005 The Trustees of the University of Tennessee. -# All rights reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, -# University of Stuttgart. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.c index 98c49981cd..48fd3c7595 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.c @@ -1,3 +1,12 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ #include "ompi_config.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.h index 7d559af4c5..322ce1d3b2 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __INCLUDE_VPROTOCOL_PESSIMIST_H__ #define __INCLUDE_VPROTOCOL_PESSIMIST_H__ diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_comm.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_comm.c index dd00b93735..e09601b8ed 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_comm.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_comm.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "../pml_v.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_component.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_component.c index 6d8a9af3dd..41e796d241 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_component.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.c index c013268577..37a3ec9783 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist_event.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.h index b4c3d02175..16c6141c36 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_event.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __INCLUDE_VPROTOCOL_PESSIMIST_EVENT_H__ #define __INCLUDE_VPROTOCOL_PESSIMIST_EVENT_H__ diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.c index 7bbe48b008..df03a4f672 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.h index 0b8e885143..af251d5f5e 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_eventlog.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __VPROTOCOL_PESSIMIST_EVENTLOG_H__ #define __VPROTOCOL_PESSIMIST_EVENTLOG_H__ diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_probe.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_probe.c index 393c543bfd..b594dea76a 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_probe.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_probe.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_proc.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_proc.c index bc44814988..1c17a36975 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_proc.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_proc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_progress.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_progress.c index 56e7f1caf9..9dfb05df24 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_progress.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_progress.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "../pml_v.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_recv.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_recv.c index 4582879a2a..3848605825 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_recv.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_recv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.c index 286c7005ea..6061dbbd20 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist_request.h" #include "vprotocol_pessimist_eventlog.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.h index 3135661f59..7b5037e8c2 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_request.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __INCLUDE_VPROTOCOL_PESSIMIST_REQUEST_H_ #define __INCLUDE_VPROTOCOL_PESSIMIST_REQUEST_H_ diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_send.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_send.c index b74ff6976b..e20f390d3d 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_send.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_send.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. * $COPYRIGHT$ * diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.c index e3f984c885..72004917cd 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "vprotocol_pessimist_sender_based.h" #include #include diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.h index 70ca601b3a..a9d94640b9 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_sender_based.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.c index 0334e44ad3..748aa8334d 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.h index 7afe9ada2e..723f5a3570 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_start.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __VPROTOCOL_PESSIMIST_START_H__ #define __VPROTOCOL_PESSIMIST_START_H__ diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.c b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.c index 6f1cf56397..bc8a2c626a 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.c +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.c @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #include "ompi_config.h" #include "vprotocol_pessimist.h" #include "vprotocol_pessimist_wait.h" diff --git a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.h b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.h index 6ac5d00a5f..e2a37691b9 100644 --- a/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.h +++ b/ompi/mca/pml/v/protocol_pessimist/vprotocol_pessimist_wait.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + #ifndef __VPROTOCOL_PESSIMIST_WAIT_H__ #define __VPROTOCOL_PESSIMIST_WAIT_H__