Skip to content

Commit

Permalink
libfabric: update to 8528d35551a78b5241e615c0e6ac5a711f96a03c
Browse files Browse the repository at this point in the history
Update to latest from libfabric Github master
ofiwg/libfabric@8528d35
  • Loading branch information
jsquyres committed Feb 20, 2015
1 parent 15be948 commit 937bbba
Show file tree
Hide file tree
Showing 59 changed files with 571 additions and 353 deletions.
4 changes: 3 additions & 1 deletion opal/mca/common/libfabric/libfabric/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,12 @@ _sockets_files = \
if HAVE_SOCKETS_DL
pkglib_LTLIBRARIES += libsockets-fi.la
libsockets_fi_la_SOURCES = $(_sockets_files) $(common_srcs)
libsockets_fi_la_LIBADD = $(linkback)
libsockets_fi_la_LIBADD = $(linkback) $(sockets_shm_LIBS)
libsockets_fi_la_LDFLAGS = -module -avoid-version -shared -export-dynamic
libsockets_fi_la_DEPENDENCIES = $(linkback)
else !HAVE_SOCKETS_DL
src_libfabric_la_SOURCES += $(_sockets_files)
src_libfabric_la_LIBADD += $(sockets_shm_LIBS)
endif !HAVE_SOCKETS_DL

endif HAVE_SOCKETS
Expand Down Expand Up @@ -312,6 +313,7 @@ real_man_pages = \
man/fi_av.3 \
man/fi_cm.3 \
man/fi_cntr.3 \
man/fi_control.3 \
man/fi_cq.3 \
man/fi_direct.7 \
man/fi_domain.3 \
Expand Down
4 changes: 2 additions & 2 deletions opal/mca/common/libfabric/libfabric/README
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.0rc1
Released on 2015-02-13
Version Libfabric v1.0.0rc3
Released on 2015-02-20

Building
========
Expand Down
3 changes: 3 additions & 0 deletions opal/mca/common/libfabric/libfabric/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
/* assembler has .symver support */
#undef HAVE_SYMVER_SUPPORT

/* Define to 1 if you have the <sys/mman.h> header file. */
#undef HAVE_SYS_MMAN_H

/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H

Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.

