usnic: "bookeeping" --> "bookkeeping"
Should be included in usnic v1.7.3 roll-up CMR (refs trac:3760) This commit was SVN r29135. The following Trac tickets were found above: Ticket 3760 --> https://svn.open-mpi.org/trac/ompi/ticket/3760
Этот коммит содержится в:
родитель
0df6ed4acc
Коммит
122890c2fd
@ -988,7 +988,7 @@ static int usnic_component_progress_2(void)
|
||||
channel = &module->mod_channels[c];
|
||||
|
||||
if (channel->chan_deferred_recv != NULL) {
|
||||
ompi_btl_usnic_recv_frag_bookeeping(module,
|
||||
ompi_btl_usnic_recv_frag_bookkeeping(module,
|
||||
channel->chan_deferred_recv, channel);
|
||||
channel->chan_deferred_recv = NULL;
|
||||
}
|
||||
|
@ -66,7 +66,7 @@ typedef struct ompi_btl_usnic_channel_t {
|
||||
/* fastsend enabled if sd_wqe >= fastsend_wqe_thresh */
|
||||
int fastsend_wqe_thresh;
|
||||
|
||||
/* pointer to receive segment whose bookeeping has been deferred */
|
||||
/* pointer to receive segment whose bookkeeping has been deferred */
|
||||
struct ompi_btl_usnic_recv_segment_t *chan_deferred_recv;
|
||||
|
||||
/** queue pair */
|
||||
|
@ -103,8 +103,8 @@ void ompi_btl_usnic_recv_call(ompi_btl_usnic_module_t *module,
|
||||
/* Segment is an incoming frag */
|
||||
if (OMPI_BTL_USNIC_PAYLOAD_TYPE_FRAG == bseg->us_btl_header->payload_type) {
|
||||
|
||||
/* do the receive bookeeping */
|
||||
ompi_btl_usnic_recv_frag_bookeeping(module, seg, channel);
|
||||
/* do the receive bookkeeping */
|
||||
ompi_btl_usnic_recv_frag_bookkeeping(module, seg, channel);
|
||||
|
||||
#if MSGDEBUG1
|
||||
opal_output(0, "<-- Received FRAG ep %p, seq %" UDSEQ ", len=%d\n",
|
||||
@ -156,7 +156,7 @@ void ompi_btl_usnic_recv_call(ompi_btl_usnic_module_t *module,
|
||||
seg->rs_base.us_btl_header->payload_len);
|
||||
}
|
||||
|
||||
/* do not jump to repost, alresdy done by bookeeping */
|
||||
/* do not jump to repost, already done by bookkeeping */
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -300,7 +300,7 @@ drop:
|
||||
/*
|
||||
*/
|
||||
static inline void
|
||||
ompi_btl_usnic_recv_frag_bookeeping(
|
||||
ompi_btl_usnic_recv_frag_bookkeeping(
|
||||
ompi_btl_usnic_module_t* module,
|
||||
ompi_btl_usnic_recv_segment_t *seg,
|
||||
ompi_btl_usnic_channel_t *channel)
|
||||
@ -362,8 +362,8 @@ ompi_btl_usnic_recv(ompi_btl_usnic_module_t *module,
|
||||
bseg->us_btl_header->payload_type) &&
|
||||
seg->rs_base.us_btl_header->put_addr == NULL) {
|
||||
|
||||
/* do the receive bookeeping */
|
||||
ompi_btl_usnic_recv_frag_bookeeping(module, seg, channel);
|
||||
/* do the receive bookkeeping */
|
||||
ompi_btl_usnic_recv_frag_bookkeeping(module, seg, channel);
|
||||
|
||||
/* Pass this segment up to the PML.
|
||||
* Be sure to get the payload length from the BTL header because
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user