Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mpid/ch4/netmod/ofi/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ mpi_core_sources += src/mpid/ch4/netmod/ofi/func_table.c \
src/mpid/ch4/netmod/ofi/ofi_win.c \
src/mpid/ch4/netmod/ofi/ofi_part.c \
src/mpid/ch4/netmod/ofi/ofi_events.c \
src/mpid/ch4/netmod/ofi/ofi_huge.c \
src/mpid/ch4/netmod/ofi/ofi_progress.c \
src/mpid/ch4/netmod/ofi/ofi_am_events.c \
src/mpid/ch4/netmod/ofi/ofi_nic.c \
Expand Down
8 changes: 4 additions & 4 deletions src/mpid/ch4/netmod/ofi/globals.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include "ofi_impl.h"
MPIDI_OFI_global_t MPIDI_OFI_global;

MPIDI_OFI_huge_recv_t *MPIDI_unexp_huge_recv_head = NULL;
MPIDI_OFI_huge_recv_t *MPIDI_unexp_huge_recv_tail = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_posted_huge_recv_head = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_posted_huge_recv_tail = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_huge_ctrl_head = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_huge_ctrl_tail = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_huge_recv_head = NULL;
MPIDI_OFI_huge_recv_list_t *MPIDI_huge_recv_tail = NULL;

unsigned long long PVAR_COUNTER_nic_sent_bytes_count[MPIDI_OFI_MAX_NICS] ATTRIBUTE((unused));
unsigned long long PVAR_COUNTER_nic_recvd_bytes_count[MPIDI_OFI_MAX_NICS] ATTRIBUTE((unused));
Expand Down
35 changes: 0 additions & 35 deletions src/mpid/ch4/netmod/ofi/ofi_control.h

This file was deleted.

317 changes: 15 additions & 302 deletions src/mpid/ch4/netmod/ofi/ofi_events.c

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions src/mpid/ch4/netmod/ofi/ofi_events.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
#include "ofi_impl.h"
#include "ofi_am_impl.h"
#include "ofi_am_events.h"
#include "ofi_control.h"
#include "utlist.h"

int MPIDI_OFI_rma_done_event(int vni, struct fi_cq_tagged_entry *wc, MPIR_Request * in_req);
int MPIDI_OFI_get_huge_event(int vni, struct fi_cq_tagged_entry *wc, MPIR_Request * req);
int MPIDI_OFI_dispatch_function(int vni, struct fi_cq_tagged_entry *wc, MPIR_Request * req);

MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_cqe_get_source(struct fi_cq_tagged_entry *wc, bool has_err)
Expand Down Expand Up @@ -55,8 +53,14 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_recv_event(int vni, struct fi_cq_tagged_e
size_t count;
MPIR_FUNC_ENTER;

if (wc->tag & MPIDI_OFI_HUGE_SEND) {
mpi_errno = MPIDI_OFI_recv_huge_event(vni, wc, rreq);
goto fn_exit;
}
rreq->status.MPI_SOURCE = MPIDI_OFI_cqe_get_source(wc, true);
rreq->status.MPI_ERROR = MPIDI_OFI_idata_get_error_bits(wc->data);
if (!rreq->status.MPI_ERROR) {
rreq->status.MPI_ERROR = MPIDI_OFI_idata_get_error_bits(wc->data);
}
rreq->status.MPI_TAG = MPIDI_OFI_init_get_tag(wc->tag);
count = wc->len;
MPIR_STATUS_SET_COUNT(rreq->status, count);
Expand Down Expand Up @@ -131,7 +135,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_recv_event(int vni, struct fi_cq_tagged_e

MPIDIU_request_complete(rreq);

/* Polling loop will check for truncation */
fn_exit:
MPIR_FUNC_EXIT;
return mpi_errno;
Expand Down
Loading