Skip to content

Commit 1573d50

Browse files
committed
common: remove librpmem rpmemd libfabric support
1 parent a664a9f commit 1573d50

File tree

625 files changed

+469
-42820
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

625 files changed

+469
-42820
lines changed

.github/workflows/coverity.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616
PMDK_CC: gcc
1717
PMDK_CXX: g++
1818
MAKE_PKG: 0
19-
REMOTE_TESTS: 1
2019
VALGRIND: 1
2120

2221
jobs:

.github/workflows/gha.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
PMDK_CC: gcc
2121
PMDK_CXX: g++
2222
MAKE_PKG: 0
23-
REMOTE_TESTS: 1
2423
VALGRIND: 1
2524
SRC_CHECKERS: 0
2625
strategy:
@@ -31,9 +30,9 @@ jobs:
3130
"N=4 OS=ubuntu OS_VER=22.04 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug",
3231
"N=5 OS=fedora OS_VER=35 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug",
3332
"N=6 OS=fedora OS_VER=35 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug AUTO_DOC_UPDATE=1",
34-
"N=7 OS=fedora OS_VER=35 MAKE_PKG=1 EXPERIMENTAL=y REMOTE_TESTS=0 VALGRIND=0 PMEMSET_INSTALL=y PUSH_IMAGE=1",
35-
"N=8 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y REMOTE_TESTS=0 VALGRIND=0 NDCTL_ENABLE=n PMEMSET_INSTALL=y PUSH_IMAGE=1",
36-
"N=9 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y REMOTE_TESTS=0 VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++",
33+
"N=7 OS=fedora OS_VER=35 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PMEMSET_INSTALL=y PUSH_IMAGE=1",
34+
"N=8 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMEMSET_INSTALL=y PUSH_IMAGE=1",
35+
"N=9 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++",
3736
"N=10 OS=ubuntu OS_VER=22.04 COVERAGE=1 FAULT_INJECTION=1 TEST_BUILD=debug"]
3837
steps:
3938
- name: Clone the git repo

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ env:
1818
- MAKE_PKG=0
1919
- PMDK_CC=gcc
2020
- PMDK_CXX=g++
21-
- REMOTE_TESTS=1
2221
- VALGRIND=1
2322
- SRC_CHECKERS=0
2423
- EXPERIMENTAL=n
2524
jobs:
2625
- FAULT_INJECTION=1 TEST_BUILD=debug PUSH_IMAGE=1
2726
- OS=fedora OS_VER=31 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug PUSH_IMAGE=1
28-
- MAKE_PKG=1 REMOTE_TESTS=0 VALGRIND=0
29-
- MAKE_PKG=1 REMOTE_TESTS=0 VALGRIND=0 OS=fedora OS_VER=31
27+
- MAKE_PKG=1 VALGRIND=0
28+
- MAKE_PKG=1 VALGRIND=0 OS=fedora OS_VER=31
3029
- COVERAGE=1 FAULT_INJECTION=1 TEST_BUILD=debug
3130

3231
jobs:

CODING_STYLE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ conventions for git commit messages:
106106
with an area name and then a colon. There should be no period after
107107
the short summary.
108108
- Valid area names are: **pmem, pmem2, obj, blk, log, set,
109-
test, doc, daxio, pmreorder, pool** (for *libpmempool* and *pmempool*), **rpmem**
110-
(for *librpmem* and *rpmemd*), **benchmark, examples, core** and **common** (for everything else).
109+
test, doc, daxio, pmreorder, pool** (for *libpmempool* and *pmempool*),
110+
**benchmark, examples, core** and **common** (for everything else).
111111
- It is acceptable for the short summary to be the only thing in the commit
112112
message if it is a trivial change. Otherwise, the second line must be
113113
a blank line.

Makefile

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2014-2021, Intel Corporation
2+
# Copyright 2014-2022, Intel Corporation
33

