Skip to content

usnix: fix the CQ-reading logic for -FI_EAGAIN #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2015
Merged

usnix: fix the CQ-reading logic for -FI_EAGAIN #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aabee2
libfabric: a few fixes since 1.0rc3
jsquyres Apr 2, 2015
d825ec7
usnic: fix the CQ-reading logic for -FI_EAGAIN
jsquyres Apr 2, 2015
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
14 changes: 7 additions & 7 deletions opal/mca/btl/usnic/btl_usnic_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,8 +1066,7 @@ static int usnic_component_progress(void)
}
} else if (OPAL_LIKELY(-FI_EAGAIN == ret)) {
continue;
}
else {
} else {
usnic_handle_cq_error(module, channel, ret);
}
}
Expand Down Expand Up @@ -1219,20 +1218,21 @@ static int usnic_component_progress_2(void)
channel->chan_deferred_recv = NULL;
}

ret = fi_cq_read(channel->cq, completions,
OPAL_BTL_USNIC_NUM_COMPLETIONS);
num_events = ret =
fi_cq_read(channel->cq, completions,
OPAL_BTL_USNIC_NUM_COMPLETIONS);
assert(0 != ret);
opal_memchecker_base_mem_defined(&ret, sizeof(ret));
if (OPAL_UNLIKELY(ret < 0 && -FI_EAGAIN != ret)) {
usnic_handle_cq_error(module, channel, num_events);
num_events = 0;
} else {
num_events = ret;
} else if (-FI_EAGAIN == ret) {
num_events = 0;
}

opal_memchecker_base_mem_defined(completions,
sizeof(completions[0]) *
ret);
num_events);
/* Handle each event */
for (j = 0; j < num_events; j++) {
count += usnic_handle_completion(module, channel,
Expand Down
33 changes: 23 additions & 10 deletions opal/mca/common/libfabric/libfabric/AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,23 @@
Sean Hefty <sean.hefty@intel.com>
Reese Faucette <rfaucett@cisco.com>
Jeff Squyres <jsquyres@cisco.com>
Jianxin Xiong <jianxin.xiong@intel.com>
Sayantan Sur <sayantan.sur@intel.com>
Xuyang Wang <xuywang@cisco.com>
Patrick McCormick <patrick.m.mccormick@intel.com>
Dave Goodell <dgoodell@cisco.com>
Jithin Jose <jithin.jose@intel.com>
Miao Luo <miao.luo@intel.com>
Sean Hefty <sean.hefty@intel.com>
Reese Faucette <rfaucett@cisco.com>
Jeff Squyres <jsquyres@cisco.com>
Jianxin Xiong <jianxin.xiong@intel.com>
Sayantan Sur <sayantan.sur@intel.com>
Xuyang Wang <xuywang@cisco.com>
Patrick McCormick <patrick.m.mccormick@intel.com>
Dave Goodell <dgoodell@cisco.com>
Jithin Jose <jithin.jose@intel.com>
Miao Luo <miao.luo@intel.com>
Arun C Ilango <arun.ilango@intel.com>
Ben Turrubiates <bturrubiates@lanl.gov>
Gilles Gouaillardet <gilles.gouaillardet@iferc.org>
Howard Pritchard <howardp@lanl.gov>
Jay Sternberg <jay.e.sternberg@intel.com>
Jeff Hammond <jeff.science@gmail.com>
Ken Raffenetti <raffenet@mcs.anl.gov>
Patrick MacArthur <pmacarth@iol.unh.edu>
Shantonu Hossain <shantonu.hossain@intel.com>
Chen Zhao <chen.zhao@netapp.com>
Stan Smith <stan.smith@intel.com>
Sung-Eun Choi <sungeunchoi@users.noreply.github.com>
Yohann Burette <yohann.burette@intel.com>
4 changes: 2 additions & 2 deletions opal/mca/common/libfabric/libfabric/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This README is for userspace RDMA fabric library.

Version Libfabric v1.0.0rc3
Released on 2015-03-31
Version Libfabric v1.0.0rc5
Released on 2015-04-02

Building
========
Expand Down
6 changes: 3 additions & 3 deletions opal/mca/common/libfabric/libfabric/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
/* Set to 1 to use c11 atomic functions */
#undef HAVE_ATOMICS

/* Define HAVE_CLOCK_GETTIME to 1 if available. */
/* Define to 1 if clock_gettime is available. */
#undef HAVE_CLOCK_GETTIME

/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

/* Define HAVE_HOST_GET_CLOCK_SERVICE to 1 if available. */
/* Define to 1 if host_clock_get_service is available. */
#undef HAVE_HOST_GET_CLOCK_SERVICE

/* Define to 1 if you have the <infiniband/verbs.h> header file. */
Expand Down Expand Up @@ -128,7 +128,7 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION

/* Define PT_LOCK_SPIN to 1 if available. */
/* Define to 1 if pthread_spin_init is available. */
#undef PT_LOCK_SPIN

/* Define to 1 if you have the ANSI C header files. */
Expand Down
Loading