1
1

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.
Этот коммит содержится в:
Aurelien Bouteiller 2007-07-25 22:28:04 +00:00
родитель 58ee6b4e35
Коммит e07b95bdd5
48 изменённых файлов: 276 добавлений и 66 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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 <ompi/mca/pml/v/autogen.vprotocols
done <$srcdir/ompi/mca/pml/v/autogen.vprotocols
AC_SUBST(MCA_pml_v_PROTOCOLS, [$protocol_subdirs])
])

Просмотреть файл

@ -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
@ -19,7 +15,7 @@ PARAM_INIT_FILE=pml_v.c
PARAM_CONFIG_HEADER_FILE="v_config.h"
PARAM_CONFIG_FILES="Makefile"
>autogen.vprotocols
>autogen.vprotocols
for protocol in protocol_*; do
( cd $pd_ompi_topdir

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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 <stdio.h>
#include <stdlib.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_

Просмотреть файл

@ -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"

Просмотреть файл

@ -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_

Просмотреть файл

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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);
}

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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;
}

Просмотреть файл

@ -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);
}

Просмотреть файл

@ -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);
}

Просмотреть файл

@ -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__

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__

Просмотреть файл

@ -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"

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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"

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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"

Просмотреть файл

@ -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_

Просмотреть файл

@ -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$
*

Просмотреть файл

@ -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 <sys/types.h>
#include <sys/mman.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"

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__

Просмотреть файл

@ -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"

Просмотреть файл

@ -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__