44
#
55
# Makefile -- top-level Makefile for PMDK
@@ -8,13 +8,10 @@
88
#
99
# Use "make doc" to build documentation.
1010
#
11-
# Use "make test" to build unit tests. Add "SKIP_SYNC_REMOTES=y" to skip
12-
# or "FORCE_SYNC_REMOTES=y" to force syncing remote nodes if any is defined.
11+
# Use "make test" to build unit tests.
1312
#
1413
# Use "make check" to run unit tests.
1514
#
16-
# Use "make check-remote" to run only remote unit tests.
17-
#
1815
# Use "make clean" to delete all intermediate files (*.o, etc).
1916
#
2017
# Use "make clobber" to delete everything re-buildable (binaries, etc.).
@@ -45,7 +42,6 @@ RPM_BUILDDIR=rpmbuild
4542
DPKG_BUILDDIR=dpkgbuild
4643
EXPERIMENTAL ?= n
4744
BUILD_PACKAGE_CHECK ?= y
48-
BUILD_RPMEM ?= y
4945
TEST_CONFIG_FILE ?= "$(CURDIR)"/src/test/testconfig.sh
5046
PMEMSET_INSTALL ?= n
5147
DOC ?= y
@@ -78,14 +74,6 @@ endif
7874
$(RM) -r $(RPM_BUILDDIR) $(DPKG_BUILDDIR) rpm dpkg
7975
$(RM) -f $(GIT_VERSION)
8076

81-
require-rpmem:
82-
ifneq ($(BUILD_RPMEM),y)
83-
$(error ERROR: cannot run remote tests because $(BUILD_RPMEM_INFO))
84-
endif
85-
86-
check-remote: require-rpmem all
87-
$(MAKE) -C src $@
88-
8977
test check pcheck pycheck: all
9078
$(MAKE) -C src $@
9179

@@ -108,7 +96,7 @@ check-license:
10896
@echo Done.
10997

11098
check-doc: doc
111-
BUILD_RPMEM="$(BUILD_RPMEM)" utils/check-manpages
99+
./utils/check-manpages
112100

113101
sparse:
114102
$(MAKE) -C src sparse
@@ -126,7 +114,7 @@ pkg-clean:
126114
rpm dpkg: pkg-clean
127115
$(MAKE) source DESTDIR="$(DESTDIR)"
128116
+utils/build-$@.sh -t $(SRCVERSION) -s "$(DESTDIR)"/pmdk -w "$(DESTDIR)" -o $(CURDIR)/$@\
129-
-e $(EXPERIMENTAL) -c $(BUILD_PACKAGE_CHECK) -r $(BUILD_RPMEM)\
117+
-e $(EXPERIMENTAL) -c $(BUILD_PACKAGE_CHECK)\
130118
-f $(TEST_CONFIG_FILE) -n $(NDCTL_ENABLE) -l $(PMEMSET_INSTALL)
131119

132120
install: all
@@ -138,5 +126,5 @@ ifeq ($(DOC),y)
138126
endif
139127

