1
1

btl/openib: remove tab characters

This commit was SVN r26803.
Этот коммит содержится в:
Nathan Hjelm 2012-07-18 17:29:37 +00:00
родитель a3e02fdaff
Коммит 4a97ecbdd2
3 изменённых файлов: 20 добавлений и 20 удалений

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

@ -1,4 +1,4 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
@ -1041,8 +1041,8 @@ int mca_btl_openib_free(
to_com_frag(des)->sg_entry.addr = to_com_frag(des)->sg_entry.addr =
(uint64_t)(uintptr_t)to_send_frag(des)->hdr; (uint64_t)(uintptr_t)to_send_frag(des)->hdr;
to_send_frag(des)->coalesced_length = 0; to_send_frag(des)->coalesced_length = 0;
to_base_frag(des)->segment.base.seg_addr.pval = to_base_frag(des)->segment.base.seg_addr.pval =
to_send_frag(des)->hdr + 1; to_send_frag(des)->hdr + 1;
assert(!opal_list_get_size(&to_send_frag(des)->coalesced_frags)); assert(!opal_list_get_size(&to_send_frag(des)->coalesced_frags));
/* fall throug */ /* fall throug */
case MCA_BTL_OPENIB_FRAG_SEND_USER: case MCA_BTL_OPENIB_FRAG_SEND_USER:
@ -1155,23 +1155,23 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
} }
if (OPAL_UNLIKELY(0 == reserve)) { if (OPAL_UNLIKELY(0 == reserve)) {
frag = (mca_btl_openib_com_frag_t *) ib_frag_alloc(openib_btl, max_data, order, flags); frag = (mca_btl_openib_com_frag_t *) ib_frag_alloc(openib_btl, max_data, order, flags);
if(NULL == frag) if(NULL == frag)
return NULL; return NULL;
/* NTH: this frag will be ue used for either a get or put so we need to set the lval to be /* NTH: this frag will be ue used for either a get or put so we need to set the lval to be
consistent with the usage in get and put. the pval will be restored in mca_btl_openib_free */ consistent with the usage in get and put. the pval will be restored in mca_btl_openib_free */
ptr = to_base_frag(frag)->segment.base.seg_addr.pval; ptr = to_base_frag(frag)->segment.base.seg_addr.pval;
to_base_frag(frag)->segment.base.seg_addr.lval = to_base_frag(frag)->segment.base.seg_addr.lval =
(uint64_t)(uintptr_t) ptr; (uint64_t)(uintptr_t) ptr;
} else { } else {
frag = frag =
(mca_btl_openib_com_frag_t *) mca_btl_openib_alloc(btl, endpoint, order, (mca_btl_openib_com_frag_t *) mca_btl_openib_alloc(btl, endpoint, order,
max_data + reserve, flags); max_data + reserve, flags);
if(NULL == frag) if(NULL == frag)
return NULL; return NULL;
ptr = to_base_frag(frag)->segment.base.seg_addr.pval; ptr = to_base_frag(frag)->segment.base.seg_addr.pval;
} }
iov.iov_len = max_data; iov.iov_len = max_data;

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

@ -1,4 +1,4 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology

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

@ -1,4 +1,4 @@
/* -*- Mode: C; c-basic-offset:4 ; -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
@ -822,7 +822,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
mca_btl_base_active_message_trigger[MCA_BTL_TAG_IB].cbfunc = btl_openib_control; mca_btl_base_active_message_trigger[MCA_BTL_TAG_IB].cbfunc = btl_openib_control;
mca_btl_base_active_message_trigger[MCA_BTL_TAG_IB].cbdata = NULL; mca_btl_base_active_message_trigger[MCA_BTL_TAG_IB].cbdata = NULL;
openib_btl->super.btl_seg_size = sizeof (mca_btl_openib_segment_t); openib_btl->super.btl_seg_size = sizeof (mca_btl_openib_segment_t);
/* Check bandwidth configured for this device */ /* Check bandwidth configured for this device */
sprintf(param, "bandwidth_%s", ibv_get_device_name(device->ib_dev)); sprintf(param, "bandwidth_%s", ibv_get_device_name(device->ib_dev));