1
1

Some more cleanup of extraneous spaces and tabs. Also

some changes to script to run diffs between PMLs.

This commit was SVN r23749.
Этот коммит содержится в:
Rolf vandeVaart 2010-09-13 14:58:00 +00:00
родитель 68e6745250
Коммит 31a168695e
3 изменённых файлов: 41 добавлений и 15 удалений

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

@ -27,19 +27,30 @@ DIFFDIR=diff-dir
$MKDIR $DIFFDIR
# Only diff a subset of files that are known to be different.
FILES="Makefile.am \
pml_NAME.c \
# List of files that will be diffed. Basically, everything
# in the directory.
FILES="pml_NAME.c \
pml_NAME.h \
pml_NAME_comm.c \
pml_NAME_comm.h \
pml_NAME_component.c \
pml_NAME_component.h \
pml_NAME_hdr.h \
pml_NAME_iprobe.c \
pml_NAME_irecv.c \
pml_NAME_isend.c \
pml_NAME_progress.c \
pml_NAME_rdma.c \
pml_NAME_rdma.h \
pml_NAME_rdmafrag.c \
pml_NAME_rdmafrag.h \
pml_NAME_recvfrag.c \
pml_NAME_recvfrag.h \
pml_NAME_recvreq.c \
pml_NAME_recvreq.h \
pml_NAME_sendreq.c \
pml_NAME_sendreq.h"
pml_NAME_sendreq.h \
pml_NAME_start.c"
# Copy over the files from the bfo directory.
for name in $FILES
@ -62,10 +73,25 @@ done
$RM -f $DIFF
$TOUCH $DIFF
# First, strip off the copyright header from all the files
# as we do not care about any differences in that area.
for name in $FILES
do
ob1_file=`echo $name | sed s/NAME/$ob1/`
awk '/\$HEADER/, /UPTOENDOFFILE/' $ob1_file > $ob1_file.tmp
mv $ob1_file.tmp $ob1_file
pml_file=`echo $name | sed s/NAME/$pml/`
awk '/\$HEADER/, /UPTOENDOFFILE/' $pml_file > $pml_file.tmp
mv $pml_file.tmp $pml_file
done
# Now run the diff.
for name in $FILES
do
do
diff -c `echo $name | sed s/NAME/$ob1/` `echo $name | sed s/NAME/$pml/` >> $DIFF
if [ "$?" -eq 0 ] ; then
echo "No differences in `echo $name | sed s/NAME/$ob1/` file"
fi
done
# Cleanup

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

@ -104,7 +104,7 @@ void mca_pml_bfo_recv_frag_callback_match(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata )
{
{
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_match_hdr_t* hdr = (mca_pml_bfo_match_hdr_t*)segments->seg_addr.pval;
ompi_communicator_t *comm_ptr;
@ -188,7 +188,7 @@ void mca_pml_bfo_recv_frag_callback_match(mca_btl_base_module_t* btl,
/* release matching lock before processing fragment */
OPAL_THREAD_UNLOCK(&comm->matching_lock);
if(OPAL_LIKELY(match)) {
bytes_received = segments->seg_len - OMPI_PML_BFO_MATCH_HDR_LEN;
match->req_recv.req_bytes_packed = bytes_received;
@ -257,7 +257,7 @@ void mca_pml_bfo_recv_frag_callback_rndv(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata )
{
{
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
@ -274,7 +274,7 @@ void mca_pml_bfo_recv_frag_callback_rget(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata )
{
{
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
@ -293,7 +293,7 @@ void mca_pml_bfo_recv_frag_callback_ack(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata )
{
{
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
mca_pml_bfo_send_request_t* sendreq;
@ -355,7 +355,7 @@ void mca_pml_bfo_recv_frag_callback_ack(mca_btl_base_module_t* btl,
void mca_pml_bfo_recv_frag_callback_frag(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata ) {
void* cbdata ) {
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
mca_pml_bfo_recv_request_t* recvreq;
@ -389,7 +389,7 @@ void mca_pml_bfo_recv_frag_callback_frag(mca_btl_base_module_t* btl,
void mca_pml_bfo_recv_frag_callback_put(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata ) {
void* cbdata ) {
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
mca_pml_bfo_send_request_t* sendreq;
@ -422,7 +422,7 @@ void mca_pml_bfo_recv_frag_callback_put(mca_btl_base_module_t* btl,
void mca_pml_bfo_recv_frag_callback_fin(mca_btl_base_module_t* btl,
mca_btl_base_tag_t tag,
mca_btl_base_descriptor_t* des,
void* cbdata ) {
void* cbdata ) {
mca_btl_base_segment_t* segments = des->des_dst;
mca_pml_bfo_hdr_t* hdr = (mca_pml_bfo_hdr_t*)segments->seg_addr.pval;
mca_btl_base_descriptor_t* rdma;

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

@ -66,7 +66,7 @@ void mca_pml_bfo_send_request_process_pending(struct mca_btl_base_module_t *btl)
&sendreq->req_endpoint->btl_eager, btl);
if( (NULL == send_dst) ||
(OPAL_SOS_GET_ERROR_CODE(mca_pml_bfo_send_request_start_btl(sendreq, send_dst)) ==
OMPI_ERR_OUT_OF_RESOURCE) ) {
OMPI_ERR_OUT_OF_RESOURCE) ) {
/* prepend to the pending list to minimize reordering in case
* send_dst != 0 */
add_request_to_send_pending(sendreq,
@ -1104,7 +1104,7 @@ void mca_pml_bfo_send_request_copy_in_out( mca_pml_bfo_send_request_t *sendreq,
ompi_free_list_item_t *i;
mca_bml_base_endpoint_t* bml_endpoint = sendreq->req_endpoint;
int num_btls = mca_bml_base_btl_array_get_size(&bml_endpoint->btl_send);
int rc = OMPI_SUCCESS, n;
int rc, n;
double weight_total = 0;
if( OPAL_UNLIKELY(0 == send_length) )