140128
.PHONY: all clean clobber test check cstyle check-license install uninstall\
141-
source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\
129+
source rpm dpkg pkg-clean pcheck format doc\
142130
$(SUBDIRS)

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ Bugs and feature requests for this repo are tracked in our [GitHub Issues Databa
3333
* [Testing Libraries](#testing-libraries-on-windows)
3434
8. [Debugging](#debugging)
3535
9. [Experimental Packages](#experimental-packages)
36-
* [librpmem and rpmemd packages](#the-librpmem-and-rpmemd-packages)
3736
* [Experimental support for 64-bit ARM](#experimental-support-for-64-bit-arm)
3837
10. [Contact Us](#contact-us)
3938

@@ -56,10 +55,8 @@ Libraries available in this repository:
5655

5756
- [libpmemset](https://pmem.io/pmdk/libpmemset/): (**still in progress**) aims to provide the core functionality any persistent application should have. (EXPERIMENTAL)
5857

59-
- [librpmem](https://pmem.io/pmdk/librpmem/)<sup>1</sup>: provides low-level support for remote access to persistent memory utilizing RDMA-capable RNICs. (DEPRECATED)
60-
61-
**Librpmem** library is deprecated. If you are interested in a remote persistent
62-
memory support please look at new library [rpma](https://github.com/pmem/rpma).
58+
**Librpmem** library has been removed from PMDK repository. If you are interested in a remote persistent
59+
memory support please look at new [librpma](https://github.com/pmem/rpma).
6360

6461
If you're looking for *libvmem* and *libvmmalloc*, they have been moved to a
6562
[separate repository](https://github.com/pmem/vmem).
@@ -77,7 +74,7 @@ For information on how these libraries are licensed, see our [LICENSE](LICENSE)
7774
>
7875
><sup>2</sup> PMDK for Windows is feature complete, but not yet considered production quality.
7976
>
80-
><sup>3</sup> DAX and **libfabric** are not yet supported in FreeBSD, so at this time PMDK is available as a technical preview release for development purposes.
77+
><sup>3</sup> DAX is not yet supported in FreeBSD, so at this time PMDK is available as a technical preview release for development purposes.
8178
8279
## Getting Started
8380

@@ -141,8 +138,6 @@ You will need to install the following required packages on the build system:
141138
The following packages are required only by selected PMDK components
142139
or features:
143140

144-
* **libfabric** (v1.4.2 or later) -- required by **librpmem**
145-
146141
><sup>1</sup> PMDK depends on libndctl to support RAS features. It is possible
147142
to disable this support by passing NDCTL_ENABLE=n to "make", but we strongly
148143
discourage users from doing that. Disabling NDCTL strips PMDK from ability to

doc/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,17 +147,6 @@ MANPAGES_3_DUMMY += libpmemset/pmemset_config_delete.3 libpmemset/pmemset_delete
147147
libpmemset/pmemset_source_pwrite_mcsafe.3
148148
endif
149149

150-
ifeq ($(BUILD_RPMEM),y)
151-
MANPAGES_7_MD += librpmem/librpmem.7.md
152-
MANPAGES_3_MD += librpmem/rpmem_create.3.md
153-
MANPAGES_3_MD += librpmem/rpmem_persist.3.md
154-
MANPAGES_1_MD += rpmemd/rpmemd.1.md
155-
MANPAGES_3_DUMMY += librpmem/rpmem_open.3 librpmem/rpmem_set_attr.3 librpmem/rpmem_close.3 \
156-
librpmem/rpmem_read.3 librpmem/rpmem_remove.3 librpmem/rpmem_check_version.3 \
157-
librpmem/rpmem_errormsg.3 librpmem/rpmem_deep_persist.3 librpmem/rpmem_flush.3 \
158-
librpmem/rpmem_drain.3
159-
endif
160-
161150
ifeq ($(NDCTL_ENABLE),y)
162151
MANPAGES_1_MD += daxio/daxio.1.md
163152
endif

doc/README

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ libpmemobj -- transactional object store
2828
libpmempool -- persistent memory pool management library
2929
pmempool -- persistent memory pool management tool
3030
libpmemset -- core functionality for any persistent application (EXPERIMENTAL)
31-
librpmem -- remote access to persistent memory (DEPRECATED)
32-
rpmemd -- remote persistent memory daemon (DEPRECATED)
3331
daxio -- perform I/O on Device DAX device
3432

3533
These man pages provide the API specification for the corresponding libraries

doc/libpmemobj/pmemobj_open.3.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ header: "pmemobj API version 2.3"
99
---
1010

1111
[comment]: <> (SPDX-License-Identifier: BSD-3-Clause)
12-
[comment]: <> (Copyright 2017-2021, Intel Corporation)
12+
[comment]: <> (Copyright 2017-2022, Intel Corporation)
1313

1414
[comment]: <> (pmemobj_open.3 -- man page for most commonly used functions from libpmemobj library)
1515

@@ -80,8 +80,7 @@ from the size of the existing file and will verify that the file appears to be
8080
empty by searching for any non-zero data in the pool header at the beginning of
8181
the file. The minimum net pool size allowed by the library for a local
8282
transactional object store is defined in **\<libpmemobj.h\>** as
83-
**PMEMOBJ_MIN_POOL**. _WINUX(,=q=For remote replicas the minimum file size
84-
is defined in **\<librpmem.h\>** as **RPMEM_MIN_PART**.=e=)
83+
**PMEMOBJ_MIN_POOL**.
8584
8685
Depending on the configuration of the system, the available non-volatile
8786
memory space may be divided into multiple memory devices.

doc/libpmempool/pmempool_check_init.3.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ header: "pmempool API version 1.3"
99
---
1010

1111
[comment]: <> (SPDX-License-Identifier: BSD-3-Clause)
12-
[comment]: <> (Copyright 2017-2018, Intel Corporation)
12+
[comment]: <> (Copyright 2017-2022, Intel Corporation)
1313

1414
[comment]: <> (pmempool_check_init.3 -- man page for pmempool health check functions)
1515

@@ -145,8 +145,6 @@ the same structure (the same number of parts with exactly the same size) as the
145145

146146
Backup is supported only if the source *pool set* has no defined replicas.
147147

148-
Neither *path* nor *backup_path* may specify a pool set with remote replicas.
149-
150148
The _UW(pmempool_check) function starts or resumes the check indicated by *ppc*.
151149
When the next status is generated, the check is paused and _UW(pmempool_check)
152150
returns a pointer to the _UWS(pmempool_check_status) structure:

0 commit comments

Comments
 (0)