AC_PREREQ(2.57)
AC_INIT([libfabric], [1.0.0rc1], [ofiwg@lists.openfabrics.org])
AC_INIT([libfabric], [1.0.0rc3], [ofiwg@lists.openfabrics.org])
AC_CONFIG_SRCDIR([src/fabric.c])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(config)
Expand Down
6 changes: 3 additions & 3 deletions opal/mca/common/libfabric/libfabric/libfabric.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: libfabric
Version: 1.0.0rc1
Version: 1.0.0rc3
Release: 1%{?dist}
Summary: User-space RDMA Fabric Interfaces
Group: System Environment/Libraries
Expand Down Expand Up @@ -61,5 +61,5 @@ rm -rf %{buildroot}
%{_mandir}/man7/*

%changelog
* Mon Jan 19 2015 Maintainer Name <email@intel.com> 1.0.0
- TODO: Release manager fill this out for initial release
* Mon Feb 16 2015 Open Fabrics Interfaces Working Group <ofiwg@lists.openfabrics.org> 1.0.0
- Release 1.0.0rc2
4 changes: 2 additions & 2 deletions opal/mca/common/libfabric/libfabric/libfabric.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,5 @@ rm -rf %{buildroot}
%{_mandir}/man7/*

%changelog
* Mon Jan 19 2015 Maintainer Name <email@intel.com> 1.0.0
- TODO: Release manager fill this out for initial release
* Mon Feb 16 2015 Open Fabrics Interfaces Working Group <ofiwg@lists.openfabrics.org> 1.0.0
- Release 1.0.0rc2
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fabric.7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fabric 7 "2014\-12\-15" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fabric 7 "2014\-12\-15" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
Fabric Interface Library
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_av.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_av 3 "2015\-02\-12" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_av 3 "2015\-02\-12" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_av - Address vector operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_cm.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_cm 3 "2015\-01\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_cm 3 "2015\-01\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_cm - Connection management operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_cntr.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_cntr 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_cntr 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_cntr - Completion and event counter operations
Expand Down
36 changes: 36 additions & 0 deletions opal/mca/common/libfabric/libfabric/man/fi_control.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.TH fi_control 3 "2015\-02\-16" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_control - Perform an operation on a fabric resource.
.SH SYNOPSIS
.IP
.nf
\f[C]
#include\ <rdma/fabric.h>

int\ fi_control(struct\ fid\ *fid,\ int\ command,\ void\ *arg);
\f[]
.fi
.SH ARGUMENTS
.PP
\f[I]fid\f[] : Fabric resource
.PP
\f[I]command\f[] : Operation to perform
.PP
\f[I]arg\f[] : Optional argument to the command
.SH DESCRIPTION
.PP
The fi_control operation is used to perform one or more operations on a
fabric resource.
Conceptually, fi_control is similar to the POSIX fcntl routine.
The exact behavior of using fi_control depends on the fabric resource
being operated on, the specified command, and any provided arguments for
the command.
For specific details, see the fabric resource specific help pages noted
below.
.SH SEE ALSO
.PP
\f[C]fi_endpoint\f[](3), \f[C]fi_cm\f[](3), \f[C]fi_cntr\f[](3),
\f[C]fi_cq\f[](3), \f[C]fi_eq\f[](3),
.SH AUTHORS
OpenFabrics.
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_cq.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_cq 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_cq 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_cq - Completion queue operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_direct.7
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_direct 7 "2014\-11\-21" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_direct 7 "2014\-11\-21" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
Direct fabric provider access
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_domain.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_domain 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_domain 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_domain - Open a fabric access domain
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_endpoint.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_endpoint 3 "2015\-02\-12" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_endpoint 3 "2015\-02\-12" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_endpoint - Fabric endpoint operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_eq.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_eq 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_eq 3 "2015\-02\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_eq - Event queue operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_errno.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_errno 3 "2015\-01\-08" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_errno 3 "2015\-01\-08" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_errno - fabric errors
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_fabric.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_fabric 3 "2015\-01\-24" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_fabric 3 "2015\-01\-24" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_fabric - Fabric domain operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_getinfo.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_getinfo 3 "2015\-02\-11" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_getinfo 3 "2015\-02\-11" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_getinfo / fi_freeinfo - Obtain / free fabric interface information
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_mr.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_mr 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_mr 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_mr - Memory region operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_msg.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_msg 3 "2015\-02\-06" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_msg 3 "2015\-02\-06" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_msg - Message data transfer operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_poll.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_poll 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_poll 3 "2015\-01\-29" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_poll - Polling and wait set operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_rma.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_rma 3 "2015\-01\-28" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_rma 3 "2015\-01\-28" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_rma - Remote memory access operations
Expand Down
20 changes: 1 addition & 19 deletions opal/mca/common/libfabric/libfabric/man/fi_tagged.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_tagged 3 "2015\-02\-12" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_tagged 3 "2015\-02\-18" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_tagged - Tagged data transfer operations
Expand Down Expand Up @@ -314,24 +314,6 @@ operations.
the user.
.PP
\f[I]-FI_EOTHER\f[] : Indicates that an unspecified error occurred.
.SH NOTES
.SS Ordering
.PP
The order in which tags are matched is only defined for a pair of
sending and receiving endpoints.
The ordering is defined by the underlying protocol.
If a specific protocol is not selected for an endpoint, the libfabric
implementation will choose a protocol that satisfies the following
requirement from the MPI-3.0 specification (page 41, lines 1-5):
.RS
.PP
If a sender sends two messages in succession to the same destination,
and both match the same receive, then this operation cannot receive the
second message if the first one is still pending.
If a receiver posts two receives in succession, and both match the same
message, then the second receive operation cannot be satisfied by this
message, if the first one is still pending.
.RE
.SH SEE ALSO
.PP
\f[C]fi_getinfo\f[](3), \f[C]fi_endpoint\f[](3), \f[C]fi_domain\f[](3),
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_trigger.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_trigger 3 "2015\-01\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_trigger 3 "2015\-01\-01" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_trigger - Triggered operations
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/common/libfabric/libfabric/man/fi_version.3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH fi_version 3 "2015\-01\-08" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc1"
.TH fi_version 3 "2015\-01\-08" "Libfabric Programmer\[aq]s Manual" "Libfabric v1.0.0rc3"
.SH NAME
.PP
fi_version - Version of the library interfaces
Expand Down
28 changes: 24 additions & 4 deletions opal/mca/common/libfabric/libfabric/prov/sockets/configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,31 @@ dnl $2: action if not configured successfully
dnl
AC_DEFUN([FI_SOCKETS_CONFIGURE],[
# Determine if we can support the sockets provider
sockets_happy=0
sockets_h_happy=0
sockets_shm_happy=0
AS_IF([test x"$enable_sockets" != x"no"],
[sockets_happy=1
AC_CHECK_HEADER([sys/socket.h], [], [sockets_happy=0])
[AC_CHECK_HEADER([sys/socket.h], [sockets_h_happy=1],
[sockets_h_happy=0])
# check if shm_open is already present
AC_CHECK_FUNC([shm_open],
[sockets_shm_happy=1],
[sockets_shm_happy=0])
# look for shm_open in librt if not already present
AS_IF([test $sockets_shm_happy -eq 0],
[FI_CHECK_PACKAGE([sockets_shm],
[sys/mman.h],
[rt],
[shm_open],
[],
[],
[],
[sockets_shm_happy=1],
[sockets_shm_happy=0])])
])
AS_IF([test $sockets_happy -eq 1], [$1], [$2])
AS_IF([test $sockets_h_happy -eq 1 && \
test $sockets_shm_happy -eq 1], [$1], [$2])
])
3 changes: 2 additions & 1 deletion opal/mca/common/libfabric/libfabric/prov/sockets/src/sock.h
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ struct sock_cq {

struct sock_conn_hdr {
uint8_t type;
uint8_t reserved[7];
uint8_t reserved[3];
int32_t s_port;
fid_t c_fid;
fid_t s_fid;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@ static int sock_ep_atomic_valid(struct fid_ep *ep, enum fi_datatype datatype,
}

datatype_sz = fi_datatype_size(datatype);
if (datatype_sz == 0)
return -FI_ENOENT;

*count = (SOCK_EP_MAX_ATOMIC_SZ/datatype_sz);
return 0;
}
Expand Down
Loading

0 comments on commit 937bbba

Please sign in to comment.