Skip to content

Commit

Permalink
Merge pull request #5513 from wlemkows/remove-libpmemset
Browse files Browse the repository at this point in the history
common: remove support for libpmemset
  • Loading branch information
lukaszstolarczuk authored Jan 9, 2023
2 parents 3685f42 + 3c1685a commit 06f10e7
Show file tree
Hide file tree
Showing 226 changed files with 98 additions and 20,756 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
"N=4 OS=ubuntu OS_VER=22.04 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug",
"N=5 OS=fedora OS_VER=35 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug",
"N=6 OS=fedora OS_VER=35 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug AUTO_DOC_UPDATE=1",
"N=7 OS=fedora OS_VER=35 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PMEMSET_INSTALL=y PUSH_IMAGE=1",
"N=8 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMEMSET_INSTALL=y PUSH_IMAGE=1",
"N=7 OS=fedora OS_VER=35 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PUSH_IMAGE=1",
"N=8 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PUSH_IMAGE=1",
"N=9 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++",
"N=10 OS=ubuntu OS_VER=22.04 COVERAGE=1 FAULT_INJECTION=1 TEST_BUILD=debug"]
steps:
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2014-2022, Intel Corporation
# Copyright 2014-2023, Intel Corporation

#
# Makefile -- top-level Makefile for PMDK
Expand Down Expand Up @@ -43,7 +43,6 @@ DPKG_BUILDDIR=dpkgbuild
EXPERIMENTAL ?= n
BUILD_PACKAGE_CHECK ?= y
TEST_CONFIG_FILE ?= "$(CURDIR)"/src/test/testconfig.sh
PMEMSET_INSTALL ?= n
DOC ?= y

rpm : override DESTDIR="$(CURDIR)/$(RPM_BUILDDIR)"
Expand Down Expand Up @@ -115,7 +114,7 @@ rpm dpkg: pkg-clean
$(MAKE) source DESTDIR="$(DESTDIR)"
+utils/build-$@.sh -t $(SRCVERSION) -s "$(DESTDIR)"/pmdk -w "$(DESTDIR)" -o $(CURDIR)/$@\
-e $(EXPERIMENTAL) -c $(BUILD_PACKAGE_CHECK)\
-f $(TEST_CONFIG_FILE) -n $(NDCTL_ENABLE) -l $(PMEMSET_INSTALL)
-f $(TEST_CONFIG_FILE) -n $(NDCTL_ENABLE)

install: all

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Libraries available in this repository:

