cleanup compiler warnings/errors
This commit was SVN r935.
Этот коммит содержится в:
родитель
19629774f0
Коммит
61f9cc7792
@ -1,5 +1,6 @@
|
|||||||
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#ifndef DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
|
#ifndef DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
|
||||||
#define DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
|
#define DATATYPE_INTERNAL_H_HAS_BEEN_INCLUDED
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
/* -*- Mode: C; c-basic-offset:4 ; -*- */
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include "datatype.h"
|
#include "datatype.h"
|
||||||
|
|
||||||
int lam_ddt_duplicate( dt_desc_t* oldType, dt_desc_t** newType )
|
int lam_ddt_duplicate( dt_desc_t* oldType, dt_desc_t** newType )
|
||||||
|
@ -3,6 +3,13 @@
|
|||||||
#include "datatype.h"
|
#include "datatype.h"
|
||||||
#include "datatype_internal.h"
|
#include "datatype_internal.h"
|
||||||
|
|
||||||
|
|
||||||
|
static int convertor_unpack_homogeneous( convertor_t* pConv, struct iovec* iov, unsigned int out_size );
|
||||||
|
static int convertor_unpack_general( convertor_t* pConvertor,
|
||||||
|
struct iovec* pInputv,
|
||||||
|
unsigned int inputCount );
|
||||||
|
|
||||||
|
|
||||||
void dump_stack( dt_stack_t* pStack, int stack_pos, dt_elem_desc_t* pDesc, char* name )
|
void dump_stack( dt_stack_t* pStack, int stack_pos, dt_elem_desc_t* pDesc, char* name )
|
||||||
{
|
{
|
||||||
printf( "\nStack %p stack_pos %d name %s\n", pStack, stack_pos, name );
|
printf( "\nStack %p stack_pos %d name %s\n", pStack, stack_pos, name );
|
||||||
@ -154,7 +161,7 @@ static int convertor_unpack_general( convertor_t* pConvertor,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int convertor_unpack_homogeneous( convertor_t* pConv, struct iovec* iov, unsigned int out_size )
|
static int convertor_unpack_homogeneous( convertor_t* pConv, struct iovec* iov, unsigned int out_size )
|
||||||
{
|
{
|
||||||
dt_stack_t* pStack; /* pointer to the position on the stack */
|
dt_stack_t* pStack; /* pointer to the position on the stack */
|
||||||
int pos_desc; /* actual position in the description of the derived datatype */
|
int pos_desc; /* actual position in the description of the derived datatype */
|
||||||
@ -297,7 +304,7 @@ int lam_convertor_unpack( convertor_t* pConvertor,
|
|||||||
if( (pInput >= pOutput) && (pInput < (pOutput + pConvertor->count * (pData->ub - pData->lb))) ) {
|
if( (pInput >= pOutput) && (pInput < (pOutput + pConvertor->count * (pData->ub - pData->lb))) ) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return convertor_progress( pConvertor, pInputv, inputCount );
|
return lam_convertor_progress( pConvertor, pInputv, inputCount );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return value:
|
/* Return value:
|
||||||
@ -409,7 +416,7 @@ conversion_fct_t copy_functions[DT_MAX_PREDEFINED] = {
|
|||||||
/* Should we supply buffers to the convertor or can we use directly
|
/* Should we supply buffers to the convertor or can we use directly
|
||||||
* the user buffer ?
|
* the user buffer ?
|
||||||
*/
|
*/
|
||||||
int convertor_need_buffers( convertor_t* pConvertor )
|
int lam_convertor_need_buffers( convertor_t* pConvertor )
|
||||||
{
|
{
|
||||||
if( pConvertor->flags & DT_FLAG_CONTIGUOUS ) return 0;
|
if( pConvertor->flags & DT_FLAG_CONTIGUOUS ) return 0;
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -152,14 +152,14 @@ typedef int (*mca_pml_base_test_fn_t)(
|
|||||||
);
|
);
|
||||||
|
|
||||||
typedef int (*mca_pml_base_wait_fn_t)(
|
typedef int (*mca_pml_base_wait_fn_t)(
|
||||||
int count,
|
size_t count,
|
||||||
lam_request_t** request,
|
lam_request_t** request,
|
||||||
int *index,
|
int *index,
|
||||||
lam_status_public_t* status
|
lam_status_public_t* status
|
||||||
);
|
);
|
||||||
|
|
||||||
typedef int (*mca_pml_base_wait_all_fn_t)(
|
typedef int (*mca_pml_base_wait_all_fn_t)(
|
||||||
int count, /* count of request/status arrays */
|
size_t count, /* count of request/status arrays */
|
||||||
lam_request_t** request, /* array of requests */
|
lam_request_t** request, /* array of requests */
|
||||||
lam_status_public_t *status /* array of statuses */
|
lam_status_public_t *status /* array of statuses */
|
||||||
);
|
);
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
#include "mca/pml/pml.h"
|
#include "mca/pml/pml.h"
|
||||||
#include "mca/ptl/ptl.h"
|
#include "mca/ptl/ptl.h"
|
||||||
#include "mca/ptl/base/base.h"
|
#include "mca/ptl/base/base.h"
|
||||||
@ -33,6 +34,8 @@ mca_pml_teg_t mca_pml_teg = {
|
|||||||
mca_pml_teg_start,
|
mca_pml_teg_start,
|
||||||
mca_pml_teg_test,
|
mca_pml_teg_test,
|
||||||
mca_pml_teg_wait,
|
mca_pml_teg_wait,
|
||||||
|
mca_pml_teg_wait_all,
|
||||||
|
mca_pml_teg_free,
|
||||||
mca_pml_teg_null
|
mca_pml_teg_null
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -181,14 +181,14 @@ extern int mca_pml_teg_test(
|
|||||||
);
|
);
|
||||||
|
|
||||||
extern int mca_pml_teg_wait(
|
extern int mca_pml_teg_wait(
|
||||||
int count,
|
size_t count,
|
||||||
lam_request_t** request,
|
lam_request_t** request,
|
||||||
int *index,
|
int *index,
|
||||||
lam_status_public_t* status
|
lam_status_public_t* status
|
||||||
);
|
);
|
||||||
|
|
||||||
extern int mca_pml_teg_waitall(
|
extern int mca_pml_teg_wait_all(
|
||||||
int count,
|
size_t count,
|
||||||
lam_request_t** request,
|
lam_request_t** request,
|
||||||
lam_status_public_t* status
|
lam_status_public_t* status
|
||||||
);
|
);
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
|
|
||||||
int mca_pml_teg_wait(
|
int mca_pml_teg_wait(
|
||||||
int count,
|
size_t count,
|
||||||
lam_request_t** request,
|
lam_request_t** request,
|
||||||
int *index,
|
int *index,
|
||||||
lam_status_public_t* status)
|
lam_status_public_t* status)
|
||||||
@ -60,7 +60,7 @@ int mca_pml_teg_wait(
|
|||||||
|
|
||||||
|
|
||||||
int mca_pml_teg_wait_all(
|
int mca_pml_teg_wait_all(
|
||||||
int count,
|
size_t count,
|
||||||
lam_request_t** requests,
|
lam_request_t** requests,
|
||||||
lam_status_public_t* statuses)
|
lam_status_public_t* statuses)
|
||||||
{
|
{
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
* $HEADER$
|
* $HEADER$
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include "ptl_base_comm.h"
|
#include "ptl_base_comm.h"
|
||||||
|
|
||||||
static void mca_pml_ptl_comm_construct(mca_pml_ptl_comm_t* comm);
|
static void mca_pml_ptl_comm_construct(mca_pml_ptl_comm_t* comm);
|
||||||
|
@ -103,7 +103,6 @@ int mca_ptl_tcp_peer_send(mca_ptl_base_peer_t* ptl_peer, mca_ptl_tcp_send_frag_t
|
|||||||
if (NULL != ptl_peer->peer_send_frag)
|
if (NULL != ptl_peer->peer_send_frag)
|
||||||
lam_list_append(&ptl_peer->peer_frags, (lam_list_item_t*)frag);
|
lam_list_append(&ptl_peer->peer_frags, (lam_list_item_t*)frag);
|
||||||
else {
|
else {
|
||||||
mca_ptl_base_send_request_t* send_request = frag->super.frag_request;
|
|
||||||
if(mca_ptl_tcp_send_frag_handler(frag, ptl_peer->peer_sd)) {
|
if(mca_ptl_tcp_send_frag_handler(frag, ptl_peer->peer_sd)) {
|
||||||
mca_ptl_tcp_send_frag_progress(frag);
|
mca_ptl_tcp_send_frag_progress(frag);
|
||||||
} else {
|
} else {
|
||||||
@ -481,7 +480,6 @@ static void mca_ptl_tcp_peer_send_handler(int sd, short flags, void* user)
|
|||||||
case MCA_PTL_TCP_CONNECTED:
|
case MCA_PTL_TCP_CONNECTED:
|
||||||
{
|
{
|
||||||
/* complete the current send */
|
/* complete the current send */
|
||||||
mca_ptl_t *ptl = (mca_ptl_t*)ptl_peer->peer_ptl;
|
|
||||||
do {
|
do {
|
||||||
mca_ptl_tcp_send_frag_t* frag = ptl_peer->peer_send_frag;
|
mca_ptl_tcp_send_frag_t* frag = ptl_peer->peer_send_frag;
|
||||||
if(mca_ptl_tcp_send_frag_handler(frag, ptl_peer->peer_sd) == false)
|
if(mca_ptl_tcp_send_frag_handler(frag, ptl_peer->peer_sd) == false)
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#ifndef MCA_PTL_TCP_RECV_FRAG_H
|
#ifndef MCA_PTL_TCP_RECV_FRAG_H
|
||||||
#define MCA_PTL_TCP_RECV_FRAG_H
|
#define MCA_PTL_TCP_RECV_FRAG_H
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user