- [libpmempool](https://pmem.io/pmdk/libpmempool/): provides support for off-line pool management and diagnostics.

- [libpmemset](https://pmem.io/pmdk/libpmemset/): (**still in progress**) aims to provide the core functionality any persistent application should have. (EXPERIMENTAL)
**Libpmemset** has been removed from PMDK repository.

**Librpmem** library has been removed from PMDK repository. If you are interested in a remote persistent
memory support please look at new [librpma](https://github.com/pmem/rpma).
Expand Down
53 changes: 5 additions & 48 deletions doc/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2014-2022, Intel Corporation
# Copyright 2014-2023, Intel Corporation
#

#
Expand Down Expand Up @@ -121,32 +121,6 @@ MANPAGES_3_DUMMY += libpmem2/pmem2_config_delete.3 libpmem2/pmem2_config_set_vdm
libpmem2/pmem2_vm_reservation_map_find_next.3 libpmem2/pmem2_vm_reservation_map_find_prev.3 \
libpmem2/pmem2_source_pwrite_mcsafe.3

# libpmemset
MANPAGES_7_MD_PMEMSET = libpmemset/libpmemset.7.md
MANPAGES_5_MD_PMEMSET =
MANPAGES_3_MD_PMEMSET = libpmemset/pmemset_errormsg.3.md libpmemset/pmemset_perror.3.md libpmemset/pmemset_config_new.3.md \
libpmemset/pmemset_source_from_pmem2.3.md libpmemset/pmemset_new.3.md \
libpmemset/pmemset_source_from_file.3.md libpmemset/pmemset_source_delete.3.md libpmemset/pmemset_map_config_new.3.md \
libpmemset/pmemset_config_set_required_store_granularity.3.md libpmemset/pmemset_map.3.md \
libpmemset/pmemset_first_part_map.3.md libpmemset/pmemset_descriptor_part_map.3.md libpmemset/pmemset_get_store_granularity.3.md \
libpmemset/pmemset_part_map_drop.3.md libpmemset/pmemset_part_map_by_address.3.md \
libpmemset/pmemset_persist.3.md libpmemset/pmemset_flush.3.md libpmemset/pmemset_drain.3.md \
libpmemset/pmemset_set_contiguous_part_coalescing.3.md libpmemset/pmemset_memmove.3.md \
libpmemset/pmemset_remove_part_map.3.md libpmemset/pmemset_deep_flush.3.md \
libpmemset/pmemset_source_from_temporary.3.md libpmemset/pmemset_remove_range.3.md \
libpmemset/pmemset_config_set_event_callback.3.md libpmemset/pmemset_config_set_reservation.3.md \
libpmemset/pmemset_map_config_set_length.3.md libpmemset/pmemset_map_config_set_offset.3.md \
libpmemset/pmemset_config_set_acceptable_states.3.md libpmemset/pmemset_source_set_sds.3.md \
libpmemset/pmemset_source_pread_mcsafe.3.md libpmemset/pmemset_source_alignment.3.md

MANPAGES_1_MD_PMEMSET =
ifeq ($(PMEMSET_INSTALL),y)
MANPAGES_3_DUMMY += libpmemset/pmemset_config_delete.3 libpmemset/pmemset_delete.3 \
libpmemset/pmemset_next_part_map.3 libpmemset/pmemset_memcpy.3 libpmemset/pmemset_memset.3 \
libpmemset/pmemset_xsource_from_file.3 libpmemset/pmemset_map_config_delete.3 \
libpmemset/pmemset_source_pwrite_mcsafe.3
endif

ifeq ($(NDCTL_ENABLE),y)
MANPAGES_1_MD += daxio/daxio.1.md
endif
Expand All @@ -166,11 +140,6 @@ MANPAGES_5_GROFF_PMEM2 = $(MANPAGES_5_MD_PMEM2:.5.md=.5)
MANPAGES_3_GROFF_PMEM2 = $(MANPAGES_3_MD_PMEM2:.3.md=.3)
MANPAGES_1_GROFF_PMEM2 = $(MANPAGES_1_MD_PMEM2:.1.md=.1)

MANPAGES_7_GROFF_PMEMSET = $(MANPAGES_7_MD_PMEMSET:.7.md=.7)
MANPAGES_5_GROFF_PMEMSET = $(MANPAGES_5_MD_PMEMSET:.5.md=.5)
MANPAGES_3_GROFF_PMEMSET = $(MANPAGES_3_MD_PMEMSET:.3.md=.3)
MANPAGES_1_GROFF_PMEMSET = $(MANPAGES_1_MD_PMEMSET:.1.md=.1)

ifeq ($(EXPERIMENTAL),y)
MANPAGES_7_GROFF += $(MANPAGES_7_GROFF_EXP)
MANPAGES_5_GROFF += $(MANPAGES_5_GROFF_EXP)
Expand All @@ -188,22 +157,10 @@ MANPAGES_5_GROFF += $(MANPAGES_5_GROFF_PMEM2)
MANPAGES_3_GROFF += $(MANPAGES_3_GROFF_PMEM2)
MANPAGES_1_GROFF += $(MANPAGES_1_GROFF_PMEM2)

ifeq ($(PMEMSET_INSTALL),y)
MANPAGES_7_GROFF += $(MANPAGES_7_GROFF_PMEMSET)
MANPAGES_5_GROFF += $(MANPAGES_5_GROFF_PMEMSET)
MANPAGES_3_GROFF += $(MANPAGES_3_GROFF_PMEMSET)
MANPAGES_1_GROFF += $(MANPAGES_1_GROFF_PMEMSET)
else
MANPAGES_7_NOINSTALL += $(MANPAGES_7_GROFF_PMEMSET)
MANPAGES_5_NOINSTALL += $(MANPAGES_5_GROFF_PMEMSET)
MANPAGES_3_NOINSTALL += $(MANPAGES_3_GROFF_PMEMSET)
MANPAGES_1_NOINSTALL += $(MANPAGES_1_GROFF_PMEMSET)
endif

MANPAGES_7_MD_WEB = $(MANPAGES_7_MD_PMEM2) $(MANPAGES_7_MD_PMEMSET) $(MANPAGES_7_MD)
MANPAGES_5_MD_WEB = $(MANPAGES_5_MD_PMEM2) $(MANPAGES_5_MD_PMEMSET) $(MANPAGES_5_MD)
MANPAGES_3_MD_WEB = $(MANPAGES_3_MD_PMEM2) $(MANPAGES_3_MD_PMEMSET) $(MANPAGES_3_MD)
MANPAGES_1_MD_WEB = $(MANPAGES_1_MD_PMEM2) $(MANPAGES_1_MD_PMEMSET) $(MANPAGES_1_MD)
MANPAGES_7_MD_WEB = $(MANPAGES_7_MD_PMEM2) $(MANPAGES_7_MD)
MANPAGES_5_MD_WEB = $(MANPAGES_5_MD_PMEM2) $(MANPAGES_5_MD)
MANPAGES_3_MD_WEB = $(MANPAGES_3_MD_PMEM2) $(MANPAGES_3_MD)
MANPAGES_1_MD_WEB = $(MANPAGES_1_MD_PMEM2) $(MANPAGES_1_MD)

MANPAGES = $(MANPAGES_7_GROFF) $(MANPAGES_5_GROFF) $(MANPAGES_3_GROFF) $(MANPAGES_1_GROFF) \
$(MANPAGES_7_NOINSTALL) $(MANPAGES_5_NOINSTALL) $(MANPAGES_3_NOINSTALL) $(MANPAGES_1_NOINSTALL)
Expand Down
1 change: 0 additions & 1 deletion doc/README
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ libpmemlog -- pmem-resident log files
libpmemobj -- transactional object store
libpmempool -- persistent memory pool management library
pmempool -- persistent memory pool management tool
libpmemset -- core functionality for any persistent application (EXPERIMENTAL)
daxio -- perform I/O on Device DAX device

These man pages provide the API specification for the corresponding libraries
Expand Down
34 changes: 0 additions & 34 deletions doc/libpmemset/.gitignore

This file was deleted.

1 change: 1 addition & 0 deletions doc/libpmemset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This library has been removed from PMDK.
68 changes: 0 additions & 68 deletions doc/libpmemset/libpmemset.7.md

This file was deleted.

Loading

0 comments on commit 06f10e7

Please sign in to comment.