From 1cc47503f833eb73c22348ebca7f2141b2b23629 Mon Sep 17 00:00:00 2001 From: Krzysztof Czurylo Date: Mon, 27 Nov 2017 20:00:54 +0100 Subject: [PATCH] common: rename NVML project to PMDK Prepares NVML (Non-Volatile memory Library) project to be renamed to PMDK (Persistent Memory Development Kit). Replaces all the occurences of NVML in README's, man pages and source code with the new name. Renames "nvml" namespace in libpmemobj C++ bindings to "pmem". --- .travis.yml | 22 ++-- CODING_STYLE.md | 19 +-- CONTRIBUTING.md | 36 ++--- Makefile | 12 +- README.md | 56 ++++---- appveyor.yml | 10 +- doc/Makefile | 2 +- doc/README | 13 +- doc/cppobj.Doxyfile | 6 +- doc/default.man | 2 +- doc/libpmem/libpmem.7.md | 6 +- doc/libpmem/pmem_flush.3.md | 2 +- doc/libpmem/pmem_is_pmem.3.md | 2 +- doc/libpmem/pmem_memmove_persist.3.md | 2 +- doc/libpmemblk/libpmemblk.7.md | 4 +- doc/libpmemblk/pmemblk_bsize.3.md | 2 +- doc/libpmemblk/pmemblk_create.3.md | 2 +- doc/libpmemblk/pmemblk_read.3.md | 2 +- doc/libpmemblk/pmemblk_set_zero.3.md | 2 +- doc/libpmemcto/libpmemcto.7.md | 8 +- doc/libpmemcto/pmemcto_aligned_alloc.3.md | 2 +- doc/libpmemcto/pmemcto_malloc.3.md | 2 +- .../pmemcto_malloc_usable_size.3.md | 2 +- doc/libpmemcto/pmemcto_open.3.md | 2 +- doc/libpmemcto/pmemcto_set_root_pointer.3.md | 2 +- doc/libpmemcto/pmemcto_stats_print.3.md | 2 +- doc/libpmemcto/pmemcto_strdup.3.md | 2 +- doc/libpmemcto/pmemcto_wcsdup.3.md | 2 +- doc/libpmemlog/libpmemlog.7.md | 4 +- doc/libpmemlog/pmemlog_append.3.md | 2 +- doc/libpmemlog/pmemlog_create.3.md | 2 +- doc/libpmemlog/pmemlog_nbyte.3.md | 2 +- doc/libpmemlog/pmemlog_tell.3.md | 2 +- doc/libpmemobj/libpmemobj.7.md | 4 +- doc/libpmemobj/oid_is_null.3.md | 2 +- doc/libpmemobj/pmemobj_action.3.md | 2 +- doc/libpmemobj/pmemobj_alloc.3.md | 2 +- doc/libpmemobj/pmemobj_ctl_get.3.md | 2 +- doc/libpmemobj/pmemobj_first.3.md | 2 +- doc/libpmemobj/pmemobj_list_insert.3.md | 2 +- doc/libpmemobj/pmemobj_memcpy_persist.3.md | 2 +- doc/libpmemobj/pmemobj_mutex_zero.3.md | 2 +- doc/libpmemobj/pmemobj_open.3.md | 2 +- doc/libpmemobj/pmemobj_root.3.md | 2 +- doc/libpmemobj/pmemobj_tx_add_range.3.md | 2 +- doc/libpmemobj/pmemobj_tx_alloc.3.md | 2 +- doc/libpmemobj/pmemobj_tx_begin.3.md | 2 +- doc/libpmemobj/pobj_layout_begin.3.md | 2 +- doc/libpmemobj/pobj_list_head.3.md | 2 +- doc/libpmemobj/toid_declare.3.md | 2 +- doc/libpmempool/libpmempool.7.md | 4 +- doc/libpmempool/pmempool_check_init.3.md | 2 +- doc/libpmempool/pmempool_rm.3.md | 2 +- doc/libpmempool/pmempool_sync.3.md | 2 +- doc/librpmem/librpmem.7.md | 2 +- doc/librpmem/rpmem_create.3.md | 2 +- doc/librpmem/rpmem_persist.3.md | 2 +- doc/libvmem/libvmem.7.md | 6 +- doc/libvmem/vmem_create.3.md | 2 +- doc/libvmem/vmem_malloc.3.md | 2 +- doc/libvmmalloc/libvmmalloc.7.md | 4 +- doc/macros.man | 12 +- doc/pmempool/pmempool-check.1.md | 2 +- doc/pmempool/pmempool-convert.1.md | 2 +- doc/pmempool/pmempool-create.1.md | 2 +- doc/pmempool/pmempool-dump.1.md | 2 +- doc/pmempool/pmempool-info.1.md | 4 +- doc/pmempool/pmempool-rm.1.md | 2 +- doc/pmempool/pmempool-sync.1.md | 2 +- doc/pmempool/pmempool-transform.1.md | 2 +- doc/pmempool/pmempool.1.md | 6 +- doc/poolset/poolset.5.md | 2 +- doc/rpmemd/rpmemd.1.md | 2 +- res/{NVML.ico => PMDK.ico} | Bin src/Makefile | 2 +- src/Makefile.inc | 8 +- src/{NVML.sln => PMDK.sln} | 2 +- src/README | 4 +- src/benchmarks/README | 4 +- src/common.inc | 2 +- src/common/common.rc | 6 +- src/common/dlsym.h | 6 +- src/common/errno_freebsd.h | 6 +- src/common/file.h | 4 +- src/common/file_windows.c | 4 +- src/common/fs.h | 6 +- src/common/mmap.h | 4 +- src/common/os.h | 4 +- src/common/out.h | 4 +- src/common/pmemcommon.inc | 2 +- src/common/pool_hdr.c | 18 +-- src/common/pool_hdr.h | 14 +- src/common/set.h | 4 +- src/common/sys_util.h | 4 +- src/common/util.h | 4 +- src/common/util_pmem.h | 4 +- src/common/uuid.h | 4 +- src/common/valgrind_internal.h | 4 +- src/common/vec.h | 6 +- src/examples/Makefile | 2 +- src/examples/Makefile.inc | 2 +- src/examples/README | 46 ++++--- src/examples/libpmem/README | 10 +- src/examples/libpmem/full_copy.vcxproj | 2 +- src/examples/libpmem/manpage.vcxproj | 2 +- src/examples/libpmem/simple_copy.vcxproj | 2 +- src/examples/libpmemblk/README | 10 +- src/examples/libpmemblk/assetdb/README | 2 +- .../libpmemblk/assetdb/asset_checkin.vcxproj | 2 +- .../libpmemblk/assetdb/asset_checkout.vcxproj | 2 +- .../libpmemblk/assetdb/asset_list.vcxproj | 2 +- .../libpmemblk/assetdb/asset_load.vcxproj | 2 +- src/examples/libpmemblk/manpage.vcxproj | 2 +- src/examples/libpmemcto/README | 10 +- src/examples/libpmemcto/life/README | 2 +- src/examples/libpmemcto/lifesaver/README | 2 +- src/examples/libpmemlog/README | 10 +- src/examples/libpmemlog/logfile/Makefile | 4 +- src/examples/libpmemlog/logfile/README | 2 +- .../libpmemlog/logfile/addlog.vcxproj | 2 +- .../libpmemlog/logfile/printlog.vcxproj | 2 +- src/examples/libpmemlog/manpage.vcxproj | 2 +- src/examples/libpmemobj/README | 8 +- src/examples/libpmemobj/array/README | 2 +- src/examples/libpmemobj/array/array.vcxproj | 2 +- src/examples/libpmemobj/btree.vcxproj | 2 +- src/examples/libpmemobj/cpp/queue.vcxproj | 2 +- .../libpmemobj/cpp_map/map_cli.vcxproj | 2 +- .../libpmemobj/hashmap/hashmap_atomic.vcxproj | 2 +- .../libpmemobj/hashmap/hashmap_tx.vcxproj | 2 +- src/examples/libpmemobj/linkedlist/README | 2 +- .../libpmemobj/linkedlist/fifo.vcxproj | 2 +- .../libpmemobj/list_map/list_map.vcxproj | 2 +- src/examples/libpmemobj/lists.vcxproj | 2 +- src/examples/libpmemobj/manpage.vcxproj | 2 +- .../libpmemobj/map/data_store.vcxproj | 2 +- src/examples/libpmemobj/map/libmap.vcxproj | 2 +- src/examples/libpmemobj/map/mapcli.vcxproj | 2 +- src/examples/libpmemobj/panaconda/README | 2 +- src/examples/libpmemobj/pi.vcxproj | 2 +- src/examples/libpmemobj/pman/README | 2 +- src/examples/libpmemobj/pman/pman.cpp | 2 +- src/examples/libpmemobj/pmemblk/README | 2 +- .../libpmemobj/pmemblk/obj_pmemblk.vcxproj | 2 +- src/examples/libpmemobj/pmemlog/README | 2 +- .../libpmemobj/pmemlog/obj_pmemlog.vcxproj | 2 +- .../pmemlog/obj_pmemlog_macros.vcxproj | 2 +- .../pmemlog/obj_pmemlog_minimal.vcxproj | 2 +- .../pmemlog/obj_pmemlog_simple.vcxproj | 2 +- src/examples/libpmemobj/pmemobjfs/README | 2 +- src/examples/libpmemobj/pminvaders/README | 2 +- src/examples/libpmemobj/pmpong/README | 2 +- src/examples/libpmemobj/pmpong/pmpong.vcxproj | 2 +- .../libpmemobj/string_store/reader.vcxproj | 2 +- .../libpmemobj/string_store/writer.vcxproj | 2 +- .../libpmemobj/string_store_tx/reader.vcxproj | 2 +- .../libpmemobj/string_store_tx/writer.vcxproj | 2 +- .../string_store_tx_type/reader.vcxproj | 2 +- .../string_store_tx_type/writer.vcxproj | 2 +- .../libpmemobj/tree_map/btree_map.vcxproj | 2 +- .../libpmemobj/tree_map/ctree_map.vcxproj | 2 +- .../libpmemobj/tree_map/rbtree_map.vcxproj | 2 +- .../libpmemobj/tree_map/rtree_map.vcxproj | 2 +- src/examples/libpmempool/README | 10 +- src/examples/librpmem/README | 2 + src/examples/libvmem/README | 8 +- src/examples/libvmem/manpage.vcxproj | 2 +- src/freebsd/README | 4 +- src/include/README | 6 +- src/include/libpmemobj++/allocator.hpp | 2 +- src/jemalloc/INSTALL | 2 +- src/jemalloc/Makefile.libpmemcto | 2 +- src/jemalloc/Makefile.libvmem | 2 +- src/jemalloc/Makefile.libvmmalloc | 2 +- src/jemalloc/README.libvmem | 2 +- src/jemalloc/jemalloc.mk | 2 +- src/libpmem/cpu.h | 6 +- src/libpmem/libpmem.def | 4 +- src/libpmemcto/Makefile | 2 +- src/libvmem/Makefile | 2 +- src/libvmmalloc/Makefile | 2 +- src/test/README | 4 +- src/test/arch_flags/README | 2 +- src/test/blk_nblock/README | 2 +- src/test/blk_non_zero/README | 6 +- src/test/blk_pool/README | 2 +- src/test/blk_recovery/README | 2 +- src/test/blk_rw/README | 2 +- src/test/blk_rw_mt/README | 2 +- src/test/bttdevice/README | 2 +- src/test/cto_pool/README | 2 +- src/test/ex_libpmem/README | 2 +- src/test/ex_libpmemblk/README | 2 +- src/test/ex_libpmemcto/README | 2 +- src/test/ex_libpmemcto/TEST1 | 2 +- src/test/ex_libpmemcto/out1.log.match | 4 +- src/test/ex_libpmemlog/README | 2 +- src/test/ex_libpmemlog/TEST0 | 2 +- src/test/ex_libpmemlog/TEST0.PS1 | 2 +- src/test/ex_libpmemlog/out0.log.match | 2 +- src/test/ex_libpmemobj/README | 2 +- src/test/ex_linkedlist/README | 2 +- src/test/libpmempool_api/README | 2 +- src/test/libpmempool_api_win/README | 2 +- src/test/libpmempool_backup/README | 2 +- src/test/libpmempool_bttdev/README | 2 +- src/test/libpmempool_map_flog/README | 2 +- src/test/libpmempool_rm/README | 2 +- src/test/libpmempool_rm_win/README | 2 +- src/test/libpmempool_sync/README | 2 +- src/test/libpmempool_sync_win/README | 2 +- src/test/libpmempool_transform/README | 2 +- src/test/log_basic/README | 2 +- src/test/log_pool/README | 2 +- src/test/log_recovery/README | 2 +- src/test/log_walker/README | 2 +- src/test/magic/README | 6 +- src/test/magic/TEST0 | 2 +- src/test/obj_convert/TEST0 | 2 +- src/test/obj_convert/TEST11 | 2 +- src/test/obj_convert/TEST12 | 2 +- src/test/obj_convert/TEST13 | 2 +- src/test/obj_convert/TEST14 | 2 +- src/test/obj_convert/TEST15 | 2 +- src/test/obj_convert/TEST16 | 2 +- src/test/obj_convert/TEST17 | 2 +- src/test/obj_convert/TEST18 | 2 +- src/test/obj_convert/TEST19 | 2 +- src/test/obj_convert/TEST3 | 2 +- src/test/obj_convert/TEST4 | 2 +- src/test/obj_convert/common.sh | 4 +- src/test/obj_debug/README | 2 +- src/test/obj_first_next/README | 2 +- src/test/obj_list/README | 2 +- src/test/obj_list_insert/README | 2 +- src/test/obj_list_macro/README | 2 +- src/test/obj_list_move/README | 2 +- src/test/obj_list_recovery/README | 2 +- src/test/obj_list_remove/README | 2 +- src/test/obj_list_valgrind/README | 2 +- src/test/obj_persist_count/README | 2 +- src/test/obj_pool/README | 2 +- src/test/obj_redo_log/README | 2 +- src/test/obj_sync/README | 2 +- src/test/obj_tx_locks/README | 2 +- src/test/obj_tx_locks_abort/README | 2 +- src/test/pmem_is_pmem/README | 2 +- src/test/pmem_is_pmem_linux/README | 2 +- src/test/pmem_is_pmem_windows/README | 2 +- src/test/pmem_map_file/README | 2 +- src/test/pmem_map_file_win/README | 2 +- src/test/pmem_memcpy/README | 2 +- src/test/pmem_memmove/README | 2 +- src/test/pmem_memset/README | 2 +- src/test/pmem_movnt/README | 2 +- src/test/pmem_movnt_align/README | 2 +- src/test/pmem_valgr_simple/README | 2 +- src/test/pmempool_check/README | 2 +- src/test/pmempool_create/README | 2 +- src/test/pmempool_dump/README | 2 +- src/test/pmempool_help/README | 2 +- src/test/pmempool_info/README | 2 +- src/test/pmempool_rm/README | 2 +- src/test/pmempool_sync/README | 2 +- src/test/pmempool_transform/README | 2 +- src/test/pmempool_transform_remote/README | 2 +- src/test/remote_basic/README | 2 +- src/test/remote_obj_basic/README | 2 +- src/test/rpmemd_config/README | 2 +- src/test/rpmemd_db/README | 2 +- src/test/rpmemd_log/README | 2 +- src/test/rpmemd_util/README | 2 +- src/test/testconfig.ps1.example | 2 +- src/test/testconfig.sh.example | 4 +- src/test/tools/bttcreate/README | 2 +- src/test/tools/cmpmap/README | 2 +- src/test/tools/ctrld/README | 2 +- src/test/tools/ddmap/README | 2 +- src/test/tools/dllview/README | 2 +- src/test/tools/pmemalloc/README | 2 +- src/test/tools/pmemdetect/README | 2 +- src/test/tools/pmemspoil/README | 4 +- src/test/tools/pmemwrite/README | 2 +- src/test/tools/sparsefile/README | 2 +- src/test/unicode_api/README | 2 +- src/test/unicode_match_script/README | 2 +- src/test/unittest/README | 4 +- src/test/unittest/unittest.h | 2 +- src/test/unittest/unittest.ps1 | 2 +- src/test/util_file_create/README | 2 +- src/test/util_file_open/README | 2 +- src/test/util_is_poolset/README | 2 +- src/test/util_map_proc/README | 2 +- src/test/util_poolset/README | 2 +- src/test/util_poolset_foreach/README | 2 +- src/test/util_poolset_parse/README | 2 +- src/test/util_poolset_size/README | 2 +- src/test/vmem_delete/README | 2 +- src/test/vmmalloc_fork/README | 2 +- src/test/vmmalloc_init/README | 2 +- src/test/vmmalloc_malloc_hooks/README | 2 +- src/test/win_common/README | 2 +- src/test/win_lists/README | 4 +- src/test/win_mmap/win_mmap.c | 2 +- src/test/win_mmap_fixed/win_mmap_fixed.c | 2 +- src/tools/pmempool/README | 10 +- src/tools/pmempool/output.c | 10 +- src/tools/pmempool/pmempool.rc | Bin 3722 -> 3722 bytes src/version.inc | 2 +- src/windows/README | 8 +- src/windows/getopt/README | 2 +- src/windows/include/platform.h | 4 +- src/windows/setup/OUTPUT_MSI.PS1 | 4 +- src/windows/setup/README.md | 40 +++--- src/windows/setup/README.rtf | 24 ++-- src/windows/setup/pages/NVM_Library.url | 2 - src/windows/setup/pages/PMDK.url | 2 + src/windows/setup/setup.vdproj | 50 +++---- src/windows/win_mmap.c | 4 +- utils/CREATE-ZIP.PS1 | 10 +- utils/README | 2 +- utils/build-dpkg.sh | 124 +++++++++--------- utils/check-commit.sh | 6 +- utils/check-doc.sh | 4 +- utils/docker/README | 10 +- utils/docker/build-local.sh | 20 +-- utils/docker/build-travis.sh | 14 +- utils/docker/configure-tests.sh | 2 +- utils/docker/images/Dockerfile.fedora-25 | 2 +- utils/docker/images/Dockerfile.ubuntu-16.04 | 2 +- utils/docker/images/README | 4 +- utils/docker/images/build-image.sh | 2 +- utils/docker/prepare-for-build.sh | 2 +- utils/docker/pull-or-rebuild-image.sh | 8 +- utils/docker/run-build-package.sh | 2 +- utils/docker/run-build.sh | 2 +- utils/docker/run-coverage.sh | 2 +- utils/get_aliases.sh | 2 +- utils/libpmem.pc.in | 4 +- utils/libpmemblk.pc.in | 4 +- utils/libpmemcto.pc.in | 4 +- utils/libpmemlog.pc.in | 4 +- utils/libpmemobj++.pc.in | 4 +- utils/libpmemobj.pc.in | 4 +- utils/libpmempool.pc.in | 4 +- utils/librpmem.pc.in | 4 +- utils/libvmem.pc.in | 4 +- utils/libvmmalloc.pc.in | 4 +- utils/magic-install.sh | 8 +- utils/magic-uninstall.sh | 12 +- utils/nvml.spec.in | 110 ++++++++-------- utils/pkg-config.sh | 8 +- utils/{nvml.magic => pmdk.magic} | 6 +- utils/sort_solution | 4 +- 354 files changed, 801 insertions(+), 787 deletions(-) rename res/{NVML.ico => PMDK.ico} (100%) rename src/{NVML.sln => PMDK.sln} (99%) delete mode 100644 src/windows/setup/pages/NVM_Library.url create mode 100644 src/windows/setup/pages/PMDK.url rename utils/{nvml.magic => pmdk.magic} (69%) diff --git a/.travis.yml b/.travis.yml index 733fa888a61..bb6f78ece85 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,17 +12,17 @@ services: env: matrix: - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=gcc NVML_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=debug COVERAGE=1 - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=gcc NVML_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=debug - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=gcc NVML_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=nondebug - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=clang NVML_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=ubuntu OS_VER=16.04 TEST_BUILD=debug - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=clang NVML_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=ubuntu OS_VER=16.04 TEST_BUILD=nondebug - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=clang NVML_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=fedora OS_VER=25 TEST_BUILD=debug - - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 NVML_CC=clang NVML_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=fedora OS_VER=25 TEST_BUILD=nondebug - - MAKE_PKG=1 NVML_CC=gcc NVML_CXX=g++ OS=ubuntu OS_VER=16.04 EXPERIMENTAL=y - - MAKE_PKG=1 NVML_CC=clang NVML_CXX=clang++ OS=ubuntu OS_VER=16.04 EXPERIMENTAL=y - - MAKE_PKG=1 NVML_CC=gcc NVML_CXX=g++ OS=fedora OS_VER=25 EXPERIMENTAL=y - - COVERITY=1 REMOTE_TESTS=1 NVML_CC=gcc NVML_CXX=g++ OS=ubuntu OS_VER=16.04 + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=gcc PMDK_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=debug COVERAGE=1 + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=gcc PMDK_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=debug + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=gcc PMDK_CXX=g++ OS=ubuntu OS_VER=16.04 TEST_BUILD=nondebug + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=clang PMDK_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=ubuntu OS_VER=16.04 TEST_BUILD=debug + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=clang PMDK_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=ubuntu OS_VER=16.04 TEST_BUILD=nondebug + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=clang PMDK_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=fedora OS_VER=25 TEST_BUILD=debug + - MAKE_PKG=0 EXTRA_CFLAGS=-DUSE_VALGRIND REMOTE_TESTS=1 PMDK_CC=clang PMDK_CXX=clang++ USE_LLVM_LIBCPP=1 LIBCPP_LIBDIR=/usr/local/libcxx/lib LIBCPP_INCDIR=/usr/local/libcxx/include/c++/v1 OS=fedora OS_VER=25 TEST_BUILD=nondebug + - MAKE_PKG=1 PMDK_CC=gcc PMDK_CXX=g++ OS=ubuntu OS_VER=16.04 EXPERIMENTAL=y + - MAKE_PKG=1 PMDK_CC=clang PMDK_CXX=clang++ OS=ubuntu OS_VER=16.04 EXPERIMENTAL=y + - MAKE_PKG=1 PMDK_CC=gcc PMDK_CXX=g++ OS=fedora OS_VER=25 EXPERIMENTAL=y + - COVERITY=1 REMOTE_TESTS=1 PMDK_CC=gcc PMDK_CXX=g++ OS=ubuntu OS_VER=16.04 before_install: - export HOST_WORKDIR=`pwd` diff --git a/CODING_STYLE.md b/CODING_STYLE.md index 318c17b31ac..36ff2930115 100644 --- a/CODING_STYLE.md +++ b/CODING_STYLE.md @@ -1,16 +1,17 @@ -# C Style and Coding Standards for NVM Library +# C Style and Coding Standards for Persistent Memory Development Kit This document defines the coding standards and conventions for writing -NVM Library code. To ensure readability and consistency within the code, +PMDK code. To ensure readability and consistency within the code, the contributed code must adhere to the rules below. ### Introduction -The NVM Library coding style is quite similar to the style used for the SunOS product. +The Persistent Memory Development Kit coding style is quite similar to the style +used for the SunOS product. A full description of that standard can be found [here.](https://www.cis.upenn.edu/~lee/06cse480/data/cstyle.ms.pdf) This document does not cover the entire set of recommendations and formatting rules -used in writing NVML code, but rather focuses on some NVML-specific conventions, +used in writing PMDK code, but rather focuses on some PMDK-specific conventions, not described in the document mentioned above, as well as the ones the violation of which is most frequently observed during the code review. Also, keep in mind that more important than the particular style is **consistency** @@ -19,7 +20,7 @@ coded in the same style as the file being modified. ### Code formatting Most of the common stylistic errors can be detected by the -[style checker program](https://github.com/pmem/nvml/blob/master/utils/cstyle) +[style checker program](https://github.com/pmem/pmdk/blob/master/utils/cstyle) included in the repo. Simply run `make cstyle` or `CSTYLE.ps1` to verify if your code is well-formatted. @@ -46,8 +47,8 @@ Otherwise, just use `unsigned`, `long`, etc. ### License & copyright - Make sure you have the right to submit your contribution under the BSD license, especially if it is based upon previous work. -See [CONTRIBUTING.md](https://github.com/pmem/nvml/blob/master/CONTRIBUTING.md) for details. -- A copy of the [BSD-style License](https://github.com/pmem/nvml/blob/master/LICENSE) +See [CONTRIBUTING.md](https://github.com/pmem/pmdk/blob/master/CONTRIBUTING.md) for details. +- A copy of the [BSD-style License](https://github.com/pmem/pmdk/blob/master/LICENSE) must be placed at the beginning of each source file, script or man page (Obviously, it does not apply to README's, Visual Studio projects and \*.match files.) - When adding a new file to the repo, or when making a contribution to an existing @@ -93,8 +94,8 @@ log level for most frequently called routines. ### Unit tests - There **must** be unit tests provided for each new function/module added. - Test scripts **must** start with `#!/usr/bin/env ` for portability between Linux and FreeBSD. -- Please, see [this](https://github.com/pmem/nvml/blob/master/src/test/README) -and [that](https://github.com/pmem/nvml/blob/master/src/test/unittest/README) +- Please, see [this](https://github.com/pmem/pmdk/blob/master/src/test/README) +and [that](https://github.com/pmem/pmdk/blob/master/src/test/unittest/README) document to get familiar with our test framework and the guidelines on how to write and run unit tests. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 319f669ec06..1ca7b653908 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,20 +1,21 @@ -# Contributing to the NVM Library +# Contributing to the Persistent Memory Development Kit -Here you'll find instructions on how to contribute to the NVM Library. +Here you'll find instructions on how to contribute to the +Persistent Memory Development Kit. Your contributions are most welcome! You'll find it is best to begin with a conversation about your changes, rather than just writing a bunch of code and contributing it out of the blue. There are several good ways to suggest new features, offer to add a feature, -or just begin a dialog about the NVM Library: +or just begin a dialog about the Persistent Memory Development Kit: * Open an issue in our [GitHub Issues Database](https://github.com/pmem/issues/issues) * Suggest a feature, ask a question, start a discussion, etc. in our [pmem Google group](http://groups.google.com/group/pmem) -* Chat with members of the NVM Library team real-time on the **#pmem** IRC channel on [OFTC](http://www.oftc.net) +* Chat with members of the PMDK team real-time on the **#pmem** IRC channel on [OFTC](http://www.oftc.net) **NOTE: If you do decide to implement code changes and contribute them, please make sure you agree your contribution can be made available -under the [BSD-style License used for the NVM Library](https://github.com/pmem/nvml/blob/master/LICENSE).** +under the [BSD-style License used for the Persistent Memory Development Kit](https://github.com/pmem/pmdk/blob/master/LICENSE).** **NOTE: Submitting your changes also means that you certify the following:** @@ -51,7 +52,8 @@ i.e. via email or by including a `Signed-off-by:` line at the bottom of your commit comments. To improve tracking of who is the author of a contribution, we kindly ask you -to use your real name (not an alias) when committing your changes to the NVM Library: +to use your real name (not an alias) when committing your changes to the +Persistent Memory Development Kit: ``` Author: Random J Developer ``` @@ -60,7 +62,7 @@ Author: Random J Developer Please feel free to use the forums mentioned above to ask for comments & questions on your code before submitting -a pull request. The NVM Library project uses the common +a pull request. The Persistent Memory Development Kit project uses the common *fork and merge* workflow used by most GitHub-hosted projects. The [Git Workflow blog article](http://pmem.io/2014/09/09/git-workflow.html) describes our workflow in more detail. @@ -92,7 +94,7 @@ no clang-format or it pointing to an older version. In such case run: On Windows to check the code for style issues, please run: ``` - $ nvml\utils\CSTYLE.ps1 + $ pmdk\utils\CSTYLE.ps1 ``` To check or format C++ files, you may use a standalone Visual Studio plugin @@ -100,34 +102,34 @@ for clang-format. The plugin installer can be downloaded from [LLVM Builds](http://llvm.org/builds) page. -If you are actively working on an NVM Library feature, please let other +If you are actively working on an PMDK feature, please let other developers know by [creating an issue](https://github.com/pmem/issues/issues). Use the label `Type: Feature` and assign it to yourself (due to the way GitHub permissions work, you may need to ask a team member to assign it to you). ### Bug Reports -Bugs for the NVM Library project are tracked in our +Bugs for the PMDK project are tracked in our [GitHub Issues Database](https://github.com/pmem/issues/issues). When creating a bug report issue, please provide the following information: -#### NVML version +#### PMDK version -Put the release name of the version of NVML running when the -bug was discovered in a bug comment. If you saw this bug in multiple NVML +Put the release name of the version of PMDK running when the +bug was discovered in a bug comment. If you saw this bug in multiple PMDK versions, please put at least the most recent version and list the others if necessary. - Stable release names are in the form `#.#` (where `#` represents an integer); for example `0.3`. - Release names from working versions look like `#.#+b#` (adding a build #) or `#.#-rc#` (adding a release candidate number) -If NVML was built from source, the version number can be retrieved +If PMDK was built from source, the version number can be retrieved from git using this command: `git describe` -For binary NVML releases, use the entire package name. -For RPMs, use `rpm -q nvml` to display the name. -For Deb packages, run `dpkg-query -W nvml` and use the +For binary PMDK releases, use the entire package name. +For RPMs, use `rpm -q pmdk` to display the name. +For Deb packages, run `dpkg-query -W pmdk` and use the second (version) string. #### Milestone field diff --git a/Makefile b/Makefile index c8c3ea31d90..5e747c0a918 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Makefile -- top-level Makefile for NVM Library +# Makefile -- top-level Makefile for PMDK # # Use "make" to build the library. # @@ -56,7 +56,7 @@ # Use "make dpkg" to build dpkg packages # # Use "make source DESTDIR=path_to_dir" to copy source files -# from HEAD to 'path_to_dir/nvml' directory. +# from HEAD to 'path_to_dir/pmdk' directory. # # As root, use "make install" to install the library in the usual # locations (/usr/local/lib, /usr/local/include, and /usr/local/share/man). @@ -127,15 +127,15 @@ source: $(if $(shell git rev-parse 2>&1), $(error Not a git repository)) $(if $(DESTDIR), , $(error Please provide DESTDIR variable)) $(if $(shell git status --porcelain), $(error Working directory is dirty: $(shell git status --porcelain))) - mkdir -p $(DESTDIR)/nvml - echo -n $(SRCVERSION) > $(DESTDIR)/nvml/.version - git archive HEAD | tar -x -C $(DESTDIR)/nvml + mkdir -p $(DESTDIR)/pmdk + echo -n $(SRCVERSION) > $(DESTDIR)/pmdk/.version + git archive HEAD | tar -x -C $(DESTDIR)/pmdk pkg-clean: $(RM) -r $(DESTDIR) rpm dpkg: pkg-clean source - +utils/build-$@.sh $(SRCVERSION) $(DESTDIR)/nvml $(DESTDIR) $(CURDIR)/$@\ + +utils/build-$@.sh $(SRCVERSION) $(DESTDIR)/pmdk $(DESTDIR) $(CURDIR)/$@\ ${EXPERIMENTAL} ${BUILD_PACKAGE_CHECK} ${BUILD_RPMEM} ${TEST_CONFIG_FILE} ${DISTRO} install uninstall: diff --git a/README.md b/README.md index 3f1ca38d8d3..28c7853d6a4 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ -nvml: Non-Volatile Memory Library -================================= +pmdk: Persistent Memory Development Kit +======================================= -[![Build Status](https://travis-ci.org/pmem/nvml.svg?branch=master)](https://travis-ci.org/pmem/nvml) -[![Build status](https://ci.appveyor.com/api/projects/status/sehrom4f1neihucf/branch/master?svg=true&pr=false)](https://ci.appveyor.com/project/pmem/nvml/branch/master) -[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/3015.svg)](https://scan.coverity.com/projects/pmem-nvml) -[![NVML release version](https://img.shields.io/github/release/pmem/nvml.svg)](https://github.com/pmem/nvml/releases/latest) -[![Coverage Status](https://codecov.io/github/pmem/nvml/coverage.svg?branch=master)](https://codecov.io/gh/pmem/nvml/branch/master) +[![Build Status](https://travis-ci.org/pmem/pmdk.svg?branch=master)](https://travis-ci.org/pmem/pmdk) +[![Build status](https://ci.appveyor.com/api/projects/status/sehrom4f1neihucf/branch/master?svg=true&pr=false)](https://ci.appveyor.com/project/pmem/pmdk/branch/master) +[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/3015.svg)](https://scan.coverity.com/projects/pmem-pmdk) +[![PMDK release version](https://img.shields.io/github/release/pmem/pmdk.svg)](https://github.com/pmem/pmdk/releases/latest) +[![Coverage Status](https://codecov.io/github/pmem/pmdk/coverage.svg?branch=master)](https://codecov.io/gh/pmem/pmdk/branch/master) -This is the top-level README.md of the NVM Library. +This is the top-level README.md of the Persistent Memory Development Kit. For more information, see http://pmem.io. ### The Libraries ### -Please see the file [LICENSE](https://github.com/pmem/nvml/blob/master/LICENSE) +Please see the file [LICENSE](https://github.com/pmem/pmdk/blob/master/LICENSE) for information on how this library is licensed. This tree contains a collection of libraries for using Non-Volatile Memory @@ -38,9 +38,9 @@ and tutorials. >1 Not supported on Windows. > ->2 NVML for Windows is feature complete, but not yet considered production quality. +>2 PMDK for Windows is feature complete, but not yet considered production quality. > ->3 DAX and **libfabric** are not yet supported in FreeBSD, so at this time NVML is available as a technical preview release for development purposes. +>3 DAX and **libfabric** are not yet supported in FreeBSD, so at this time PMDK is available as a technical preview release for development purposes. ### Pre-Built Packages ### @@ -54,7 +54,7 @@ Builds are tagged something like `0.2+b1`, which means are the simpler *major.minor* tags like `0.2`. To find pre-build packages, check the Downloads associated with the stable releases on the -[github release page](https://github.com/pmem/nvml/releases). +[github release page](https://github.com/pmem/pmdk/releases). ### Building The Source ### @@ -67,11 +67,11 @@ The source tree is organized as follows: * **src/examples** -- brief example programs using these libraries * **src/freebsd** -- FreeBSD-specific header files * **src/test** -- unit tests used by development team -* **src/tools** -- various tools developed for NVML +* **src/tools** -- various tools developed for PMDK * **src/windows** -- Windows-specific source and header files * **utils** -- utilities used during build & test * **CONTRIBUTING.md** -- instructions for people wishing to contribute -* **CODING_STYLE.md** -- coding standard and conventions for NVML +* **CODING_STYLE.md** -- coding standard and conventions for PMDK To build this library on Linux, you may need to install the following required packages on the build system: @@ -80,7 +80,7 @@ required packages on the build system: * **pkg-config** -On Windows, to build NVML and run the tests you need: +On Windows, to build PMDK and run the tests you need: * **MS Visual Studio 2015** * [Windows SDK 10.0.14393](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) (or later) * **perl** (i.e. [ActivePerl](http://www.activestate.com/activeperl/downloads)) @@ -106,23 +106,23 @@ displayed instead. For details please read the **DEPENDENCIES** section in the appropriate README file. -See our [Dockerfiles](https://github.com/pmem/nvml/blob/master/utils/docker/images/) +See our [Dockerfiles](https://github.com/pmem/pmdk/blob/master/utils/docker/images/) to get an idea what packages are required to build on the _Travis-CI_ system. >4 The pkg version of ncurses is required for proper operation; the base version included in FreeBSD is not sufficient. -#### Building NVML on Linux or FreeBSD #### +#### Building PMDK on Linux or FreeBSD #### To build the latest development version, just clone this tree and build the master branch: ``` - $ git clone https://github.com/pmem/nvml - $ cd nvml + $ git clone https://github.com/pmem/pmdk + $ cd pmdk ``` -Once the build system is setup, the NVM Library is built using -the `make`5 command at the top level: +Once the build system is setup, the Persistent Memory Development Kit is built +using the `make`5 command at the top level: ``` $ make ``` @@ -166,7 +166,7 @@ generate the documentation separately, run: ``` **DEPENDENCIES:** doxygen, graphviz, pandoc7 -To install a complete copy of the source tree to $(DESTDIR)/nvml: +To install a complete copy of the source tree to $(DESTDIR)/pmdk: ``` $ make source DESTDIR=some_path ``` @@ -271,13 +271,13 @@ For example, when using a custom version of libc++(version 3.9) installed to /us > >9 The address sanitizer is not supported for libvmmalloc on FreeBSD and will be ignored. -#### Building NVML on Windows #### +#### Building PMDK on Windows #### -Clone the NVML tree and open the solution: +Clone the PMDK tree and open the solution: ``` - > git clone https://github.com/pmem/nvml - > cd nvml/src - > devenv NVML.sln + > git clone https://github.com/pmem/pmdk + > cd pmdk/src + > devenv PMDK.sln ``` Select the desired configuration (Debug or Release) and build the solution @@ -292,7 +292,7 @@ in the example file (src/test/testconfig.ps1.example). To run the unit tests, open the PowerShell console and type: ``` - > cd nvml/src/test + > cd pmdk/src/test > RUNTESTS.ps1 ``` diff --git a/appveyor.yml b/appveyor.yml index 545f2af921e..4722fa722d7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ configuration: - Setup environment: - solutionname: NVML.sln + solutionname: PMDK.sln matrix: fast_finish: true @@ -79,10 +79,10 @@ test_script: artifacts: - path: 'src\windows\setup\*.msi' - name: NVML_msi + name: PMDK_msi - path: 'src\x64\*.zip' - name: NVML - + name: PMDK + - path: '*examples*.zip' - name: NVML_examples + name: PMDK_examples diff --git a/doc/Makefile b/doc/Makefile index ee3d401e5b4..72eb3745d4a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -31,7 +31,7 @@ # # -# doc/Makefile -- Makefile for NVM library man pages +# doc/Makefile -- Makefile for PMDK man pages # include ../src/common.inc diff --git a/doc/README b/doc/README index ebe231b1b33..3ba38df552c 100644 --- a/doc/README +++ b/doc/README @@ -1,11 +1,12 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is doc/README. -Subdirectories of this directory contain source for the man pages for the NVM -Library in markdown format (.md files). If you're looking for documentation to -get you started using NVML, start here: http://pmem.io/nvml and follow the -links to examples and man pages. Developers new to NVML are probably looking +Subdirectories of this directory contain source for the man pages for the +Persistent Memory Development Kit in markdown format (.md files). +If you're looking for documentation to +get you started using PMDK, start here: http://pmem.io/pmdk and follow the +links to examples and man pages. Developers new to PMDK are probably looking for libpmemobj. To generate web-based documentation or Linux/FreeBSD man pages, you need to @@ -15,7 +16,7 @@ documentation. The macros are defined in macros.man. Processing is performed by the ../utils/md2man.sh script. All files in the *generated* directory are automatically generated and updated -by the nvml-bot. **DO NOT MODIFY THE FILES IN THAT DIRECTORY**. All changes to +by the pmdk-bot. **DO NOT MODIFY THE FILES IN THAT DIRECTORY**. All changes to the documentation must be made by modifying the *.md files in the following document subdirectories: diff --git a/doc/cppobj.Doxyfile b/doc/cppobj.Doxyfile index 751948f8eeb..27bacfc9aaf 100644 --- a/doc/cppobj.Doxyfile +++ b/doc/cppobj.Doxyfile @@ -17,19 +17,19 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "NVML C++ bindings" +PROJECT_NAME = "PMDK C++ bindings" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.1.0" +PROJECT_NUMBER = "1.2.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "This is the C++ bindings documentation for NVML's libpmemobj." +PROJECT_BRIEF = "This is the C++ bindings documentation for PMDK's libpmemobj." # With the PROJECT_LOGO tag one can specify an logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels diff --git a/doc/default.man b/doc/default.man index 99e1b7fab97..0acb797925f 100644 --- a/doc/default.man +++ b/doc/default.man @@ -8,7 +8,7 @@ $endif$ $if(adjusting)$ .ad $adjusting$ $endif$ -.TH "$title$" "$section$" "$date$" "NVM Library - $version$" "NVML Programmer's Manual" +.TH "$title$" "$section$" "$date$" "PMDK - $version$" "PMDK Programmer's Manual" $if(hyphenate)$ .hy $else$ diff --git a/doc/libpmem/libpmem.7.md b/doc/libpmem/libpmem.7.md index a6602af90f9..d413230977f 100644 --- a/doc/libpmem/libpmem.7.md +++ b/doc/libpmem/libpmem.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEM, 7) collection: libpmem -header: NVM Library +header: PMDK date: pmem API version 1.0 ... @@ -249,7 +249,7 @@ direct pointer to the object. >NOTE: **Setting this environment variable -affects all the NVM libraries,** disabling mapping address randomization +affects all the PMDK libraries,** disabling mapping address randomization and causing the specified address to be used as a hint about where to place the mapping. @@ -373,7 +373,7 @@ main(int argc, char *argv[]) } ``` -See +See for more examples using the **libpmem** API. diff --git a/doc/libpmem/pmem_flush.3.md b/doc/libpmem/pmem_flush.3.md index a75b5ba8a7e..b196d492681 100644 --- a/doc/libpmem/pmem_flush.3.md +++ b/doc/libpmem/pmem_flush.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEM_FLUSH, 3) collection: libpmem -header: NVM Library +header: PMDK date: pmem API version 1.0 ... diff --git a/doc/libpmem/pmem_is_pmem.3.md b/doc/libpmem/pmem_is_pmem.3.md index 5e4d4a82839..60c1a7d7d26 100644 --- a/doc/libpmem/pmem_is_pmem.3.md +++ b/doc/libpmem/pmem_is_pmem.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEM_IS_PMEM, 3) collection: libpmem -header: NVM Library +header: PMDK date: pmem API version 1.0 ... diff --git a/doc/libpmem/pmem_memmove_persist.3.md b/doc/libpmem/pmem_memmove_persist.3.md index cc8c0a58fa4..baacdb8b002 100644 --- a/doc/libpmem/pmem_memmove_persist.3.md +++ b/doc/libpmem/pmem_memmove_persist.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEM_MEMMOVE_PERSIST, 3) collection: libpmem -header: NVM Library +header: PMDK date: pmem API version 1.0 ... diff --git a/doc/libpmemblk/libpmemblk.7.md b/doc/libpmemblk/libpmemblk.7.md index 578dee0bc58..90802418d18 100644 --- a/doc/libpmemblk/libpmemblk.7.md +++ b/doc/libpmemblk/libpmemblk.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEMBLK, 7) collection: libpmemblk -header: NVM Library +header: PMDK date: pmemblk API version 1.0 ... @@ -325,7 +325,7 @@ main(int argc, char *argv[]) } ``` -See for more examples using the **libpmemblk** API. +See for more examples using the **libpmemblk** API. # BUGS # diff --git a/doc/libpmemblk/pmemblk_bsize.3.md b/doc/libpmemblk/pmemblk_bsize.3.md index 65e4690b883..cf057cf7c01 100644 --- a/doc/libpmemblk/pmemblk_bsize.3.md +++ b/doc/libpmemblk/pmemblk_bsize.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMBLK_BSIZE, 3) collection: libpmemblk -header: NVM Library +header: PMDK date: pmemblk API version 1.0 ... diff --git a/doc/libpmemblk/pmemblk_create.3.md b/doc/libpmemblk/pmemblk_create.3.md index 32280876ffc..62b1a0898dd 100644 --- a/doc/libpmemblk/pmemblk_create.3.md +++ b/doc/libpmemblk/pmemblk_create.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMBLK_CREATE, 3) collection: libpmemblk -header: NVM Library +header: PMDK date: pmemblk API version 1.0 ... diff --git a/doc/libpmemblk/pmemblk_read.3.md b/doc/libpmemblk/pmemblk_read.3.md index 0253a707dd1..ea4ecfc8987 100644 --- a/doc/libpmemblk/pmemblk_read.3.md +++ b/doc/libpmemblk/pmemblk_read.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMBLK_READ, 3) collection: libpmemblk -header: NVM Library +header: PMDK date: pmemblk API version 1.0 ... diff --git a/doc/libpmemblk/pmemblk_set_zero.3.md b/doc/libpmemblk/pmemblk_set_zero.3.md index 237f9ada813..1edfdd274e1 100644 --- a/doc/libpmemblk/pmemblk_set_zero.3.md +++ b/doc/libpmemblk/pmemblk_set_zero.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMBLK_SET_ZERO, 3) collection: libpmemblk -header: NVM Library +header: PMDK date: pmemblk API version 1.0 ... diff --git a/doc/libpmemcto/libpmemcto.7.md b/doc/libpmemcto/libpmemcto.7.md index 6adf98a33c6..376b902bc21 100644 --- a/doc/libpmemcto/libpmemcto.7.md +++ b/doc/libpmemcto/libpmemcto.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEMCTO, 7) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... @@ -351,7 +351,7 @@ main(int argc, char *argv[]) } ``` -See for more examples using the +See for more examples using the **libpmemcto** API. @@ -370,8 +370,8 @@ to and never attempts to grow or shrink that memory pool. # AVAILABILITY # -**libpmemcto** is part of the NVM Library since version 1.4 and is available -from +**libpmemcto** is part of the PMDK since version 1.4 and is available +from # ACKNOWLEDGEMENTS # diff --git a/doc/libpmemcto/pmemcto_aligned_alloc.3.md b/doc/libpmemcto/pmemcto_aligned_alloc.3.md index 7ebe5feb539..c2e88054129 100644 --- a/doc/libpmemcto/pmemcto_aligned_alloc.3.md +++ b/doc/libpmemcto/pmemcto_aligned_alloc.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_ALIGNED_ALLOC, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_malloc.3.md b/doc/libpmemcto/pmemcto_malloc.3.md index 932394c4488..18a761bba51 100644 --- a/doc/libpmemcto/pmemcto_malloc.3.md +++ b/doc/libpmemcto/pmemcto_malloc.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_MALLOC, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_malloc_usable_size.3.md b/doc/libpmemcto/pmemcto_malloc_usable_size.3.md index fed6411cd5e..e90d805651c 100644 --- a/doc/libpmemcto/pmemcto_malloc_usable_size.3.md +++ b/doc/libpmemcto/pmemcto_malloc_usable_size.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_MALLOC_USABLE_SIZE, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_open.3.md b/doc/libpmemcto/pmemcto_open.3.md index edc12feeb57..10da64d0384 100644 --- a/doc/libpmemcto/pmemcto_open.3.md +++ b/doc/libpmemcto/pmemcto_open.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_OPEN, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_set_root_pointer.3.md b/doc/libpmemcto/pmemcto_set_root_pointer.3.md index 9421c9fcb1e..c5c07961230 100644 --- a/doc/libpmemcto/pmemcto_set_root_pointer.3.md +++ b/doc/libpmemcto/pmemcto_set_root_pointer.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_SET_ROOT_POINTER, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_stats_print.3.md b/doc/libpmemcto/pmemcto_stats_print.3.md index 6f7c75a6661..68b1318511b 100644 --- a/doc/libpmemcto/pmemcto_stats_print.3.md +++ b/doc/libpmemcto/pmemcto_stats_print.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_STATS_PRINT, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_strdup.3.md b/doc/libpmemcto/pmemcto_strdup.3.md index d339a896616..85c73d6b5bf 100644 --- a/doc/libpmemcto/pmemcto_strdup.3.md +++ b/doc/libpmemcto/pmemcto_strdup.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_STRDUP, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemcto/pmemcto_wcsdup.3.md b/doc/libpmemcto/pmemcto_wcsdup.3.md index ad95aaf584c..12d56b811b7 100644 --- a/doc/libpmemcto/pmemcto_wcsdup.3.md +++ b/doc/libpmemcto/pmemcto_wcsdup.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMCTO_WCSDUP, 3) collection: libpmemcto -header: NVM Library +header: PMDK date: libpmemcto API version 1.0 ... diff --git a/doc/libpmemlog/libpmemlog.7.md b/doc/libpmemlog/libpmemlog.7.md index a11443f65ad..a99bc65fc85 100644 --- a/doc/libpmemlog/libpmemlog.7.md +++ b/doc/libpmemlog/libpmemlog.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEMLOG, 7) collection: libpmemlog -header: NVM Library +header: PMDK date: pmemlog API version 1.0 ... @@ -327,7 +327,7 @@ main(int argc, char *argv[]) } ``` -See +See for more examples using the **libpmemlog** API. diff --git a/doc/libpmemlog/pmemlog_append.3.md b/doc/libpmemlog/pmemlog_append.3.md index 38b4ae1bb9d..2904574e786 100644 --- a/doc/libpmemlog/pmemlog_append.3.md +++ b/doc/libpmemlog/pmemlog_append.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMLOG_APPEND, 3) collection: libpmemlog -header: NVM Library +header: PMDK date: pmemlog API version 1.0 ... diff --git a/doc/libpmemlog/pmemlog_create.3.md b/doc/libpmemlog/pmemlog_create.3.md index 19cf95b5f0f..d18d6f5675b 100644 --- a/doc/libpmemlog/pmemlog_create.3.md +++ b/doc/libpmemlog/pmemlog_create.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMLOG_CREATE, 3) collection: libpmemlog -header: NVM Library +header: PMDK date: pmemlog API version 1.0 ... diff --git a/doc/libpmemlog/pmemlog_nbyte.3.md b/doc/libpmemlog/pmemlog_nbyte.3.md index 3f342566e34..16f74a2d562 100644 --- a/doc/libpmemlog/pmemlog_nbyte.3.md +++ b/doc/libpmemlog/pmemlog_nbyte.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMLOG_NBYTE, 3) collection: libpmemlog -header: NVM Library +header: PMDK date: pmemlog API version 1.0 ... diff --git a/doc/libpmemlog/pmemlog_tell.3.md b/doc/libpmemlog/pmemlog_tell.3.md index fb553b2635b..06189294974 100644 --- a/doc/libpmemlog/pmemlog_tell.3.md +++ b/doc/libpmemlog/pmemlog_tell.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMLOG_TELL, 3) collection: libpmemlog -header: NVM Library +header: PMDK date: pmemlog API version 1.0 ... diff --git a/doc/libpmemobj/libpmemobj.7.md b/doc/libpmemobj/libpmemobj.7.md index 159a2beeada..76273bbd339 100644 --- a/doc/libpmemobj/libpmemobj.7.md +++ b/doc/libpmemobj/libpmemobj.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEMOBJ, 7) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... @@ -263,7 +263,7 @@ about other environment variables affecting **libpmemobj** behavior. # EXAMPLE # -See for examples using the **libpmemobj** API. +See for examples using the **libpmemobj** API. # ACKNOWLEDGEMENTS # diff --git a/doc/libpmemobj/oid_is_null.3.md b/doc/libpmemobj/oid_is_null.3.md index 5a083aa4c84..eb5852f9aba 100644 --- a/doc/libpmemobj/oid_is_null.3.md +++ b/doc/libpmemobj/oid_is_null.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(OID_IS_NULL, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_action.3.md b/doc/libpmemobj/pmemobj_action.3.md index 48a3cd28368..8b766c3581c 100644 --- a/doc/libpmemobj/pmemobj_action.3.md +++ b/doc/libpmemobj/pmemobj_action.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_ACTION, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_alloc.3.md b/doc/libpmemobj/pmemobj_alloc.3.md index 16179c2ee94..3791f0c7f6d 100644 --- a/doc/libpmemobj/pmemobj_alloc.3.md +++ b/doc/libpmemobj/pmemobj_alloc.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_ALLOC, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_ctl_get.3.md b/doc/libpmemobj/pmemobj_ctl_get.3.md index 98d2e372f77..00a599883ff 100644 --- a/doc/libpmemobj/pmemobj_ctl_get.3.md +++ b/doc/libpmemobj/pmemobj_ctl_get.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_CTL_GET, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_first.3.md b/doc/libpmemobj/pmemobj_first.3.md index 1e5d5625b79..c94da450838 100644 --- a/doc/libpmemobj/pmemobj_first.3.md +++ b/doc/libpmemobj/pmemobj_first.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_FIRST, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_list_insert.3.md b/doc/libpmemobj/pmemobj_list_insert.3.md index 94d3af98e57..e90c4989930 100644 --- a/doc/libpmemobj/pmemobj_list_insert.3.md +++ b/doc/libpmemobj/pmemobj_list_insert.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_LIST_INSERT, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_memcpy_persist.3.md b/doc/libpmemobj/pmemobj_memcpy_persist.3.md index 704095d00a2..af843f41c6f 100644 --- a/doc/libpmemobj/pmemobj_memcpy_persist.3.md +++ b/doc/libpmemobj/pmemobj_memcpy_persist.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_MEMCPY_PERSIST, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_mutex_zero.3.md b/doc/libpmemobj/pmemobj_mutex_zero.3.md index eb4efc6fb50..db944f350e3 100644 --- a/doc/libpmemobj/pmemobj_mutex_zero.3.md +++ b/doc/libpmemobj/pmemobj_mutex_zero.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_MUTEX_ZERO, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_open.3.md b/doc/libpmemobj/pmemobj_open.3.md index aba4b8e9113..87d32f3cbcb 100644 --- a/doc/libpmemobj/pmemobj_open.3.md +++ b/doc/libpmemobj/pmemobj_open.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_OPEN, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_root.3.md b/doc/libpmemobj/pmemobj_root.3.md index d07345aba1c..252d7373421 100644 --- a/doc/libpmemobj/pmemobj_root.3.md +++ b/doc/libpmemobj/pmemobj_root.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_ROOT, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_tx_add_range.3.md b/doc/libpmemobj/pmemobj_tx_add_range.3.md index 0896baac0fa..a7a31e8bfea 100644 --- a/doc/libpmemobj/pmemobj_tx_add_range.3.md +++ b/doc/libpmemobj/pmemobj_tx_add_range.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_TX_ADD_RANGE, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_tx_alloc.3.md b/doc/libpmemobj/pmemobj_tx_alloc.3.md index d857d806664..afec80f1d92 100644 --- a/doc/libpmemobj/pmemobj_tx_alloc.3.md +++ b/doc/libpmemobj/pmemobj_tx_alloc.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_TX_ALLOC, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pmemobj_tx_begin.3.md b/doc/libpmemobj/pmemobj_tx_begin.3.md index fd01de43a7f..04cc70f1eab 100644 --- a/doc/libpmemobj/pmemobj_tx_begin.3.md +++ b/doc/libpmemobj/pmemobj_tx_begin.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMOBJ_TX_BEGIN, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pobj_layout_begin.3.md b/doc/libpmemobj/pobj_layout_begin.3.md index dc392f97366..388c0a7ad65 100644 --- a/doc/libpmemobj/pobj_layout_begin.3.md +++ b/doc/libpmemobj/pobj_layout_begin.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(POBJ_LAYOUT_BEGIN, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/pobj_list_head.3.md b/doc/libpmemobj/pobj_list_head.3.md index 99919c3f5e7..585e1423802 100644 --- a/doc/libpmemobj/pobj_list_head.3.md +++ b/doc/libpmemobj/pobj_list_head.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(POBJ_LIST_HEAD, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmemobj/toid_declare.3.md b/doc/libpmemobj/toid_declare.3.md index d43d3e4bbc2..caf17999a68 100644 --- a/doc/libpmemobj/toid_declare.3.md +++ b/doc/libpmemobj/toid_declare.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(TOID_DECLARE, 3) collection: libpmemobj -header: NVM Library +header: PMDK date: pmemobj API version 2.2 ... diff --git a/doc/libpmempool/libpmempool.7.md b/doc/libpmempool/libpmempool.7.md index 614fc3c7052..4edbdb82408 100644 --- a/doc/libpmempool/libpmempool.7.md +++ b/doc/libpmempool/libpmempool.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBPMEMPOOL, 7) collection: libpmempool -header: NVM Library +header: PMDK date: pmempool API version 1.1 ... @@ -282,7 +282,7 @@ main(int argc, char *argv[]) } ``` -See for more examples using the +See for more examples using the **libpmempool** API. diff --git a/doc/libpmempool/pmempool_check_init.3.md b/doc/libpmempool/pmempool_check_init.3.md index ebd19efe280..28b7a71ab62 100644 --- a/doc/libpmempool/pmempool_check_init.3.md +++ b/doc/libpmempool/pmempool_check_init.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL_CHECK_INIT, 3) collection: libpmempool -header: NVM Library +header: PMDK date: pmempool API version 1.1 ... diff --git a/doc/libpmempool/pmempool_rm.3.md b/doc/libpmempool/pmempool_rm.3.md index 15bdb8bc0e6..6ae20caabcd 100644 --- a/doc/libpmempool/pmempool_rm.3.md +++ b/doc/libpmempool/pmempool_rm.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL_RM, 3) collection: libpmempool -header: NVM Library +header: PMDK date: pmempool API version 1.1 ... diff --git a/doc/libpmempool/pmempool_sync.3.md b/doc/libpmempool/pmempool_sync.3.md index ee31b356d0c..bfbf075b5fe 100644 --- a/doc/libpmempool/pmempool_sync.3.md +++ b/doc/libpmempool/pmempool_sync.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL_SYNC, 3) collection: libpmempool -header: NVM Library +header: PMDK date: pmempool API version 1.1 ... diff --git a/doc/librpmem/librpmem.7.md b/doc/librpmem/librpmem.7.md index 156dd86bcf5..5d80ce888f3 100644 --- a/doc/librpmem/librpmem.7.md +++ b/doc/librpmem/librpmem.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBRPMEM, 7) collection: librpmem -header: NVM Library +header: PMDK date: rpmem API version 1.1 ... diff --git a/doc/librpmem/rpmem_create.3.md b/doc/librpmem/rpmem_create.3.md index 6554d07f513..9feb2a4fb7e 100644 --- a/doc/librpmem/rpmem_create.3.md +++ b/doc/librpmem/rpmem_create.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(RPMEM_CREATE, 3) collection: librpmem -header: NVM Library +header: PMDK date: rpmem API version 1.1 ... diff --git a/doc/librpmem/rpmem_persist.3.md b/doc/librpmem/rpmem_persist.3.md index 5bf5634bc5d..da4a2264292 100644 --- a/doc/librpmem/rpmem_persist.3.md +++ b/doc/librpmem/rpmem_persist.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(RPMEM_PERSIST, 3) collection: librpmem -header: NVM Library +header: PMDK date: rpmem API version 1.1 ... diff --git a/doc/libvmem/libvmem.7.md b/doc/libvmem/libvmem.7.md index 940d310bc5c..7f931c7567e 100644 --- a/doc/libvmem/libvmem.7.md +++ b/doc/libvmem/libvmem.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBVMEM, 7) collection: libvmem -header: NVM Library +header: PMDK date: vmem API version 1.1 ... @@ -99,7 +99,7 @@ memory-mapped files. These interfaces are for traditional **volatile** memory allocation but, unlike the functions described in **malloc**(3), the memory managed by **libvmem** may have different attributes, depending on the file system containing the memory-mapped files. -In particular, **libvmem** is part of the *Non-Volatile Memory Library* +In particular, **libvmem** is part of the *Persistent Memory Development Kit* because it is sometimes useful to use non-volatile memory as a volatile memory pool, leveraging its capacity, cost, or performance characteristics. @@ -276,7 +276,7 @@ main(int argc, char *argv[]) } ``` -See for more examples using the **libvmem** API. +See for more examples using the **libvmem** API. # BUGS # diff --git a/doc/libvmem/vmem_create.3.md b/doc/libvmem/vmem_create.3.md index 01d7e1091db..9351d743831 100644 --- a/doc/libvmem/vmem_create.3.md +++ b/doc/libvmem/vmem_create.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(VMEM_CREATE, 3) collection: libvmem -header: NVM Library +header: PMDK date: vmem API version 1.1 ... diff --git a/doc/libvmem/vmem_malloc.3.md b/doc/libvmem/vmem_malloc.3.md index a879285152e..e33bbcd73d8 100644 --- a/doc/libvmem/vmem_malloc.3.md +++ b/doc/libvmem/vmem_malloc.3.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(VMEM_MALLOC, 3) collection: libvmem -header: NVM Library +header: PMDK date: vmem API version 1.1 ... diff --git a/doc/libvmmalloc/libvmmalloc.7.md b/doc/libvmmalloc/libvmmalloc.7.md index 4adafc8949a..f9873772ed2 100644 --- a/doc/libvmmalloc/libvmmalloc.7.md +++ b/doc/libvmmalloc/libvmmalloc.7.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(LIBVMMALLOC, 7) collection: libvmmalloc -header: NVM Library +header: PMDK date: vmmalloc API version 1.0 ... @@ -102,7 +102,7 @@ routines, as defined in **malloc**(3), **posix_memalign**(3) and are made from a *memory pool* built on a memory-mapped file, instead of the system heap. The memory managed by **libvmmalloc** may have different attributes, depending on the file system containing the memory-mapped file. -In particular, **libvmmalloc** is part of the *Non-Volatile Memory Library* +In particular, **libvmmalloc** is part of the *Persistent Memory Development Kit* because it is sometimes useful to use non-volatile memory as a volatile memory pool, leveraging its capacity, cost, or performance characteristics. diff --git a/doc/macros.man b/doc/macros.man index a709d7a1629..4e2f53737ec 100644 --- a/doc/macros.man +++ b/doc/macros.man @@ -97,14 +97,14 @@ changequote(=q=,=e=) changecom() define(_BSDWX, ifdef(=q=FREEBSD=e=,$1,$2)) -define(_DEBUGLIBPATH, ifdef(=q=WIN32=e=,**/nvml/src/x64/Debug**, -ifdef(=q=FREEBSD=e=,**/usr/local/lib/nvml_debug**, **/usr/lib/nvml_debug**))) -define(_LDLIBPATH, ifdef(=q=WIN32=e=,**/nvml/src/x64/Debug**, -ifdef(=q=FREEBSD=e=,**/usr/local/lib/nvml_debug**, -=q==q==q=**/usr/lib/nvml_debug** or **/usr/lib64/nvml_debug**, as appropriate=e==e==e=))) +define(_DEBUGLIBPATH, ifdef(=q=WIN32=e=,**/pmdk/src/x64/Debug**, +ifdef(=q=FREEBSD=e=,**/usr/local/lib/pmdk_debug**, **/usr/lib/pmdk_debug**))) +define(_LDLIBPATH, ifdef(=q=WIN32=e=,**/pmdk/src/x64/Debug**, +ifdef(=q=FREEBSD=e=,**/usr/local/lib/pmdk_debug**, +=q==q==q=**/usr/lib/pmdk_debug** or **/usr/lib64/pmdk_debug**, as appropriate=e==e==e=))) define(_MP, ifdef(=q=WEB=e=,$1,$1($2))) define(_UNICODE, ifdef(=q=WIN32=e=,=q==q= ->NOTE: The NVML API supports UNICODE. If the **NVML_UTF8_API** macro is +>NOTE: The PMDK API supports UNICODE. If the **NVML_UTF8_API** macro is defined, basic API functions are expanded to the UTF-8 API with postfix *U*. Otherwise they are expanded to the UNICODE API with postfix *W*.=e==e=)) define(_U, ifdef(=q=WIN32=e=,$1U,$1)) diff --git a/doc/pmempool/pmempool-check.1.md b/doc/pmempool/pmempool-check.1.md index 6f4faa9d294..6a10e2599d7 100644 --- a/doc/pmempool/pmempool-check.1.md +++ b/doc/pmempool/pmempool-check.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-CHECK, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-convert.1.md b/doc/pmempool/pmempool-convert.1.md index 7d4e1f0eaf3..d8f0d593751 100644 --- a/doc/pmempool/pmempool-convert.1.md +++ b/doc/pmempool/pmempool-convert.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-CONVERT, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-create.1.md b/doc/pmempool/pmempool-create.1.md index 46a344c4646..cbcdb0a85d8 100644 --- a/doc/pmempool/pmempool-create.1.md +++ b/doc/pmempool/pmempool-create.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-CREATE, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-dump.1.md b/doc/pmempool/pmempool-dump.1.md index 052babb7350..bd895604f68 100644 --- a/doc/pmempool/pmempool-dump.1.md +++ b/doc/pmempool/pmempool-dump.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-DUMP, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-info.1.md b/doc/pmempool/pmempool-info.1.md index 06c109c16e4..4f474292da0 100644 --- a/doc/pmempool/pmempool-info.1.md +++ b/doc/pmempool/pmempool-info.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-INFO, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... @@ -60,7 +60,7 @@ $ pmempool info [] # DESCRIPTION # The **pmempool** invoked with *info* command analyzes an existing pool -created by **NVML** libraries provided by **file** parameter. +created by **PMDK** libraries provided by **file** parameter. The **file** can be either existing pool file, a part file or a poolset file. The main task of this command is to print all usable information from diff --git a/doc/pmempool/pmempool-rm.1.md b/doc/pmempool/pmempool-rm.1.md index 5e6f705679c..777c65daeef 100644 --- a/doc/pmempool/pmempool-rm.1.md +++ b/doc/pmempool/pmempool-rm.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-RM, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-sync.1.md b/doc/pmempool/pmempool-sync.1.md index f2ab5be88ba..2fdd022d6b2 100644 --- a/doc/pmempool/pmempool-sync.1.md +++ b/doc/pmempool/pmempool-sync.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-SYNC, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool-transform.1.md b/doc/pmempool/pmempool-transform.1.md index 4e62d79bd17..24c91d5839c 100644 --- a/doc/pmempool/pmempool-transform.1.md +++ b/doc/pmempool/pmempool-transform.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL-TRANSFORM, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... diff --git a/doc/pmempool/pmempool.1.md b/doc/pmempool/pmempool.1.md index ac8db7fb9b5..a059e418889 100644 --- a/doc/pmempool/pmempool.1.md +++ b/doc/pmempool/pmempool.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(PMEMPOOL, 1) collection: pmempool -header: NVM Library +header: PMDK date: pmem Tools version 1.3 ... @@ -58,7 +58,7 @@ $ pmempool [--help] [--version] [] # DESCRIPTION # The **pmempool** is a management tool for *Persistent Memory* pool files -created by **NVML** libraries. +created by **PMDK** libraries. The main purpose of **pmempool** is to provide a user with a set of utilities for off-line analysis and manipulation of pools created by pmem libraries. @@ -67,7 +67,7 @@ purposes. Some of subcommands are required to work *without* any impact on processed pool, but some of them *may* create a new or modify an existing one. The **pmempool** may be useful for troubleshooting by system administrators -and for software developers who work on applications based on **NVM** Library. +and for software developers who work on applications based on **PMDK**. The latter may find these tools useful for testing and debugging purposes also. diff --git a/doc/poolset/poolset.5.md b/doc/poolset/poolset.5.md index 4aca039426b..7d8c17e55c9 100644 --- a/doc/poolset/poolset.5.md +++ b/doc/poolset/poolset.5.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(POOLSET, 5) collection: poolset -header: NVM Library +header: PMDK date: poolset API version 1.0 ... diff --git a/doc/rpmemd/rpmemd.1.md b/doc/rpmemd/rpmemd.1.md index 80a46f2525e..fcf8f3b610d 100644 --- a/doc/rpmemd/rpmemd.1.md +++ b/doc/rpmemd/rpmemd.1.md @@ -3,7 +3,7 @@ layout: manual Content-Style: 'text/css' title: _MP(RPMEMD, 1) collection: rpmemd -header: NVM Library +header: PMDK date: rpmemd version 1.3 ... diff --git a/res/NVML.ico b/res/PMDK.ico similarity index 100% rename from res/NVML.ico rename to res/PMDK.ico diff --git a/src/Makefile b/src/Makefile index e85802aabfa..6e193d73750 100644 --- a/src/Makefile +++ b/src/Makefile @@ -30,7 +30,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# src/Makefile -- Makefile for NVML +# src/Makefile -- Makefile for PMDK # TOP := $(dir $(lastword $(MAKEFILE_LIST))).. include $(TOP)/src/common.inc diff --git a/src/Makefile.inc b/src/Makefile.inc index 0d6f6cf5d50..059b6233e50 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# src/Makefile.inc -- common Makefile rules for NVM library +# src/Makefile.inc -- common Makefile rules for PMDK # TOP := $(dir $(lastword $(MAKEFILE_LIST))).. @@ -73,7 +73,7 @@ ifeq ($(DEBUG),1) # user-defined CFLAGS as it conflicts with -O0. DEBUG_CFLAGS += -Wp,-U_FORTIFY_SOURCE DEBUG_CFLAGS += -O0 -ggdb -DDEBUG -LIB_SUBDIR = /nvml_debug +LIB_SUBDIR = /pmdk_debug OBJDIR = debug else DEFAULT_CFLAGS += -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 @@ -98,7 +98,7 @@ endif # On FreeBSD libvmmalloc defines pthread_create, which conflicts with asan tsanitize := $(SANITIZE) ifeq ($(shell uname -s),FreeBSD) -ifeq ($(JEMALLOC_NVMLDIR),libvmmalloc) +ifeq ($(JEMALLOC_PMDKDIR),libvmmalloc) hasaddrcomma := address, tsanitize := $(subst address,,$(subst $(hasaddrcomma),,$(SANITIZE))) ifneq ($(tsanitize),$(SANITIZE)) @@ -135,7 +135,7 @@ endif define arch32_error_msg ################################################## -### 32-bit builds of NVML are not supported! ### +### 32-bit builds of PMDK are not supported! ### ### Please, use 64-bit platform/compiler. ### ################################################## diff --git a/src/NVML.sln b/src/PMDK.sln similarity index 99% rename from src/NVML.sln rename to src/PMDK.sln index ecdeeaeda07..bde1e2e6010 100644 --- a/src/NVML.sln +++ b/src/PMDK.sln @@ -718,7 +718,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fifo", "examples\libpmemobj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pmempool_help", "test\pmempool_help\pmempool_help.vcxproj", "{D4035736-1AD6-4100-9FA9-A8A0C1DAE0C7}" EndProject -Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "nvml_setup", "windows\setup\setup.vdproj", "{D5093EC2-5B5A-4D79-842C-6A1481E9C989}" +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "pmdk_setup", "windows\setup\setup.vdproj", "{D5093EC2-5B5A-4D79-842C-6A1481E9C989}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util_file_create", "test\util_file_create\util_file_create.vcxproj", "{D829DB63-E046-474D-8EA3-43A6659294D8}" EndProject diff --git a/src/README b/src/README index ce48d2a3255..f62b6eb6556 100644 --- a/src/README +++ b/src/README @@ -1,8 +1,8 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/README. -This directory contains the source for the NVM Library. +This directory contains the source for the Persistent Memory Development Kit. libvmem is largely just a wrapper around a modified jemalloc library. See the "jemalloc" subdirectory and the git change diff --git a/src/benchmarks/README b/src/benchmarks/README index 2a47ee2d6fc..37fa2d5f704 100644 --- a/src/benchmarks/README +++ b/src/benchmarks/README @@ -1,8 +1,8 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is benchmarks/README. -This directory contains benchmarks for NVM Library. +This directory contains benchmarks for Persistent Memory Development Kit. Benchmarks may be built and run from this directory using: $ make diff --git a/src/common.inc b/src/common.inc index c0bbd6ec075..cbc3a8a0bc6 100644 --- a/src/common.inc +++ b/src/common.inc @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# src/common.inc -- common Makefile rules for NVM library +# src/common.inc -- common Makefile rules for PMDK # TOP := $(dir $(lastword $(MAKEFILE_LIST))).. diff --git a/src/common/common.rc b/src/common/common.rc index 0c4ffc3ff01..0cff9c79bfe 100644 --- a/src/common/common.rc +++ b/src/common/common.rc @@ -31,7 +31,7 @@ */ /* - * common.rc -- common part of nvml rc files + * common.rc -- common part of PMDK rc files */ #include @@ -88,10 +88,10 @@ BEGIN VALUE "CompanyName", "Intel" VALUE "FileDescription", DESCRIPTION VALUE "FileVersion", SRCVERSION - VALUE "InternalName", "NVML" + VALUE "InternalName", "PMDK" VALUE "LegalCopyright", "Copyright 2014-2017, Intel Corporation" VALUE "OriginalFilename", FILE_NAME - VALUE "ProductName", "NVM Library" + VALUE "ProductName", "Persistent Memory Development Kit" VALUE "ProductVersion", SRCVERSION #if VERSION_SPECIAL == VS_FF_SPECIALBUILD VALUE "SpecialBuild", VERSION_CUSTOM_MSG diff --git a/src/common/dlsym.h b/src/common/dlsym.h index 84228f0341a..9dc8ea086af 100644 --- a/src/common/dlsym.h +++ b/src/common/dlsym.h @@ -1,5 +1,5 @@ /* - * Copyright 2016, Intel Corporation + * Copyright 2016-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,8 +34,8 @@ * dlsym.h -- dynamic linking utilities with library-specific implementation */ -#ifndef NVML_DLSYM_H -#define NVML_DLSYM_H 1 +#ifndef PMDK_DLSYM_H +#define PMDK_DLSYM_H 1 #include "out.h" diff --git a/src/common/errno_freebsd.h b/src/common/errno_freebsd.h index 787b821bf0c..a623c5b9c33 100644 --- a/src/common/errno_freebsd.h +++ b/src/common/errno_freebsd.h @@ -34,8 +34,8 @@ * errno_freebsd.h -- map Linux errno's to something close on FreeBSD */ -#ifndef NVML_ERRNO_FREEBSD_H -#define NVML_ERRNO_FREEBSD_H 1 +#ifndef PMDK_ERRNO_FREEBSD_H +#define PMDK_ERRNO_FREEBSD_H 1 #ifdef __FreeBSD__ #define EBADFD EBADF @@ -45,4 +45,4 @@ #define EREMOTEIO EIO #endif -#endif /* NVML_ERRNO_FREEBSD_H */ +#endif /* PMDK_ERRNO_FREEBSD_H */ diff --git a/src/common/file.h b/src/common/file.h index ea378190c1a..949ea496e27 100644 --- a/src/common/file.h +++ b/src/common/file.h @@ -34,8 +34,8 @@ * file.h -- internal definitions for file module */ -#ifndef NVML_FILE_H -#define NVML_FILE_H 1 +#ifndef PMDK_FILE_H +#define PMDK_FILE_H 1 #ifdef __cplusplus extern "C" { #endif diff --git a/src/common/file_windows.c b/src/common/file_windows.c index b229375c0f7..d18c76f6093 100644 --- a/src/common/file_windows.c +++ b/src/common/file_windows.c @@ -35,14 +35,14 @@ */ /* - * XXX - The initial approach to NVML for Windows port was to minimize the + * XXX - The initial approach to PMDK for Windows port was to minimize the * amount of changes required in the core part of the library, and to avoid * preprocessor conditionals, if possible. For that reason, some of the * Linux system calls that have no equivalents on Windows have been emulated * using Windows API. * Note that it was not a goal to fully emulate POSIX-compliant behavior * of mentioned functions. They are used only internally, so current - * implementation is just good enough to satisfy NVML needs and to make it + * implementation is just good enough to satisfy PMDK needs and to make it * work on Windows. */ diff --git a/src/common/fs.h b/src/common/fs.h index 8ba69264359..03d2b944952 100644 --- a/src/common/fs.h +++ b/src/common/fs.h @@ -34,8 +34,8 @@ * fs.h -- file system traversal abstraction layer */ -#ifndef NVML_FS_H -#define NVML_FS_H 1 +#ifndef PMDK_FS_H +#define PMDK_FS_H 1 #include @@ -65,4 +65,4 @@ void fs_delete(struct fs *f); /* this call invalidates the previous entry */ struct fs_entry *fs_read(struct fs *f); -#endif /* NVML_FS_H */ +#endif /* PMDK_FS_H */ diff --git a/src/common/mmap.h b/src/common/mmap.h index 0e70c460c23..ce9550f44c5 100644 --- a/src/common/mmap.h +++ b/src/common/mmap.h @@ -34,8 +34,8 @@ * mmap.h -- internal definitions for mmap module */ -#ifndef NVML_MMAP_H -#define NVML_MMAP_H 1 +#ifndef PMDK_MMAP_H +#define PMDK_MMAP_H 1 #ifdef __cplusplus extern "C" { #endif diff --git a/src/common/os.h b/src/common/os.h index c04b17f042a..76d5732c450 100644 --- a/src/common/os.h +++ b/src/common/os.h @@ -34,8 +34,8 @@ * os.h -- os abstaction layer */ -#ifndef NVML_OS_H -#define NVML_OS_H 1 +#ifndef PMDK_OS_H +#define PMDK_OS_H 1 #ifdef __cplusplus extern "C" { diff --git a/src/common/out.h b/src/common/out.h index 3646ee6b907..e0696a96a52 100644 --- a/src/common/out.h +++ b/src/common/out.h @@ -34,8 +34,8 @@ * out.h -- definitions for "out" module */ -#ifndef NVML_OUT_H -#define NVML_OUT_H 1 +#ifndef PMDK_OUT_H +#define PMDK_OUT_H 1 #include #include diff --git a/src/common/pmemcommon.inc b/src/common/pmemcommon.inc index 12482e02c21..dc51c585bea 100644 --- a/src/common/pmemcommon.inc +++ b/src/common/pmemcommon.inc @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# src/pmemcommon.inc -- common SOURCE definitions for NVM pmem libraries +# src/pmemcommon.inc -- common SOURCE definitions for PMDK libraries # osdep = $(1)_$(shell uname -s | tr "[:upper:]" "[:lower:]")$(2) diff --git a/src/common/pool_hdr.c b/src/common/pool_hdr.c index 2ab4cf67392..82e96681777 100644 --- a/src/common/pool_hdr.c +++ b/src/common/pool_hdr.c @@ -42,19 +42,19 @@ #include "out.h" #include "pool_hdr.h" -/* Determine ISA for which NVML is currently compiled */ +/* Determine ISA for which PMDK is currently compiled */ #if defined(__x86_64) || defined(_M_X64) /* x86 -- 64 bit */ -#define NVML_MACHINE NVML_MACHINE_X86_64 -#define NVML_MACHINE_CLASS NVML_MACHINE_CLASS_64 +#define PMDK_MACHINE PMDK_MACHINE_X86_64 +#define PMDK_MACHINE_CLASS PMDK_MACHINE_CLASS_64 #elif defined(__aarch64__) /* 64 bit ARM not supported yet */ -#define NVML_MACHINE NVML_MACHINE_AARCH64 -#define NVML_MACHINE_CLASS NVML_MACHINE_CLASS_64 +#define PMDK_MACHINE PMDK_MACHINE_AARCH64 +#define PMDK_MACHINE_CLASS PMDK_MACHINE_CLASS_64 #else -/* add appropriate definitions here when porting NVML to another ISA */ +/* add appropriate definitions here when porting PMDK to another ISA */ #error unable to recognize ISA at compile time #endif @@ -65,7 +65,7 @@ static uint8_t arch_data(void) { - uint16_t word = (NVML_DATA_BE << 8) + NVML_DATA_LE; + uint16_t word = (PMDK_DATA_BE << 8) + PMDK_DATA_LE; return ((uint8_t *)&word)[0]; } @@ -76,8 +76,8 @@ void util_get_arch_flags(struct arch_flags *arch_flags) { memset(arch_flags, 0, sizeof(*arch_flags)); - arch_flags->machine = NVML_MACHINE; - arch_flags->machine_class = NVML_MACHINE_CLASS; + arch_flags->machine = PMDK_MACHINE; + arch_flags->machine_class = PMDK_MACHINE_CLASS; arch_flags->data = arch_data(); arch_flags->alignment_desc = alignment_desc(); } diff --git a/src/common/pool_hdr.h b/src/common/pool_hdr.h index 8a1f19222e0..9dc2f7b70ab 100644 --- a/src/common/pool_hdr.h +++ b/src/common/pool_hdr.h @@ -34,8 +34,8 @@ * pool_hdr.h -- internal definitions for pool header module */ -#ifndef NVML_POOL_HDR_H -#define NVML_POOL_HDR_H 1 +#ifndef PMDK_POOL_HDR_H +#define PMDK_POOL_HDR_H 1 #include #include @@ -91,15 +91,15 @@ struct arch_flags { }; /* possible values of the machine class field in the above struct */ -#define NVML_MACHINE_CLASS_64 2 /* 64 bit pointers, 64 bit size_t */ +#define PMDK_MACHINE_CLASS_64 2 /* 64 bit pointers, 64 bit size_t */ /* possible values of the machine field in the above struct */ -#define NVML_MACHINE_X86_64 62 -#define NVML_MACHINE_AARCH64 183 +#define PMDK_MACHINE_X86_64 62 +#define PMDK_MACHINE_AARCH64 183 /* possible values of the data field in the above struct */ -#define NVML_DATA_LE 1 /* 2's complement, little endian */ -#define NVML_DATA_BE 2 /* 2's complement, big endian */ +#define PMDK_DATA_LE 1 /* 2's complement, little endian */ +#define PMDK_DATA_BE 2 /* 2's complement, big endian */ /* * header used at the beginning of all types of memory pools diff --git a/src/common/set.h b/src/common/set.h index 06f5cca6855..70f7ce469da 100644 --- a/src/common/set.h +++ b/src/common/set.h @@ -35,8 +35,8 @@ * set.h -- internal definitions for set module */ -#ifndef NVML_SET_H -#define NVML_SET_H 1 +#ifndef PMDK_SET_H +#define PMDK_SET_H 1 #ifdef __cplusplus extern "C" { #endif diff --git a/src/common/sys_util.h b/src/common/sys_util.h index 7ae72cf44e7..555d6032ea5 100644 --- a/src/common/sys_util.h +++ b/src/common/sys_util.h @@ -34,8 +34,8 @@ * sys_util.h -- internal utility wrappers around system functions */ -#ifndef NVML_SYS_UTIL_H -#define NVML_SYS_UTIL_H 1 +#ifndef PMDK_SYS_UTIL_H +#define PMDK_SYS_UTIL_H 1 #include diff --git a/src/common/util.h b/src/common/util.h index 74139067e31..43b8493e132 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -35,8 +35,8 @@ * util.h -- internal definitions for util module */ -#ifndef NVML_UTIL_H -#define NVML_UTIL_H 1 +#ifndef PMDK_UTIL_H +#define PMDK_UTIL_H 1 #ifdef __cplusplus extern "C" { diff --git a/src/common/util_pmem.h b/src/common/util_pmem.h index 9a70055cc9e..44a5cf29d90 100644 --- a/src/common/util_pmem.h +++ b/src/common/util_pmem.h @@ -34,8 +34,8 @@ * util_pmem.h -- internal definitions for pmem utils */ -#ifndef NVML_UTIL_PMEM_H -#define NVML_UTIL_PMEM_H 1 +#ifndef PMDK_UTIL_PMEM_H +#define PMDK_UTIL_PMEM_H 1 #ifdef __cplusplus extern "C" { diff --git a/src/common/uuid.h b/src/common/uuid.h index 052ed0bf28a..6ca96d43c49 100644 --- a/src/common/uuid.h +++ b/src/common/uuid.h @@ -34,8 +34,8 @@ * uuid.h -- internal definitions for uuid module */ -#ifndef NVML_UUID_H -#define NVML_UUID_H 1 +#ifndef PMDK_UUID_H +#define PMDK_UUID_H 1 #include #include diff --git a/src/common/valgrind_internal.h b/src/common/valgrind_internal.h index 0a0493cb4c7..7a2e744f2b3 100644 --- a/src/common/valgrind_internal.h +++ b/src/common/valgrind_internal.h @@ -34,8 +34,8 @@ * valgrind_internal.h -- internal definitions for valgrind macros */ -#ifndef NVML_VALGRIND_INTERNAL_H -#define NVML_VALGRIND_INTERNAL_H 1 +#ifndef PMDK_VALGRIND_INTERNAL_H +#define PMDK_VALGRIND_INTERNAL_H 1 #ifdef USE_VALGRIND #define USE_VG_PMEMCHECK diff --git a/src/common/vec.h b/src/common/vec.h index 2f7e87db6b7..3f906e2620b 100644 --- a/src/common/vec.h +++ b/src/common/vec.h @@ -34,8 +34,8 @@ * vec.h -- vector interface */ -#ifndef NVML_VEC_H -#define NVML_VEC_H 1 +#ifndef PMDK_VEC_H +#define PMDK_VEC_H 1 #define VEC_GROW_SIZE (64) @@ -132,4 +132,4 @@ for (size_t _vec_i = 0;\ Free((vec)->buffer);\ } while (0) -#endif /* NVML_VEC_H */ +#endif /* PMDK_VEC_H */ diff --git a/src/examples/Makefile b/src/examples/Makefile index 6ea81e76960..2dc8e6688c9 100644 --- a/src/examples/Makefile +++ b/src/examples/Makefile @@ -31,7 +31,7 @@ # # -# examples/Makefile -- build the NVM Library examples +# examples/Makefile -- build the Persistent Memory Development Kit examples # DIRS = libpmem libpmemblk libpmemlog libpmemobj libvmem librpmem\ diff --git a/src/examples/Makefile.inc b/src/examples/Makefile.inc index 2a6c105d08b..55ace68a6fd 100644 --- a/src/examples/Makefile.inc +++ b/src/examples/Makefile.inc @@ -31,7 +31,7 @@ # # -# examples/Makefile.inc -- build the NVM Library examples +# examples/Makefile.inc -- build the Persistent Memory Development Kit examples # TOP_SRC := $(dir $(lastword $(MAKEFILE_LIST))).. TOP := $(TOP_SRC)/.. diff --git a/src/examples/README b/src/examples/README index 1cbc8954a20..a7e178750ed 100644 --- a/src/examples/README +++ b/src/examples/README @@ -1,39 +1,47 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/README. This directory contains brief educational examples illustrating the use -of the NVM libraries. For many of these examples, the Makefile rules +of the PMDK libraries. For many of these examples, the Makefile rules are here just to check that the example compiles, loads against the appropriate library, and passes cstyle. -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. Many of the examples in this directory are described in more detail on the above web site. -libpmem(3) -- low-level persistent memory support +libpmem(7) -- low-level persistent memory support Example programs are in the libpmem directory. - More documentation: http://pmem.io/nvml/libpmem + More documentation: http://pmem.io/pmdk/libpmem -libpmemblk(3) -- pmem-resident arrays of blocks +libpmemblk(7) -- pmem-resident arrays of blocks Example programs are in the libpmemblk directory. - More documentation: http://pmem.io/nvml/libpmemblk + More documentation: http://pmem.io/pmdk/libpmemblk -libpmemlog(3) -- pmem-resident log files +libpmemcto(7) -- close-to-open persistence + Example programs are in the libpmemcto directory. + More documentation: http://pmem.io/pmdk/libpmemcto + +libpmemlog(7) -- pmem-resident log files Example programs are in the libpmemlog directory. - More documentation: http://pmem.io/nvml/libpmemlog + More documentation: http://pmem.io/pmdk/libpmemlog -libpmemobj(3) -- transactional object store +libpmemobj(7) -- transactional object store Example programs are in the libpmemobj directory. - More documentation: http://pmem.io/nvml/libpmemobj - -libvmem(3) -- volatile memory allocation library - Example programs are in the libvmem directory. - More documentation: http://pmem.io/nvml/libvmem + More documentation: http://pmem.io/pmdk/libpmemobj -libpmempool(3) -- pool management, diagnostics and repair +libpmempool(7) -- pool management, diagnostics and repair Example programs are in the libpmempool directory. - More documentation: http://pmem.io/nvml/libpmempool + More documentation: http://pmem.io/pmdk/libpmempool + +librpmem(7) -- remote access to persistent memory + Example programs are in the libpmemcto directory. + More documentation: http://pmem.io/pmdk/librpmem + +libvmem(7) -- volatile memory allocation library + Example programs are in the libvmem directory. + More documentation: http://pmem.io/pmdk/libvmem diff --git a/src/examples/libpmem/README b/src/examples/libpmem/README index 6c82b5313a1..b4e554c4e27 100644 --- a/src/examples/libpmem/README +++ b/src/examples/libpmem/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmem/README. This directory contains examples for libpmem, the library containing low-level persistent memory support. A detailed explanation of these -examples can be found here: http://pmem.io/nvml/libpmem +examples can be found here: http://pmem.io/pmdk/libpmem manpage.c is the example used in the libpmem man page. @@ -18,6 +18,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. diff --git a/src/examples/libpmem/full_copy.vcxproj b/src/examples/libpmem/full_copy.vcxproj index 46af8c53b0b..a30682dfc3c 100644 --- a/src/examples/libpmem/full_copy.vcxproj +++ b/src/examples/libpmem/full_copy.vcxproj @@ -42,7 +42,7 @@ - + {9e9e3d25-2139-4a5d-9200-18148ddead45} diff --git a/src/examples/libpmem/manpage.vcxproj b/src/examples/libpmem/manpage.vcxproj index a0ed496a14d..1906e0529ed 100644 --- a/src/examples/libpmem/manpage.vcxproj +++ b/src/examples/libpmem/manpage.vcxproj @@ -45,7 +45,7 @@ - + {9e9e3d25-2139-4a5d-9200-18148ddead45} diff --git a/src/examples/libpmem/simple_copy.vcxproj b/src/examples/libpmem/simple_copy.vcxproj index 661a13f519c..d741cfcd919 100644 --- a/src/examples/libpmem/simple_copy.vcxproj +++ b/src/examples/libpmem/simple_copy.vcxproj @@ -42,7 +42,7 @@ - + {9e9e3d25-2139-4a5d-9200-18148ddead45} diff --git a/src/examples/libpmemblk/README b/src/examples/libpmemblk/README index 452c0c85212..0514fba8c3e 100644 --- a/src/examples/libpmemblk/README +++ b/src/examples/libpmemblk/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemblk/README. This directory contains examples for libpmemblk, the library providing pmem-resident arrays of blocks. Some of these examples are explained -in more detail here: http://pmem.io/nvml/libpmemblk +in more detail here: http://pmem.io/pmdk/libpmemblk manpage.c is the example used in the libpmemblk man page. @@ -16,6 +16,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. diff --git a/src/examples/libpmemblk/assetdb/README b/src/examples/libpmemblk/assetdb/README index 0fcdaceecde..3d40c95e30f 100644 --- a/src/examples/libpmemblk/assetdb/README +++ b/src/examples/libpmemblk/assetdb/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemblk/assetdb/README. diff --git a/src/examples/libpmemblk/assetdb/asset_checkin.vcxproj b/src/examples/libpmemblk/assetdb/asset_checkin.vcxproj index 177ee7c4e40..c946bd2ef85 100644 --- a/src/examples/libpmemblk/assetdb/asset_checkin.vcxproj +++ b/src/examples/libpmemblk/assetdb/asset_checkin.vcxproj @@ -15,7 +15,7 @@ pmemblk 10.0.14393.0 - + {f7c6c6b6-4142-4c82-8699-4a9d8183181b} diff --git a/src/examples/libpmemblk/assetdb/asset_checkout.vcxproj b/src/examples/libpmemblk/assetdb/asset_checkout.vcxproj index ff3f4728f95..5f618cd26c2 100644 --- a/src/examples/libpmemblk/assetdb/asset_checkout.vcxproj +++ b/src/examples/libpmemblk/assetdb/asset_checkout.vcxproj @@ -15,7 +15,7 @@ pmemblk 10.0.14393.0 - + {f7c6c6b6-4142-4c82-8699-4a9d8183181b} diff --git a/src/examples/libpmemblk/assetdb/asset_list.vcxproj b/src/examples/libpmemblk/assetdb/asset_list.vcxproj index 4f3a3b20aba..03cf52066dc 100644 --- a/src/examples/libpmemblk/assetdb/asset_list.vcxproj +++ b/src/examples/libpmemblk/assetdb/asset_list.vcxproj @@ -15,7 +15,7 @@ pmemblk 10.0.14393.0 - + {f7c6c6b6-4142-4c82-8699-4a9d8183181b} diff --git a/src/examples/libpmemblk/assetdb/asset_load.vcxproj b/src/examples/libpmemblk/assetdb/asset_load.vcxproj index 31221fbdcf2..059e6c288ae 100644 --- a/src/examples/libpmemblk/assetdb/asset_load.vcxproj +++ b/src/examples/libpmemblk/assetdb/asset_load.vcxproj @@ -15,7 +15,7 @@ pmemblk 10.0.14393.0 - + {f7c6c6b6-4142-4c82-8699-4a9d8183181b} diff --git a/src/examples/libpmemblk/manpage.vcxproj b/src/examples/libpmemblk/manpage.vcxproj index 88a7ac80a25..8f437b8492c 100644 --- a/src/examples/libpmemblk/manpage.vcxproj +++ b/src/examples/libpmemblk/manpage.vcxproj @@ -42,7 +42,7 @@ ..\..\LongPath.manifest - + {f7c6c6b6-4142-4c82-8699-4a9d8183181b} diff --git a/src/examples/libpmemcto/README b/src/examples/libpmemcto/README index 7418cc0e2c9..0492d9c014d 100644 --- a/src/examples/libpmemcto/README +++ b/src/examples/libpmemcto/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemcto/README. This directory contains examples for libpmemcto. Some of these examples are explained -in more detail here: http://pmem.io/nvml/libpmemcto +in more detail here: http://pmem.io/pmdk/libpmemcto manpage.c is the example used in the libpmemcto man page. @@ -20,6 +20,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. diff --git a/src/examples/libpmemcto/life/README b/src/examples/libpmemcto/life/README index 3072e705986..6053da5ef75 100644 --- a/src/examples/libpmemcto/life/README +++ b/src/examples/libpmemcto/life/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemcto/life/README. diff --git a/src/examples/libpmemcto/lifesaver/README b/src/examples/libpmemcto/lifesaver/README index f940dbc6048..2bb6f14409c 100644 --- a/src/examples/libpmemcto/lifesaver/README +++ b/src/examples/libpmemcto/lifesaver/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemcto/lifesaver/README. diff --git a/src/examples/libpmemlog/README b/src/examples/libpmemlog/README index 65c20b6c415..7d537d695db 100644 --- a/src/examples/libpmemlog/README +++ b/src/examples/libpmemlog/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemlog/README. This directory contains examples for libpmemlog, the library providing pmem-resident log files. Some of these examples are explained in more -detail here: http://pmem.io/nvml/libpmemlog +detail here: http://pmem.io/pmdk/libpmemlog manpage.c is the example used in the libpmemlog man page. @@ -16,6 +16,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. diff --git a/src/examples/libpmemlog/logfile/Makefile b/src/examples/libpmemlog/logfile/Makefile index f3dcb18a19e..5efc0c14c79 100644 --- a/src/examples/libpmemlog/logfile/Makefile +++ b/src/examples/libpmemlog/logfile/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ # # -# examples/logfile/Makefile -- build the NVM Library examples +# examples/logfile/Makefile -- build the Persistent Memory Development Kit examples # PROGS = addlog printlog diff --git a/src/examples/libpmemlog/logfile/README b/src/examples/libpmemlog/logfile/README index 0d8325da440..fb3a25ac346 100644 --- a/src/examples/libpmemlog/logfile/README +++ b/src/examples/libpmemlog/logfile/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemlog/logfile/README. diff --git a/src/examples/libpmemlog/logfile/addlog.vcxproj b/src/examples/libpmemlog/logfile/addlog.vcxproj index a625cf1c4db..42f8c3ffa6d 100644 --- a/src/examples/libpmemlog/logfile/addlog.vcxproj +++ b/src/examples/libpmemlog/logfile/addlog.vcxproj @@ -15,7 +15,7 @@ pmemlog 10.0.14393.0 - + {0b1818eb-bdc8-4865-964f-db8bf05cfd86} diff --git a/src/examples/libpmemlog/logfile/printlog.vcxproj b/src/examples/libpmemlog/logfile/printlog.vcxproj index 27246d5f675..21379a46008 100644 --- a/src/examples/libpmemlog/logfile/printlog.vcxproj +++ b/src/examples/libpmemlog/logfile/printlog.vcxproj @@ -15,7 +15,7 @@ pmemlog 10.0.14393.0 - + {0b1818eb-bdc8-4865-964f-db8bf05cfd86} diff --git a/src/examples/libpmemlog/manpage.vcxproj b/src/examples/libpmemlog/manpage.vcxproj index 3f6b15fd9fc..4412757ca88 100644 --- a/src/examples/libpmemlog/manpage.vcxproj +++ b/src/examples/libpmemlog/manpage.vcxproj @@ -42,7 +42,7 @@ ..\..\LongPath.manifest - + {0b1818eb-bdc8-4865-964f-db8bf05cfd86} diff --git a/src/examples/libpmemobj/README b/src/examples/libpmemobj/README index 6aa9f64f9f0..a2084cefa18 100644 --- a/src/examples/libpmemobj/README +++ b/src/examples/libpmemobj/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/README. This directory contains examples for libpmemobj, the library providing a transactional object store for pmem. Some of these examples are explained -in more detail here: http://pmem.io/nvml/libpmemobj +in more detail here: http://pmem.io/pmdk/libpmemobj manpage.c and setjmp.c are the examples used in the libpmemobj man page. @@ -14,6 +14,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and man pages. diff --git a/src/examples/libpmemobj/array/README b/src/examples/libpmemobj/array/README index 7a9d5677e0c..63e54bfa903 100644 --- a/src/examples/libpmemobj/array/README +++ b/src/examples/libpmemobj/array/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/array/README. diff --git a/src/examples/libpmemobj/array/array.vcxproj b/src/examples/libpmemobj/array/array.vcxproj index 967c6ee6ccf..474f5b94ce0 100644 --- a/src/examples/libpmemobj/array/array.vcxproj +++ b/src/examples/libpmemobj/array/array.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/btree.vcxproj b/src/examples/libpmemobj/btree.vcxproj index b1684579cab..45659a6c130 100644 --- a/src/examples/libpmemobj/btree.vcxproj +++ b/src/examples/libpmemobj/btree.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/cpp/queue.vcxproj b/src/examples/libpmemobj/cpp/queue.vcxproj index 1d5d26e9f47..8ffc561b6df 100644 --- a/src/examples/libpmemobj/cpp/queue.vcxproj +++ b/src/examples/libpmemobj/cpp/queue.vcxproj @@ -15,7 +15,7 @@ pmemobj_cpp 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/cpp_map/map_cli.vcxproj b/src/examples/libpmemobj/cpp_map/map_cli.vcxproj index cbf6065820a..f44f8978645 100644 --- a/src/examples/libpmemobj/cpp_map/map_cli.vcxproj +++ b/src/examples/libpmemobj/cpp_map/map_cli.vcxproj @@ -15,7 +15,7 @@ pmemobj_cpp 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/hashmap/hashmap_atomic.vcxproj b/src/examples/libpmemobj/hashmap/hashmap_atomic.vcxproj index 21eba557a9b..61fb244daed 100644 --- a/src/examples/libpmemobj/hashmap/hashmap_atomic.vcxproj +++ b/src/examples/libpmemobj/hashmap/hashmap_atomic.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/hashmap/hashmap_tx.vcxproj b/src/examples/libpmemobj/hashmap/hashmap_tx.vcxproj index 1b64c2eb19c..065b9e06015 100644 --- a/src/examples/libpmemobj/hashmap/hashmap_tx.vcxproj +++ b/src/examples/libpmemobj/hashmap/hashmap_tx.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/linkedlist/README b/src/examples/libpmemobj/linkedlist/README index 9059af4d98e..d80c7e9f8bb 100644 --- a/src/examples/libpmemobj/linkedlist/README +++ b/src/examples/libpmemobj/linkedlist/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/linkedlist/README. diff --git a/src/examples/libpmemobj/linkedlist/fifo.vcxproj b/src/examples/libpmemobj/linkedlist/fifo.vcxproj index aafbdab9e53..6eeea23fb68 100644 --- a/src/examples/libpmemobj/linkedlist/fifo.vcxproj +++ b/src/examples/libpmemobj/linkedlist/fifo.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/list_map/list_map.vcxproj b/src/examples/libpmemobj/list_map/list_map.vcxproj index 3c3b2fe2b41..d54ccf758b8 100644 --- a/src/examples/libpmemobj/list_map/list_map.vcxproj +++ b/src/examples/libpmemobj/list_map/list_map.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/lists.vcxproj b/src/examples/libpmemobj/lists.vcxproj index 08c324ace05..6283c087e86 100644 --- a/src/examples/libpmemobj/lists.vcxproj +++ b/src/examples/libpmemobj/lists.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/manpage.vcxproj b/src/examples/libpmemobj/manpage.vcxproj index 064cc8bbc6b..0cc23434996 100644 --- a/src/examples/libpmemobj/manpage.vcxproj +++ b/src/examples/libpmemobj/manpage.vcxproj @@ -42,7 +42,7 @@ ..\..\LongPath.manifest - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/map/data_store.vcxproj b/src/examples/libpmemobj/map/data_store.vcxproj index 53d5480d538..b274d226ee2 100644 --- a/src/examples/libpmemobj/map/data_store.vcxproj +++ b/src/examples/libpmemobj/map/data_store.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/map/libmap.vcxproj b/src/examples/libpmemobj/map/libmap.vcxproj index 6d9c404b5e0..4965b8900e2 100644 --- a/src/examples/libpmemobj/map/libmap.vcxproj +++ b/src/examples/libpmemobj/map/libmap.vcxproj @@ -21,7 +21,7 @@ ..\..\..\LongPath.manifest - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/map/mapcli.vcxproj b/src/examples/libpmemobj/map/mapcli.vcxproj index 4f2636c2532..19e92e6c7e6 100644 --- a/src/examples/libpmemobj/map/mapcli.vcxproj +++ b/src/examples/libpmemobj/map/mapcli.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/panaconda/README b/src/examples/libpmemobj/panaconda/README index 803a64d98f2..cdf17f1ade9 100644 --- a/src/examples/libpmemobj/panaconda/README +++ b/src/examples/libpmemobj/panaconda/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/panconda/README. diff --git a/src/examples/libpmemobj/pi.vcxproj b/src/examples/libpmemobj/pi.vcxproj index f91b0ca060f..72a65644765 100644 --- a/src/examples/libpmemobj/pi.vcxproj +++ b/src/examples/libpmemobj/pi.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pman/README b/src/examples/libpmemobj/pman/README index fa30681b2bd..1a464ae7698 100644 --- a/src/examples/libpmemobj/pman/README +++ b/src/examples/libpmemobj/pman/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/pman/README. diff --git a/src/examples/libpmemobj/pman/pman.cpp b/src/examples/libpmemobj/pman/pman.cpp index a1265c2e5d1..9aa3fdebb2f 100644 --- a/src/examples/libpmemobj/pman/pman.cpp +++ b/src/examples/libpmemobj/pman/pman.cpp @@ -31,7 +31,7 @@ */ /* - * pman.cpp -- example of usage c++ bindings in nvml + * pman.cpp -- example usage of libpmemobj C++ bindings */ #include "list.hpp" diff --git a/src/examples/libpmemobj/pmemblk/README b/src/examples/libpmemobj/pmemblk/README index 57c39a6ed22..26485b37d59 100644 --- a/src/examples/libpmemobj/pmemblk/README +++ b/src/examples/libpmemobj/pmemblk/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/pmemblk/README. diff --git a/src/examples/libpmemobj/pmemblk/obj_pmemblk.vcxproj b/src/examples/libpmemobj/pmemblk/obj_pmemblk.vcxproj index ceba95d1436..6ae80e009bc 100644 --- a/src/examples/libpmemobj/pmemblk/obj_pmemblk.vcxproj +++ b/src/examples/libpmemobj/pmemblk/obj_pmemblk.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pmemlog/README b/src/examples/libpmemobj/pmemlog/README index 0ce88501816..f0185a229c0 100644 --- a/src/examples/libpmemobj/pmemlog/README +++ b/src/examples/libpmemobj/pmemlog/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/pmemlog/README. diff --git a/src/examples/libpmemobj/pmemlog/obj_pmemlog.vcxproj b/src/examples/libpmemobj/pmemlog/obj_pmemlog.vcxproj index 59791e7b95d..c98faaa991e 100644 --- a/src/examples/libpmemobj/pmemlog/obj_pmemlog.vcxproj +++ b/src/examples/libpmemobj/pmemlog/obj_pmemlog.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pmemlog/obj_pmemlog_macros.vcxproj b/src/examples/libpmemobj/pmemlog/obj_pmemlog_macros.vcxproj index a1edeaabd19..86ad7b62742 100644 --- a/src/examples/libpmemobj/pmemlog/obj_pmemlog_macros.vcxproj +++ b/src/examples/libpmemobj/pmemlog/obj_pmemlog_macros.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pmemlog/obj_pmemlog_minimal.vcxproj b/src/examples/libpmemobj/pmemlog/obj_pmemlog_minimal.vcxproj index 4817ddaaf9d..0fe1596e8cb 100644 --- a/src/examples/libpmemobj/pmemlog/obj_pmemlog_minimal.vcxproj +++ b/src/examples/libpmemobj/pmemlog/obj_pmemlog_minimal.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pmemlog/obj_pmemlog_simple.vcxproj b/src/examples/libpmemobj/pmemlog/obj_pmemlog_simple.vcxproj index 67ef4a8e603..1902d43e219 100644 --- a/src/examples/libpmemobj/pmemlog/obj_pmemlog_simple.vcxproj +++ b/src/examples/libpmemobj/pmemlog/obj_pmemlog_simple.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/pmemobjfs/README b/src/examples/libpmemobj/pmemobjfs/README index 779d8fbf952..54a11fd0638 100644 --- a/src/examples/libpmemobj/pmemobjfs/README +++ b/src/examples/libpmemobj/pmemobjfs/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/pmemobjfs/README. diff --git a/src/examples/libpmemobj/pminvaders/README b/src/examples/libpmemobj/pminvaders/README index 53c3f80f73a..fa090db8b79 100644 --- a/src/examples/libpmemobj/pminvaders/README +++ b/src/examples/libpmemobj/pminvaders/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmemobj/pminvaders/README. diff --git a/src/examples/libpmemobj/pmpong/README b/src/examples/libpmemobj/pmpong/README index f54017a187e..f522ba70e00 100644 --- a/src/examples/libpmemobj/pmpong/README +++ b/src/examples/libpmemobj/pmpong/README @@ -1,4 +1,4 @@ - Non-Volatile Memory Library + Persistent Memory Development Kit This is examples/libpmemobj/pmpong/README. diff --git a/src/examples/libpmemobj/pmpong/pmpong.vcxproj b/src/examples/libpmemobj/pmpong/pmpong.vcxproj index ce3169c082a..681ddb9bcf9 100644 --- a/src/examples/libpmemobj/pmpong/pmpong.vcxproj +++ b/src/examples/libpmemobj/pmpong/pmpong.vcxproj @@ -16,7 +16,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store/reader.vcxproj b/src/examples/libpmemobj/string_store/reader.vcxproj index b152a94695f..26f33653612 100644 --- a/src/examples/libpmemobj/string_store/reader.vcxproj +++ b/src/examples/libpmemobj/string_store/reader.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store/writer.vcxproj b/src/examples/libpmemobj/string_store/writer.vcxproj index 38e5953f443..b5e890e310a 100644 --- a/src/examples/libpmemobj/string_store/writer.vcxproj +++ b/src/examples/libpmemobj/string_store/writer.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store_tx/reader.vcxproj b/src/examples/libpmemobj/string_store_tx/reader.vcxproj index 74175384fc8..523449a430e 100644 --- a/src/examples/libpmemobj/string_store_tx/reader.vcxproj +++ b/src/examples/libpmemobj/string_store_tx/reader.vcxproj @@ -15,7 +15,7 @@ pmemobj_tx 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store_tx/writer.vcxproj b/src/examples/libpmemobj/string_store_tx/writer.vcxproj index 91aaa20d2db..b212e472d6d 100644 --- a/src/examples/libpmemobj/string_store_tx/writer.vcxproj +++ b/src/examples/libpmemobj/string_store_tx/writer.vcxproj @@ -15,7 +15,7 @@ pmemobj_tx 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store_tx_type/reader.vcxproj b/src/examples/libpmemobj/string_store_tx_type/reader.vcxproj index 465a9d897cb..9a71c73f121 100644 --- a/src/examples/libpmemobj/string_store_tx_type/reader.vcxproj +++ b/src/examples/libpmemobj/string_store_tx_type/reader.vcxproj @@ -15,7 +15,7 @@ pmemobj_tx_type 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/string_store_tx_type/writer.vcxproj b/src/examples/libpmemobj/string_store_tx_type/writer.vcxproj index 84dd0bf81c2..e4ec4ca228f 100644 --- a/src/examples/libpmemobj/string_store_tx_type/writer.vcxproj +++ b/src/examples/libpmemobj/string_store_tx_type/writer.vcxproj @@ -15,7 +15,7 @@ pmemobj_tx_type 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/tree_map/btree_map.vcxproj b/src/examples/libpmemobj/tree_map/btree_map.vcxproj index 7ba7523928f..cace60ae3c2 100644 --- a/src/examples/libpmemobj/tree_map/btree_map.vcxproj +++ b/src/examples/libpmemobj/tree_map/btree_map.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/tree_map/ctree_map.vcxproj b/src/examples/libpmemobj/tree_map/ctree_map.vcxproj index 4eb20bcc548..b87f67bf1ed 100644 --- a/src/examples/libpmemobj/tree_map/ctree_map.vcxproj +++ b/src/examples/libpmemobj/tree_map/ctree_map.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/tree_map/rbtree_map.vcxproj b/src/examples/libpmemobj/tree_map/rbtree_map.vcxproj index 079411d8db2..6b0a80f796e 100644 --- a/src/examples/libpmemobj/tree_map/rbtree_map.vcxproj +++ b/src/examples/libpmemobj/tree_map/rbtree_map.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmemobj/tree_map/rtree_map.vcxproj b/src/examples/libpmemobj/tree_map/rtree_map.vcxproj index 1ac5707cb86..02970f7ef22 100644 --- a/src/examples/libpmemobj/tree_map/rtree_map.vcxproj +++ b/src/examples/libpmemobj/tree_map/rtree_map.vcxproj @@ -15,7 +15,7 @@ pmemobj 10.0.14393.0 - + {1baa1617-93ae-4196-8a1a-bd492fb18aef} diff --git a/src/examples/libpmempool/README b/src/examples/libpmempool/README index 751b93d11a9..265992f6c17 100644 --- a/src/examples/libpmempool/README +++ b/src/examples/libpmempool/README @@ -1,11 +1,11 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libpmempool/README. This directory contains examples for libpmempool, the library providing support for off-line pool management, diagnostics and repair. Some of these examples are explained in more detail -here: http://pmem.io/nvml/libpmempool +here: http://pmem.io/pmdk/libpmempool manpage.c is the example used in the libpmempool man page. @@ -15,6 +15,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and -man pages. Developers new to NVML are probably looking for libpmemobj. +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and +man pages. Developers new to PMDK are probably looking for libpmemobj. diff --git a/src/examples/librpmem/README b/src/examples/librpmem/README index c0d4271e2ca..d643c9bd00e 100644 --- a/src/examples/librpmem/README +++ b/src/examples/librpmem/README @@ -1,3 +1,5 @@ +Persistent Memory Development Kit + This is src/example/librpmem/README file. This directory contains a basic example application utilizing diff --git a/src/examples/libvmem/README b/src/examples/libvmem/README index b329e8deb60..3b051fb1597 100644 --- a/src/examples/libvmem/README +++ b/src/examples/libvmem/README @@ -1,10 +1,10 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is examples/libvmem/README. This directory contains examples for libvmem, the library providing a volatile memory allocator for persistent memory. Some examples -are described in more detail here: http://pmem.io/nvml/libvmem +are described in more detail here: http://pmem.io/pmdk/libvmem manpage.c is the example used in the libvmem man page. @@ -14,6 +14,6 @@ To build these examples: These examples can be built against an installed system using: make LIBDIR=/usr/lib INCDIR=/usr/include -If you're looking for documentation to get you started using NVML, -start here: http://pmem.io/nvml and follow the links to examples and +If you're looking for documentation to get you started using PMDK, +start here: http://pmem.io/pmdk and follow the links to examples and man pages. diff --git a/src/examples/libvmem/manpage.vcxproj b/src/examples/libvmem/manpage.vcxproj index f914e8dd740..58f3b3d0b83 100644 --- a/src/examples/libvmem/manpage.vcxproj +++ b/src/examples/libvmem/manpage.vcxproj @@ -53,7 +53,7 @@ libvmem.lib - + {08762559-e9df-475b-ba99-49f4b5a1d80b} diff --git a/src/freebsd/README b/src/freebsd/README index 57c82061b11..f0f065d8856 100644 --- a/src/freebsd/README +++ b/src/freebsd/README @@ -1,8 +1,8 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/freebsd/README. -This directory contains FreeBSD-specific files for the NVM Library. +This directory contains FreeBSD-specific files for the Persistent Memory Development Kit. The subdirectory "include" contains header files that have no equivalents on FreeBSD. Most of these files are empty, which is a cheap trick to avoid diff --git a/src/include/README b/src/include/README index 5d31e6cb061..6b3cfe7a7c2 100644 --- a/src/include/README +++ b/src/include/README @@ -1,9 +1,9 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/include/README. -This directory contains include files that are meant to be -installed on a system when the NVM Library package is installed. +This directory contains include files that are meant to be installed on +a system when the Persistent Memory Development Kit package is installed. These include files provide the public information exported by the libraries that is necessary for applications to call into the libraries. Private include files, used only internally in diff --git a/src/include/libpmemobj++/allocator.hpp b/src/include/libpmemobj++/allocator.hpp index 116049dc849..949bec87614 100644 --- a/src/include/libpmemobj++/allocator.hpp +++ b/src/include/libpmemobj++/allocator.hpp @@ -422,7 +422,7 @@ operator==(standard_alloc_policy const &, OtherAllocator const &) /** * (EXPERIMENTAL) Encapsulates the information about the persistent - * memory allocation model using NVML's libpmemobj. This information includes + * memory allocation model using PMDK's libpmemobj. This information includes * the knowledge of the pointer type, their difference type, the type of the * size of objects in this allocation model as well as memory allocation and * deallocation primitives. diff --git a/src/jemalloc/INSTALL b/src/jemalloc/INSTALL index e3747c30e2b..689aeba33a4 100644 --- a/src/jemalloc/INSTALL +++ b/src/jemalloc/INSTALL @@ -313,7 +313,7 @@ How to build jemalloc for Windows 6. Now the project can be opened and built in Visual Studio: - src\NVML.sln + src\PMDK.sln === Documentation ============================================================== diff --git a/src/jemalloc/Makefile.libpmemcto b/src/jemalloc/Makefile.libpmemcto index c12754c1948..5deb512f870 100644 --- a/src/jemalloc/Makefile.libpmemcto +++ b/src/jemalloc/Makefile.libpmemcto @@ -37,7 +37,7 @@ EXTRA_TARGETS = jemalloc default: all -JEMALLOC_NVMLDIR=libpmemcto +JEMALLOC_PMDKDIR=libpmemcto include ./jemalloc.mk JEMALLOC_CONFIG += --disable-bsd-malloc-hooks diff --git a/src/jemalloc/Makefile.libvmem b/src/jemalloc/Makefile.libvmem index a65f9091ca7..3074e387963 100644 --- a/src/jemalloc/Makefile.libvmem +++ b/src/jemalloc/Makefile.libvmem @@ -37,7 +37,7 @@ EXTRA_TARGETS = jemalloc default: all -JEMALLOC_NVMLDIR=libvmem +JEMALLOC_PMDKDIR=libvmem include ./jemalloc.mk JEMALLOC_CONFIG += --disable-bsd-malloc-hooks diff --git a/src/jemalloc/Makefile.libvmmalloc b/src/jemalloc/Makefile.libvmmalloc index 6573ddf6e45..b5a28a4f9b0 100644 --- a/src/jemalloc/Makefile.libvmmalloc +++ b/src/jemalloc/Makefile.libvmmalloc @@ -37,7 +37,7 @@ EXTRA_TARGETS = jemalloc default: all -JEMALLOC_NVMLDIR=libvmmalloc +JEMALLOC_PMDKDIR=libvmmalloc include ./jemalloc.mk ifeq ($(DEBUG),1) diff --git a/src/jemalloc/README.libvmem b/src/jemalloc/README.libvmem index 1ea72a5a994..d248b6a79ae 100644 --- a/src/jemalloc/README.libvmem +++ b/src/jemalloc/README.libvmem @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/jemalloc/README.libvmem. diff --git a/src/jemalloc/jemalloc.mk b/src/jemalloc/jemalloc.mk index 1bcfca0a5f1..82d1b20bb24 100644 --- a/src/jemalloc/jemalloc.mk +++ b/src/jemalloc/jemalloc.mk @@ -42,7 +42,7 @@ JEMALLOC_DIR = $(realpath ../jemalloc) ifeq ($(OBJDIR),$(abspath $(OBJDIR))) JEMALLOC_OBJDIR = $(OBJDIR)/jemalloc else -JEMALLOC_OBJDIR = ../$(OBJDIR)/$(JEMALLOC_NVMLDIR)/jemalloc +JEMALLOC_OBJDIR = ../$(OBJDIR)/$(JEMALLOC_PMDKDIR)/jemalloc endif JEMALLOC_MAKEFILE = $(JEMALLOC_OBJDIR)/Makefile JEMALLOC_CFG = $(JEMALLOC_DIR)/configure diff --git a/src/libpmem/cpu.h b/src/libpmem/cpu.h index 6d8018255a4..6089e2aecdf 100644 --- a/src/libpmem/cpu.h +++ b/src/libpmem/cpu.h @@ -1,5 +1,5 @@ /* - * Copyright 2016, Intel Corporation + * Copyright 2016-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -30,8 +30,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef NVML_CPU_H -#define NVML_CPU_H 1 +#ifndef PMDK_CPU_H +#define PMDK_CPU_H 1 /* * cpu.h -- definitions for "cpu" module diff --git a/src/libpmem/libpmem.def b/src/libpmem/libpmem.def index a9c966a4f9d..dee0771e8f6 100644 --- a/src/libpmem/libpmem.def +++ b/src/libpmem/libpmem.def @@ -36,7 +36,7 @@ ; XXX - libpmem exports mmap/munmap/msync/mprotect functions ; ; This is a _temporary_ solution to make those function available for all -; the other NVM libraries and to have only one instance of a file mapping +; the other PMDK libraries and to have only one instance of a file mapping ; list (owned by libpmem). Otherwise, each library would have its own ; instance of the file mapping list, resulting in libpmem being not able ; to find a file handle associated with the mapping address passed to @@ -46,7 +46,7 @@ ; - implementation of pmem_mmap, pmem_unmap, pmem_msync and ; pmem_mprotect functions in libpmem (pmem_unmap and pmem_msync are ; already there); -; - making sure that all the NVM libraries never call mmap, munmap, +; - making sure that all the PMDK libraries never call mmap, munmap, ; msync and mprotect directly, but only through their libpmem counterparts; ; - new pmem_mmap() function must provide similar functionality to ; mmap(), i.e. it must take 'offset' argument, but should not take diff --git a/src/libpmemcto/Makefile b/src/libpmemcto/Makefile index 706c6798c42..93f2e62be36 100644 --- a/src/libpmemcto/Makefile +++ b/src/libpmemcto/Makefile @@ -45,7 +45,7 @@ SOURCE +=\ default: all -JEMALLOC_NVMLDIR = libpmemcto +JEMALLOC_PMDKDIR = libpmemcto include ../jemalloc/jemalloc.mk INCS += -I../../libpmemcto diff --git a/src/libvmem/Makefile b/src/libvmem/Makefile index f075849fccf..2d2e4ba331b 100644 --- a/src/libvmem/Makefile +++ b/src/libvmem/Makefile @@ -48,7 +48,7 @@ SOURCE = libvmem.c vmem.c\ default: all -JEMALLOC_NVMLDIR = libvmem +JEMALLOC_PMDKDIR = libvmem include ../jemalloc/jemalloc.mk INCS += -I$(JEMALLOC_DIR)/include/jemalloc diff --git a/src/libvmmalloc/Makefile b/src/libvmmalloc/Makefile index ce86e5d1aa1..48e32b688a6 100644 --- a/src/libvmmalloc/Makefile +++ b/src/libvmmalloc/Makefile @@ -47,7 +47,7 @@ SOURCE = libvmmalloc.c\ default: all -JEMALLOC_NVMLDIR=libvmmalloc +JEMALLOC_PMDKDIR=libvmmalloc include ../jemalloc/jemalloc.mk INCS += -I$(JEMALLOC_DIR)/include/jemalloc diff --git a/src/test/README b/src/test/README index f4fc1ed6873..3e07aa5c044 100644 --- a/src/test/README +++ b/src/test/README @@ -1,8 +1,8 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/README. -This directory contains the unit tests for the NVM Library. +This directory contains the unit tests for the Persistent Memory Development Kit. Unit tests require a config file, testconfig.sh, to exist in this directory. That file describes the local machine configuration (where to find persistent diff --git a/src/test/arch_flags/README b/src/test/arch_flags/README index c2aa1c75fc9..79f5dc16d0d 100644 --- a/src/test/arch_flags/README +++ b/src/test/arch_flags/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/arch_flags/README. diff --git a/src/test/blk_nblock/README b/src/test/blk_nblock/README index 87c8a79ab9b..6440a928b26 100644 --- a/src/test/blk_nblock/README +++ b/src/test/blk_nblock/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_nblock/README. diff --git a/src/test/blk_non_zero/README b/src/test/blk_non_zero/README index dbfbfa43f28..c9ee8b74f0d 100644 --- a/src/test/blk_non_zero/README +++ b/src/test/blk_non_zero/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_non_zero/README. @@ -15,8 +15,8 @@ pmemblk_write() for LBA 5, pmemblk_set_zero() for LBA 9, and pmem_set_error() for LBA 100. In tests 0-4 the map is filled with pseudo-random data before any read/write -operation is made. In tests 5-8 the pool is created by the NVM Library and -is zero filled. Each block written is filled up with the ordinal number of +operation is made. In tests 5-8 the pool is created by the libpmemblk Library +and is zero filled. Each block written is filled up with the ordinal number of the write operation (a block full of 8-bit 1s, then a block filled with 8-bit 2s, etc.). When a block is read, the number it was filled with is reported (and the program verifies the entire block is filled with that number). diff --git a/src/test/blk_pool/README b/src/test/blk_pool/README index 5470a8e7ac6..c775a50ce65 100644 --- a/src/test/blk_pool/README +++ b/src/test/blk_pool/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_pool/README. diff --git a/src/test/blk_recovery/README b/src/test/blk_recovery/README index 5d418f88d6f..7feb5051254 100644 --- a/src/test/blk_recovery/README +++ b/src/test/blk_recovery/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_recovery/README. diff --git a/src/test/blk_rw/README b/src/test/blk_rw/README index 417b017c806..f8196017e8c 100644 --- a/src/test/blk_rw/README +++ b/src/test/blk_rw/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_rw/README. diff --git a/src/test/blk_rw_mt/README b/src/test/blk_rw_mt/README index 4d808a6cc48..a5de2982a26 100644 --- a/src/test/blk_rw_mt/README +++ b/src/test/blk_rw_mt/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/blk_rw_mt/README. diff --git a/src/test/bttdevice/README b/src/test/bttdevice/README index ae6f23190e5..fa28ea2397e 100644 --- a/src/test/bttdevice/README +++ b/src/test/bttdevice/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/bttdevice/README. diff --git a/src/test/cto_pool/README b/src/test/cto_pool/README index cf9adb23ec4..a6f84da4ae3 100644 --- a/src/test/cto_pool/README +++ b/src/test/cto_pool/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/cto_pool/README. diff --git a/src/test/ex_libpmem/README b/src/test/ex_libpmem/README index 2bee0b6f252..db9e75fe890 100644 --- a/src/test/ex_libpmem/README +++ b/src/test/ex_libpmem/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_libpmem/README. diff --git a/src/test/ex_libpmemblk/README b/src/test/ex_libpmemblk/README index 35c80e4974f..6d16de1fc26 100644 --- a/src/test/ex_libpmemblk/README +++ b/src/test/ex_libpmemblk/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_libpmemblk/README. diff --git a/src/test/ex_libpmemcto/README b/src/test/ex_libpmemcto/README index aaf80e719ab..caf50ee597a 100644 --- a/src/test/ex_libpmemcto/README +++ b/src/test/ex_libpmemcto/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_libpmemcto/README. diff --git a/src/test/ex_libpmemcto/TEST1 b/src/test/ex_libpmemcto/TEST1 index 03eb6089e0b..25e742dce01 100755 --- a/src/test/ex_libpmemcto/TEST1 +++ b/src/test/ex_libpmemcto/TEST1 @@ -55,7 +55,7 @@ Hello world! key2 1234567890 key3 -NVML +PMDK key4 PMEM EOF diff --git a/src/test/ex_libpmemcto/out1.log.match b/src/test/ex_libpmemcto/out1.log.match index 4d8ad4554a3..d2f2498fa86 100644 --- a/src/test/ex_libpmemcto/out1.log.match +++ b/src/test/ex_libpmemcto/out1.log.match @@ -2,7 +2,7 @@ > > key len 4 = [key1], value len 12 = [Hello world!] key len 4 = [key2], value len 10 = [1234567890] -key len 4 = [key3], value len 4 = [NVML] +key len 4 = [key3], value len 4 = [PMDK] key len 4 = [key4], value len 4 = [PMEM] > @@ -25,7 +25,7 @@ N$(nW) -> N$(nW); N$(nW) -> N$(nW) [label="3"]; N$(nW) [shape=box, label="leaf at\n$(nW)"]; N$(nW) [shape=box, label="key at $(nW): key3"]; -N$(nW) [shape=box, label="value at $(nW): NVML"]; +N$(nW) [shape=box, label="value at $(nW): PMDK"]; N$(nW) -> N$(nW); N$(nW) -> N$(nW); N$(nW) -> N$(nW) [label="4"]; diff --git a/src/test/ex_libpmemlog/README b/src/test/ex_libpmemlog/README index 356b6a69d89..7d0774c0a4f 100644 --- a/src/test/ex_libpmemlog/README +++ b/src/test/ex_libpmemlog/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_libpmemlog/README. diff --git a/src/test/ex_libpmemlog/TEST0 b/src/test/ex_libpmemlog/TEST0 index 72f88edafe2..ee550c22f8a 100755 --- a/src/test/ex_libpmemlog/TEST0 +++ b/src/test/ex_libpmemlog/TEST0 @@ -55,7 +55,7 @@ expect_normal_exit $EX_PATH/addlog $DIR/testfile1 "Hello World! foo bar" > out$U expect_normal_exit $EX_PATH/printlog $DIR/testfile1 >> out$UNITTEST_NUM.log 2>&1 expect_normal_exit $EX_PATH/addlog $DIR/testfile1 "PMEMLOG" >> out$UNITTEST_NUM.log 2>&1 expect_normal_exit $EX_PATH/printlog -t $DIR/testfile1 >> out$UNITTEST_NUM.log 2>&1 -expect_normal_exit $EX_PATH/addlog $DIR/testfile1 "NVML" >> out$UNITTEST_NUM.log 2>&1 +expect_normal_exit $EX_PATH/addlog $DIR/testfile1 "PMDK" >> out$UNITTEST_NUM.log 2>&1 expect_normal_exit $EX_PATH/printlog -t $DIR/testfile1 >> out$UNITTEST_NUM.log 2>&1 check_pool $DIR/testfile1 diff --git a/src/test/ex_libpmemlog/TEST0.PS1 b/src/test/ex_libpmemlog/TEST0.PS1 index 8b0ee969934..2bb234948bc 100644 --- a/src/test/ex_libpmemlog/TEST0.PS1 +++ b/src/test/ex_libpmemlog/TEST0.PS1 @@ -57,7 +57,7 @@ expect_normal_exit $Env:EXE_DIR\ex_pmemlog_addlog $DIR\testfile1 "Hello" "World! expect_normal_exit $Env:EXE_DIR\ex_pmemlog_printlog $DIR\testfile1 >> out$Env:UNITTEST_NUM.log 2>&1 expect_normal_exit $Env:EXE_DIR\ex_pmemlog_addlog $DIR\testfile1 "PMEMLOG" >> out$Env:UNITTEST_NUM.log 2>&1 expect_normal_exit $Env:EXE_DIR\ex_pmemlog_printlog -t $DIR\testfile1 >> out$Env:UNITTEST_NUM.log 2>&1 -expect_normal_exit $Env:EXE_DIR\ex_pmemlog_addlog $DIR\testfile1 "NVML" >> out$Env:UNITTEST_NUM.log 2>&1 +expect_normal_exit $Env:EXE_DIR\ex_pmemlog_addlog $DIR\testfile1 "PMDK" >> out$Env:UNITTEST_NUM.log 2>&1 expect_normal_exit $Env:EXE_DIR\ex_pmemlog_printlog -t $DIR\testfile1 >> out$Env:UNITTEST_NUM.log 2>&1 check_pool $DIR\testfile1 diff --git a/src/test/ex_libpmemlog/out0.log.match b/src/test/ex_libpmemlog/out0.log.match index 7559b7635b0..41e87500c56 100644 --- a/src/test/ex_libpmemlog/out0.log.match +++ b/src/test/ex_libpmemlog/out0.log.match @@ -19,4 +19,4 @@ PMEMLOG Entry from pid: $(N) Created: $(*) Contents: -NVML +PMDK diff --git a/src/test/ex_libpmemobj/README b/src/test/ex_libpmemobj/README index d2e58fab2c3..2be08e0709b 100644 --- a/src/test/ex_libpmemobj/README +++ b/src/test/ex_libpmemobj/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_libpmemobj/README. diff --git a/src/test/ex_linkedlist/README b/src/test/ex_linkedlist/README index 7195df71e19..cc03acdd8c1 100644 --- a/src/test/ex_linkedlist/README +++ b/src/test/ex_linkedlist/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/ex_linkedlist/README. diff --git a/src/test/libpmempool_api/README b/src/test/libpmempool_api/README index b02facb131f..74b297edc1a 100644 --- a/src/test/libpmempool_api/README +++ b/src/test/libpmempool_api/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_api/README. diff --git a/src/test/libpmempool_api_win/README b/src/test/libpmempool_api_win/README index e3dc8e11afc..81a29b3987d 100644 --- a/src/test/libpmempool_api_win/README +++ b/src/test/libpmempool_api_win/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_api_win/README. diff --git a/src/test/libpmempool_backup/README b/src/test/libpmempool_backup/README index 0f1aa0a7162..3a6811e8bec 100644 --- a/src/test/libpmempool_backup/README +++ b/src/test/libpmempool_backup/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_backup/README. diff --git a/src/test/libpmempool_bttdev/README b/src/test/libpmempool_bttdev/README index c5394da9b38..1bdf8d7f8d4 100644 --- a/src/test/libpmempool_bttdev/README +++ b/src/test/libpmempool_bttdev/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_bttdev/README. diff --git a/src/test/libpmempool_map_flog/README b/src/test/libpmempool_map_flog/README index 0c4f746286f..531489af868 100644 --- a/src/test/libpmempool_map_flog/README +++ b/src/test/libpmempool_map_flog/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_map_flog/README. diff --git a/src/test/libpmempool_rm/README b/src/test/libpmempool_rm/README index 368d8629fc9..b72fb3e6e4a 100644 --- a/src/test/libpmempool_rm/README +++ b/src/test/libpmempool_rm/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_rm/README. diff --git a/src/test/libpmempool_rm_win/README b/src/test/libpmempool_rm_win/README index 70e0ecfdc14..c346e63cfd5 100644 --- a/src/test/libpmempool_rm_win/README +++ b/src/test/libpmempool_rm_win/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_rm_win/README. diff --git a/src/test/libpmempool_sync/README b/src/test/libpmempool_sync/README index cd16b5e010d..47efb57e678 100644 --- a/src/test/libpmempool_sync/README +++ b/src/test/libpmempool_sync/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_sync/README. diff --git a/src/test/libpmempool_sync_win/README b/src/test/libpmempool_sync_win/README index ba9aa04c9b9..59e9da6a277 100644 --- a/src/test/libpmempool_sync_win/README +++ b/src/test/libpmempool_sync_win/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_sync_win/README. diff --git a/src/test/libpmempool_transform/README b/src/test/libpmempool_transform/README index b82a03e8840..50e6e5e5cfb 100644 --- a/src/test/libpmempool_transform/README +++ b/src/test/libpmempool_transform/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/libpmempool_transform/README. diff --git a/src/test/log_basic/README b/src/test/log_basic/README index 92afc5a2553..88a99952838 100644 --- a/src/test/log_basic/README +++ b/src/test/log_basic/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/log_basic/README. diff --git a/src/test/log_pool/README b/src/test/log_pool/README index b2a82a63bbc..498cb6970b3 100644 --- a/src/test/log_pool/README +++ b/src/test/log_pool/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/log_pool/README. diff --git a/src/test/log_recovery/README b/src/test/log_recovery/README index 6751b30f921..8adede041c3 100644 --- a/src/test/log_recovery/README +++ b/src/test/log_recovery/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/log_recovery/README. diff --git a/src/test/log_walker/README b/src/test/log_walker/README index 3f70f2cf315..d1a6a39a0dd 100644 --- a/src/test/log_walker/README +++ b/src/test/log_walker/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/log_walker/README. diff --git a/src/test/magic/README b/src/test/magic/README index 11652c63389..d8a8b4e5835 100644 --- a/src/test/magic/README +++ b/src/test/magic/README @@ -1,8 +1,8 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/magic/README. -This directory contains a unit test for NVML magic file. +This directory contains a unit test for PMDK magic file. -Magic file contains pattern for identifying NVML pool file format. This file +Magic file contains pattern for identifying PMDK pool file format. This file is read by file(1) command. See file(1) and magic(4) manual pages for details. diff --git a/src/test/magic/TEST0 b/src/test/magic/TEST0 index 4cc6997b497..9e9fb8ee7ec 100755 --- a/src/test/magic/TEST0 +++ b/src/test/magic/TEST0 @@ -50,7 +50,7 @@ setup POOL=$DIR/file.pool LOG=out${UNITTEST_NUM}.log -MAGIC=../../../utils/nvml.magic +MAGIC=../../../utils/pmdk.magic rm -rf $LOG && touch $LOG rm -rf $POOL diff --git a/src/test/obj_convert/TEST0 b/src/test/obj_convert/TEST0 index ed27f28529d..a91fe753a96 100755 --- a/src/test/obj_convert/TEST0 +++ b/src/test/obj_convert/TEST0 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 0 diff --git a/src/test/obj_convert/TEST11 b/src/test/obj_convert/TEST11 index 2af04d11950..4f9a8435a4b 100755 --- a/src/test/obj_convert/TEST11 +++ b/src/test/obj_convert/TEST11 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 1 diff --git a/src/test/obj_convert/TEST12 b/src/test/obj_convert/TEST12 index 8633f754ef0..14dcd1e1bbf 100755 --- a/src/test/obj_convert/TEST12 +++ b/src/test/obj_convert/TEST12 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 2 diff --git a/src/test/obj_convert/TEST13 b/src/test/obj_convert/TEST13 index 3bc0a66fa34..ddc33c34cba 100755 --- a/src/test/obj_convert/TEST13 +++ b/src/test/obj_convert/TEST13 @@ -61,7 +61,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 3 diff --git a/src/test/obj_convert/TEST14 b/src/test/obj_convert/TEST14 index 7638dca36b1..d30aa816bf2 100755 --- a/src/test/obj_convert/TEST14 +++ b/src/test/obj_convert/TEST14 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 4 diff --git a/src/test/obj_convert/TEST15 b/src/test/obj_convert/TEST15 index a6f1d261b83..0fce4b96dfd 100755 --- a/src/test/obj_convert/TEST15 +++ b/src/test/obj_convert/TEST15 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 5 diff --git a/src/test/obj_convert/TEST16 b/src/test/obj_convert/TEST16 index 84b81841ebf..3993621084c 100755 --- a/src/test/obj_convert/TEST16 +++ b/src/test/obj_convert/TEST16 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 6 diff --git a/src/test/obj_convert/TEST17 b/src/test/obj_convert/TEST17 index 5aee0a0cd5a..87ff41251d4 100755 --- a/src/test/obj_convert/TEST17 +++ b/src/test/obj_convert/TEST17 @@ -61,7 +61,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 7 diff --git a/src/test/obj_convert/TEST18 b/src/test/obj_convert/TEST18 index 02679b671c1..2cbb930ddb2 100755 --- a/src/test/obj_convert/TEST18 +++ b/src/test/obj_convert/TEST18 @@ -57,7 +57,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 8 diff --git a/src/test/obj_convert/TEST19 b/src/test/obj_convert/TEST19 index 3c89e75a1c2..b8ae757b2d1 100755 --- a/src/test/obj_convert/TEST19 +++ b/src/test/obj_convert/TEST19 @@ -59,7 +59,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. If not set the pools to convert and verify are extracted from # a prebuilt archive. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug run_scenarios 9 diff --git a/src/test/obj_convert/TEST3 b/src/test/obj_convert/TEST3 index e1b116ed01f..01a9a73fb26 100755 --- a/src/test/obj_convert/TEST3 +++ b/src/test/obj_convert/TEST3 @@ -52,7 +52,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug POOLSET=$DIR/testset1 diff --git a/src/test/obj_convert/TEST4 b/src/test/obj_convert/TEST4 index 1cadf721781..361c44deda2 100755 --- a/src/test/obj_convert/TEST4 +++ b/src/test/obj_convert/TEST4 @@ -52,7 +52,7 @@ setup # set this to enable runtime creation of pools based on the old version of # the library. -#PATH_TO_1_0_DBG=/path/to/nvml_1.0/debug +#PATH_TO_1_0_DBG=/path/to/pmdk_1.0/debug POOLSET=$DIR/testset1 diff --git a/src/test/obj_convert/common.sh b/src/test/obj_convert/common.sh index 2fdabee5569..d6450869199 100644 --- a/src/test/obj_convert/common.sh +++ b/src/test/obj_convert/common.sh @@ -65,12 +65,12 @@ create_scenario() { ./obj_convert$EXESUFFIX $DIR/scenario$2c c $2 &> /dev/null } -#PATH_TO_1_0_DBG=/../nvml/src/debug +#PATH_TO_1_0_DBG=/../pmdk/src/debug create_scenario_1_0() { create_scenario $PATH_TO_1_0_DBG $1 } -#PATH_TO_1_2_DBG=/../nvml2/src/debug +#PATH_TO_1_2_DBG=/../pmdk2/src/debug create_scenario_1_2() { create_scenario $PATH_TO_1_2_DBG $1 } diff --git a/src/test/obj_debug/README b/src/test/obj_debug/README index fae4ba3ff79..44aea79fb64 100644 --- a/src/test/obj_debug/README +++ b/src/test/obj_debug/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_debug/README. diff --git a/src/test/obj_first_next/README b/src/test/obj_first_next/README index 9d8bc018dc4..8a5858ddb72 100644 --- a/src/test/obj_first_next/README +++ b/src/test/obj_first_next/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_first_next/README. diff --git a/src/test/obj_list/README b/src/test/obj_list/README index bab672a02eb..b0210fedff9 100644 --- a/src/test/obj_list/README +++ b/src/test/obj_list/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list/README. diff --git a/src/test/obj_list_insert/README b/src/test/obj_list_insert/README index aa56523f75b..3f7b54a45d5 100644 --- a/src/test/obj_list_insert/README +++ b/src/test/obj_list_insert/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_insert/README. diff --git a/src/test/obj_list_macro/README b/src/test/obj_list_macro/README index 83465cae01d..eb5410492c2 100644 --- a/src/test/obj_list_macro/README +++ b/src/test/obj_list_macro/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_macro/README. diff --git a/src/test/obj_list_move/README b/src/test/obj_list_move/README index 844c28752e2..e706da0f0c5 100644 --- a/src/test/obj_list_move/README +++ b/src/test/obj_list_move/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_move/README. diff --git a/src/test/obj_list_recovery/README b/src/test/obj_list_recovery/README index ee19ab09b8a..e42497bca91 100644 --- a/src/test/obj_list_recovery/README +++ b/src/test/obj_list_recovery/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_recovery/README. diff --git a/src/test/obj_list_remove/README b/src/test/obj_list_remove/README index 49c567103a6..9e1f0bdaf74 100644 --- a/src/test/obj_list_remove/README +++ b/src/test/obj_list_remove/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_remove/README. diff --git a/src/test/obj_list_valgrind/README b/src/test/obj_list_valgrind/README index 6a21cfd1433..0d8f97ffcc7 100644 --- a/src/test/obj_list_valgrind/README +++ b/src/test/obj_list_valgrind/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_list_valgrind/README. diff --git a/src/test/obj_persist_count/README b/src/test/obj_persist_count/README index 5c406e4264a..56f44d694ee 100644 --- a/src/test/obj_persist_count/README +++ b/src/test/obj_persist_count/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_persist_count/README. diff --git a/src/test/obj_pool/README b/src/test/obj_pool/README index 5f12853bf8f..000308fb72d 100644 --- a/src/test/obj_pool/README +++ b/src/test/obj_pool/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_pool/README. diff --git a/src/test/obj_redo_log/README b/src/test/obj_redo_log/README index 89210bac979..c0606020d14 100644 --- a/src/test/obj_redo_log/README +++ b/src/test/obj_redo_log/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_redo_log/README. diff --git a/src/test/obj_sync/README b/src/test/obj_sync/README index 64bbf0ae7f8..0a9a88e52de 100644 --- a/src/test/obj_sync/README +++ b/src/test/obj_sync/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_sync/README. diff --git a/src/test/obj_tx_locks/README b/src/test/obj_tx_locks/README index 12b34938f53..4d9e863db23 100644 --- a/src/test/obj_tx_locks/README +++ b/src/test/obj_tx_locks/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_tx_locks/README. diff --git a/src/test/obj_tx_locks_abort/README b/src/test/obj_tx_locks_abort/README index 62d0fb7a56b..d348138a65c 100644 --- a/src/test/obj_tx_locks_abort/README +++ b/src/test/obj_tx_locks_abort/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/obj_tx_locks_abort/README. diff --git a/src/test/pmem_is_pmem/README b/src/test/pmem_is_pmem/README index 007fd174888..008ec504193 100644 --- a/src/test/pmem_is_pmem/README +++ b/src/test/pmem_is_pmem/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_is_pmem/README. diff --git a/src/test/pmem_is_pmem_linux/README b/src/test/pmem_is_pmem_linux/README index b4d3128c156..6db43582856 100644 --- a/src/test/pmem_is_pmem_linux/README +++ b/src/test/pmem_is_pmem_linux/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_is_pmem_linux/README. diff --git a/src/test/pmem_is_pmem_windows/README b/src/test/pmem_is_pmem_windows/README index 8f9f9f5d7bb..23f45213da3 100644 --- a/src/test/pmem_is_pmem_windows/README +++ b/src/test/pmem_is_pmem_windows/README @@ -1,4 +1,4 @@ -NVM Library +Persistent Memory Development Kit This is src/test/pmem_is_pmem_windows/README. diff --git a/src/test/pmem_map_file/README b/src/test/pmem_map_file/README index db95e34f7e6..17276bb54fa 100644 --- a/src/test/pmem_map_file/README +++ b/src/test/pmem_map_file/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_map_file/README. diff --git a/src/test/pmem_map_file_win/README b/src/test/pmem_map_file_win/README index e02074d1ef6..a13e497df0f 100644 --- a/src/test/pmem_map_file_win/README +++ b/src/test/pmem_map_file_win/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_map_file_win/README. diff --git a/src/test/pmem_memcpy/README b/src/test/pmem_memcpy/README index 12c143006fc..876ee1ec503 100644 --- a/src/test/pmem_memcpy/README +++ b/src/test/pmem_memcpy/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_memcpy/README. diff --git a/src/test/pmem_memmove/README b/src/test/pmem_memmove/README index 0dd82800095..9df8bccef21 100644 --- a/src/test/pmem_memmove/README +++ b/src/test/pmem_memmove/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_memmove/README. diff --git a/src/test/pmem_memset/README b/src/test/pmem_memset/README index f6f247edc67..d28fa35e30e 100644 --- a/src/test/pmem_memset/README +++ b/src/test/pmem_memset/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_memset/README. diff --git a/src/test/pmem_movnt/README b/src/test/pmem_movnt/README index f543392978a..af365b3ed7b 100644 --- a/src/test/pmem_movnt/README +++ b/src/test/pmem_movnt/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_movnt/README. diff --git a/src/test/pmem_movnt_align/README b/src/test/pmem_movnt_align/README index c20b96fd666..544432f8abd 100644 --- a/src/test/pmem_movnt_align/README +++ b/src/test/pmem_movnt_align/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_movnt_align/README. diff --git a/src/test/pmem_valgr_simple/README b/src/test/pmem_valgr_simple/README index f301e4dbcb2..e02010f534d 100644 --- a/src/test/pmem_valgr_simple/README +++ b/src/test/pmem_valgr_simple/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmem_valgr_simple/README. diff --git a/src/test/pmempool_check/README b/src/test/pmempool_check/README index 899f4027d2c..a3fec80b256 100644 --- a/src/test/pmempool_check/README +++ b/src/test/pmempool_check/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_check/README. diff --git a/src/test/pmempool_create/README b/src/test/pmempool_create/README index 2ec01c1e578..a044cfb1d94 100644 --- a/src/test/pmempool_create/README +++ b/src/test/pmempool_create/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_create/README. diff --git a/src/test/pmempool_dump/README b/src/test/pmempool_dump/README index 52d228c7ed2..286fcd94bee 100644 --- a/src/test/pmempool_dump/README +++ b/src/test/pmempool_dump/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_dump/README. diff --git a/src/test/pmempool_help/README b/src/test/pmempool_help/README index 6432a29a3f6..65ef75d61bb 100644 --- a/src/test/pmempool_help/README +++ b/src/test/pmempool_help/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_help/README. diff --git a/src/test/pmempool_info/README b/src/test/pmempool_info/README index 5fe7f5eb4fd..92a51741378 100644 --- a/src/test/pmempool_info/README +++ b/src/test/pmempool_info/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_info/README. diff --git a/src/test/pmempool_rm/README b/src/test/pmempool_rm/README index da19b956300..13ead3c05bc 100644 --- a/src/test/pmempool_rm/README +++ b/src/test/pmempool_rm/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/pmempool_rm/README. diff --git a/src/test/pmempool_sync/README b/src/test/pmempool_sync/README index 61a9d23d2a4..5796f125815 100644 --- a/src/test/pmempool_sync/README +++ b/src/test/pmempool_sync/README @@ -1,4 +1,4 @@ -Linux NVM Library +Persistent Memory Development Kit This is src/test/pmempool_sync/README. diff --git a/src/test/pmempool_transform/README b/src/test/pmempool_transform/README index 2f4dc72191f..3d09288c1fe 100644 --- a/src/test/pmempool_transform/README +++ b/src/test/pmempool_transform/README @@ -1,4 +1,4 @@ -Linux NVM Library +Persistent Memory Development Kit This is src/test/pmempool_transform/README. diff --git a/src/test/pmempool_transform_remote/README b/src/test/pmempool_transform_remote/README index d6d98feb93c..465547eab92 100644 --- a/src/test/pmempool_transform_remote/README +++ b/src/test/pmempool_transform_remote/README @@ -1,4 +1,4 @@ -Linux NVM Library +Persistent Memory Development Kit This is src/test/pmempool_transform_remote/README. diff --git a/src/test/remote_basic/README b/src/test/remote_basic/README index aace64e75e7..d22915650bb 100644 --- a/src/test/remote_basic/README +++ b/src/test/remote_basic/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/remote_basic/README. diff --git a/src/test/remote_obj_basic/README b/src/test/remote_obj_basic/README index a9190aea1f1..625ce893bf3 100644 --- a/src/test/remote_obj_basic/README +++ b/src/test/remote_obj_basic/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/remote_obj_basic/README. diff --git a/src/test/rpmemd_config/README b/src/test/rpmemd_config/README index 6352d284193..fe95fa31aa2 100644 --- a/src/test/rpmemd_config/README +++ b/src/test/rpmemd_config/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/rpmemd_config/README. diff --git a/src/test/rpmemd_db/README b/src/test/rpmemd_db/README index 81370998f61..ff572da2a0a 100644 --- a/src/test/rpmemd_db/README +++ b/src/test/rpmemd_db/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/rpmemd_db_test/README. diff --git a/src/test/rpmemd_log/README b/src/test/rpmemd_log/README index 0f533ffe236..80f7cd1c701 100644 --- a/src/test/rpmemd_log/README +++ b/src/test/rpmemd_log/README @@ -1,4 +1,4 @@ -NVM Library +Persistent Memory Development Kit This is src/test/rpmemd_log/README. diff --git a/src/test/rpmemd_util/README b/src/test/rpmemd_util/README index c1f15fa9ad7..214391473d8 100644 --- a/src/test/rpmemd_util/README +++ b/src/test/rpmemd_util/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/rpmemd_util/README. diff --git a/src/test/testconfig.ps1.example b/src/test/testconfig.ps1.example index d9d04df7e12..9938bf56cfa 100644 --- a/src/test/testconfig.ps1.example +++ b/src/test/testconfig.ps1.example @@ -10,7 +10,7 @@ # # -# Appended to PMEM_FS_DIR and NON_PMEM_FS_DIR to test NVML with file path longer +# Appended to PMEM_FS_DIR and NON_PMEM_FS_DIR to test PMDK with file path longer # than 255 characters. Due to limitation of powershell you have to use # UNC prefix (i.e. \\?\c:\tmp) in PMEM_FS_DIR and NON_PMEM_FS_DIR variables. # diff --git a/src/test/testconfig.sh.example b/src/test/testconfig.sh.example index b8e4863d8fb..8180f80d7ed 100644 --- a/src/test/testconfig.sh.example +++ b/src/test/testconfig.sh.example @@ -10,7 +10,7 @@ # # -# Appended to PMEM_FS_DIR and NON_PMEM_FS_DIR to test NVML with +# Appended to PMEM_FS_DIR and NON_PMEM_FS_DIR to test PMDK with # file path longer than 255 characters. # # LONGDIR="LoremipsumdolorsitametconsecteturadipiscingelitVivamuslacinianibhattortordictumsollicitudinNullamvariusvestibulumligulaetegestaselitsemperidMaurisultriciesligulaeuipsumtinciduntluctusMorbimaximusvariusdolorid" @@ -22,7 +22,7 @@ # Note that PMEM_FS_DIR is intended mostly to test codepaths where # pmem_persist() is used for flushing data to persistence. For now, there is # no file system on Linux that fully supports pmem_persist(), so even in case -# of DAX-enabled file systems (like ext4), NVML would behave as for non-PMEM +# of DAX-enabled file systems (like ext4), PMDK would behave as for non-PMEM # file system and would still use pmem_msync(). # You may change this behavior by setting PMEM_FS_DIR_FORCE_PMEM (see below). # To fully test the PMEM codepaths it is strongly recommended to configure diff --git a/src/test/tools/bttcreate/README b/src/test/tools/bttcreate/README index 9a8e18fd817..45f8718b1e5 100644 --- a/src/test/tools/bttcreate/README +++ b/src/test/tools/bttcreate/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/bttcreate/README. diff --git a/src/test/tools/cmpmap/README b/src/test/tools/cmpmap/README index f8d393427cc..4100d0b6f5e 100644 --- a/src/test/tools/cmpmap/README +++ b/src/test/tools/cmpmap/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/cmpmap/README. diff --git a/src/test/tools/ctrld/README b/src/test/tools/ctrld/README index 07b2fb78bbf..741d5f2500d 100644 --- a/src/test/tools/ctrld/README +++ b/src/test/tools/ctrld/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/ctrld/README. diff --git a/src/test/tools/ddmap/README b/src/test/tools/ddmap/README index 1c6517ff26d..0d13fb7c6ba 100644 --- a/src/test/tools/ddmap/README +++ b/src/test/tools/ddmap/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/ddmap/README. diff --git a/src/test/tools/dllview/README b/src/test/tools/dllview/README index 7bffc93b459..802827d2b98 100644 --- a/src/test/tools/dllview/README +++ b/src/test/tools/dllview/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/dllview/README. diff --git a/src/test/tools/pmemalloc/README b/src/test/tools/pmemalloc/README index 8fd1ab507b8..abc1e20f7ff 100644 --- a/src/test/tools/pmemalloc/README +++ b/src/test/tools/pmemalloc/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/pmemalloc/README. diff --git a/src/test/tools/pmemdetect/README b/src/test/tools/pmemdetect/README index 4badf889d20..2e3b88cc82f 100644 --- a/src/test/tools/pmemdetect/README +++ b/src/test/tools/pmemdetect/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/pmemdetect/README. diff --git a/src/test/tools/pmemspoil/README b/src/test/tools/pmemspoil/README index c1e145b53ee..1f8a75a8859 100644 --- a/src/test/tools/pmemspoil/README +++ b/src/test/tools/pmemspoil/README @@ -1,11 +1,11 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/pmemspoil/README. This directory contains a simple application for corrupting pool files. This application may be used for testing purposes. One allows to modify every -single field in all structures used by NVM Library. +single field in all structures used by Persistent Memory Development Kit. Usage: $ pmemspoil =... diff --git a/src/test/tools/pmemwrite/README b/src/test/tools/pmemwrite/README index 6409e063991..9260c126a67 100644 --- a/src/test/tools/pmemwrite/README +++ b/src/test/tools/pmemwrite/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/pmemwrite/README. diff --git a/src/test/tools/sparsefile/README b/src/test/tools/sparsefile/README index 1be63171b3b..c6149f17c76 100644 --- a/src/test/tools/sparsefile/README +++ b/src/test/tools/sparsefile/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/tools/sparsefile/README. diff --git a/src/test/unicode_api/README b/src/test/unicode_api/README index db2cd8f7ae9..8a9d4bc6d67 100644 --- a/src/test/unicode_api/README +++ b/src/test/unicode_api/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/unicode_api/README. diff --git a/src/test/unicode_match_script/README b/src/test/unicode_match_script/README index c624bcd0948..84b84fc1d5b 100644 --- a/src/test/unicode_match_script/README +++ b/src/test/unicode_match_script/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/unicode_match_script/README. diff --git a/src/test/unittest/README b/src/test/unittest/README index 6a4f76643c6..c5c8fb9c6c6 100644 --- a/src/test/unittest/README +++ b/src/test/unittest/README @@ -1,9 +1,9 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/unittest/README. This directory contains the unit test framework used by -the NVM Library unit tests. +the Persistent Memory Development Kit unit tests. This framework provides a support for mock objects. To mock an interface use FUNC_MOCK_RET_ALWAYS or FUNC_MOCK macros in the test code. diff --git a/src/test/unittest/unittest.h b/src/test/unittest/unittest.h index e2ea1762936..6acc627c523 100644 --- a/src/test/unittest/unittest.h +++ b/src/test/unittest/unittest.h @@ -555,7 +555,7 @@ intptr_t ut_spawnv(int argc, const char **argv, ...); * Such solution seems to be sufficient for the purpose of our tests, even * though it has some limitations. I.e. it does no work well with malloc/free, * so to wrap the system memory allocator functions, we use the built-in - * feature of all the NVML libraries, allowing to override default memory + * feature of all the PMDK libraries, allowing to override default memory * allocator with the custom one. */ #ifndef _WIN32 diff --git a/src/test/unittest/unittest.ps1 b/src/test/unittest/unittest.ps1 index 5a8f6a3a9ef..5c39ccf5ace 100644 --- a/src/test/unittest/unittest.ps1 +++ b/src/test/unittest/unittest.ps1 @@ -1106,7 +1106,7 @@ if (-Not $Env:FS) { $Env:FS = 'any'} if (-Not $Env:BUILD) { $Env:BUILD = 'debug'} if (-Not $Env:CHECK_POOL) { $Env:CHECK_POOL = '0'} if (-Not $Env:EXESUFFIX) { $Env:EXESUFFIX = ".exe"} -if (-Not $Env:SUFFIX) { $Env:SUFFIX = "😘⠝⠧⠍⠇ɗNVMLӜ⥺🙋"} +if (-Not $Env:SUFFIX) { $Env:SUFFIX = "😘⠝⠧⠍⠇ɗPMDKӜ⥺🙋"} if (-Not $Env:DIRSUFFIX) { $Env:DIRSUFFIX = ""} if ($Env:EXE_DIR -eq $null) { diff --git a/src/test/util_file_create/README b/src/test/util_file_create/README index ebab18cb787..57d4f4dd673 100644 --- a/src/test/util_file_create/README +++ b/src/test/util_file_create/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_file_create/README. diff --git a/src/test/util_file_open/README b/src/test/util_file_open/README index 5eadcb7fa97..17fbe1fe4fb 100644 --- a/src/test/util_file_open/README +++ b/src/test/util_file_open/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_file_open/README. diff --git a/src/test/util_is_poolset/README b/src/test/util_is_poolset/README index 74c6f4c9d9b..c60a468d02a 100644 --- a/src/test/util_is_poolset/README +++ b/src/test/util_is_poolset/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_is_poolset/README. diff --git a/src/test/util_map_proc/README b/src/test/util_map_proc/README index ead11432bb7..439ab5afa91 100644 --- a/src/test/util_map_proc/README +++ b/src/test/util_map_proc/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_map_proc/README. diff --git a/src/test/util_poolset/README b/src/test/util_poolset/README index c543fb09db3..b815717cfc3 100644 --- a/src/test/util_poolset/README +++ b/src/test/util_poolset/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_poolset/README. diff --git a/src/test/util_poolset_foreach/README b/src/test/util_poolset_foreach/README index 4da64c54671..2771e302355 100644 --- a/src/test/util_poolset_foreach/README +++ b/src/test/util_poolset_foreach/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_poolset_foreach/README. diff --git a/src/test/util_poolset_parse/README b/src/test/util_poolset_parse/README index 18e7786ad81..af0f9c9a10f 100644 --- a/src/test/util_poolset_parse/README +++ b/src/test/util_poolset_parse/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_poolset_parse/README. diff --git a/src/test/util_poolset_size/README b/src/test/util_poolset_size/README index dffc33f37e4..da1b116994e 100644 --- a/src/test/util_poolset_size/README +++ b/src/test/util_poolset_size/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/util_poolset_size/README. diff --git a/src/test/vmem_delete/README b/src/test/vmem_delete/README index f42046ce8fc..e63045e9afd 100644 --- a/src/test/vmem_delete/README +++ b/src/test/vmem_delete/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/vmem_delete/README. diff --git a/src/test/vmmalloc_fork/README b/src/test/vmmalloc_fork/README index 64803579788..579165853ac 100644 --- a/src/test/vmmalloc_fork/README +++ b/src/test/vmmalloc_fork/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/vmmalloc_fork/README. diff --git a/src/test/vmmalloc_init/README b/src/test/vmmalloc_init/README index 39472f0a0e1..a7b9a855b6a 100644 --- a/src/test/vmmalloc_init/README +++ b/src/test/vmmalloc_init/README @@ -1,4 +1,4 @@ -NVM Library +Persistent Memory Development Kit This is src/test/vmmalloc_init/README. diff --git a/src/test/vmmalloc_malloc_hooks/README b/src/test/vmmalloc_malloc_hooks/README index ab214ff1535..61a67f0f992 100644 --- a/src/test/vmmalloc_malloc_hooks/README +++ b/src/test/vmmalloc_malloc_hooks/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/test/vmmalloc_malloc_hooks/README. diff --git a/src/test/win_common/README b/src/test/win_common/README index edd9ec54c9f..52ec9fbba18 100644 --- a/src/test/win_common/README +++ b/src/test/win_common/README @@ -1,4 +1,4 @@ -NVM Library +Persistent Memory Development Kit This is src/test/win_common/README. diff --git a/src/test/win_lists/README b/src/test/win_lists/README index 83b486d4211..6ddc5ab2820 100644 --- a/src/test/win_lists/README +++ b/src/test/win_lists/README @@ -1,4 +1,4 @@ -NVM Library +Persistent Memory Development Kit This is src/test/win_lists/README. @@ -7,5 +7,5 @@ This test is Windows specific. This directory contains a unit test for src\windows\include\sys\queue.h The file sys\queue.h has the Windows implementation of sys\queue.h and -little more based on what's required by NVML. +little more based on what's required by PMDK. diff --git a/src/test/win_mmap/win_mmap.c b/src/test/win_mmap/win_mmap.c index 983dba1a5f2..62dbbef8c7b 100644 --- a/src/test/win_mmap/win_mmap.c +++ b/src/test/win_mmap/win_mmap.c @@ -38,7 +38,7 @@ * of memory mapping routines - mmap(), munmap(), msync() and mprotect(). * Those functions should provide the same functionality as their Linux * counterparts, at least with respect to the features that are used - * in NVM libraries. + * in PMDK libraries. * * Known issues and differences between Linux and Windows implementation * are described in src/common/mmap_windows.c. diff --git a/src/test/win_mmap_fixed/win_mmap_fixed.c b/src/test/win_mmap_fixed/win_mmap_fixed.c index bc05f69b86b..c54c3205ee0 100644 --- a/src/test/win_mmap_fixed/win_mmap_fixed.c +++ b/src/test/win_mmap_fixed/win_mmap_fixed.c @@ -37,7 +37,7 @@ * of memory mapping routines - mmap(), munmap(), msync() and mprotect(). * Those functions should provide the same functionality as their Linux * counterparts, at least with respect to the features that are used - * in NVM libraries. + * in PMDK libraries. * * Known issues and differences between Linux and Windows implementation * are described in src/common/mmap_windows.c. diff --git a/src/tools/pmempool/README b/src/tools/pmempool/README index 0d153eeb4b6..6799c000880 100644 --- a/src/tools/pmempool/README +++ b/src/tools/pmempool/README @@ -1,4 +1,4 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is src/tools/pmempool/README. @@ -29,7 +29,7 @@ pool, but some of them may create new or modify existing one. The pmempool may be useful for troubleshooting and may be used by system administrators and by software developers work on applications based on -NVM Library. The latter may find these tools useful for testing and debugging +Persistent Memory Development Kit. The latter may find these tools useful for testing and debugging purposes also. Currently there is a following set of commands available: @@ -84,7 +84,7 @@ existing commands. --------- The pmempool invoked with *info* command analyzes the existing pool created -by NVML libraries. The main task of this command is to print all usable +by PMDK libraries. The main task of this command is to print all usable information from pool headers and user data in human readable format. It automatically recognizes pool type by parsing and analyzing pool header. The recognition is done by checking the signature in pool header. The main @@ -239,7 +239,7 @@ Below is the description of available features: ------- The pmempool *rm* command is a simple helper utility which removes pool files -created using either NVML libraries or pmempool *create* command. +created using either PMDK libraries or pmempool *create* command. * The main feature is to parse the poolset configuration file and remove all listed pool files. @@ -304,4 +304,4 @@ See the top-level README file for detailed information about building packages. 5. Versioning ------------- -The versioning of pmempool application is the same as all NVML libraries. +The versioning of pmempool application is the same as all PMDK libraries. diff --git a/src/tools/pmempool/output.c b/src/tools/pmempool/output.c index 57a1a91dd2b..7cc109fa0f0 100644 --- a/src/tools/pmempool/output.c +++ b/src/tools/pmempool/output.c @@ -770,7 +770,7 @@ out_get_arch_machine_class_str(uint8_t machine_class) { switch (machine_class) { - case NVML_MACHINE_CLASS_64: + case PMDK_MACHINE_CLASS_64: return "64"; default: return "unknown"; @@ -784,9 +784,9 @@ const char * out_get_arch_data_str(uint8_t data) { switch (data) { - case NVML_DATA_LE: + case PMDK_DATA_LE: return "2's complement, little endian"; - case NVML_DATA_BE: + case PMDK_DATA_BE: return "2's complement, big endian"; default: return "unknown"; @@ -801,9 +801,9 @@ out_get_arch_machine_str(uint16_t machine) { static char str_buff[STR_MAX] = {0, }; switch (machine) { - case NVML_MACHINE_X86_64: + case PMDK_MACHINE_X86_64: return "AMD X86-64"; - case NVML_MACHINE_AARCH64: + case PMDK_MACHINE_AARCH64: return "Aarch64"; } diff --git a/src/tools/pmempool/pmempool.rc b/src/tools/pmempool/pmempool.rc index adf6f77dc5bd3d330a410471a07f66493e6aee6e..19b8de30a4e6cba7e0c8e2107c6ac9b97139f386 100644 GIT binary patch delta 33 ocmeB@?ULQ#!zUQP;LG5`;LV`NkjaqDkk6nr`5}+w debian/librpmem-dev.install -$LIB_DIR/nvml_debug/librpmem.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/librpmem.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/librpmem.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/librpmem.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/librpmem.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/librpmem.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/librpmem.so $LIB_DIR/pkgconfig/librpmem.pc $INC_DIR/librpmem.h @@ -125,7 +125,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/rpmemd.install @@ -149,8 +149,8 @@ cat << EOF >> $CONTROL_FILE Package: librpmem Architecture: any Depends: libfabric (>= $LIBFABRIC_MIN_VERSION), \${shlibs:Depends}, \${misc:Depends} -Description: NVML librpmem library - NVM Library for Remote Persistent Memory support +Description: PMDK librpmem library + PMDK Library for Remote Persistent Memory support Package: librpmem-dev Section: libdevel @@ -237,8 +237,8 @@ Build-Depends: debhelper (>= 9), doxygen Package: libpmem Architecture: any Depends: \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmem library - NVM Library for Persistent Memory support +Description: PMDK libpmem library + PMDK Library for Persistent Memory support Package: libpmem-dev Section: libdevel @@ -250,8 +250,8 @@ Description: Development files for libpmem Package: libpmemblk Architecture: any Depends: libpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmemblk library - NVM Library for Persistent Memory support - block memory pool. +Description: PMDK libpmemblk library + PMDK Library for Persistent Memory support - block memory pool. Package: libpmemblk-dev Section: libdevel @@ -263,8 +263,8 @@ Description: Development files for libpmemblk Package: libpmemlog Architecture: any Depends: libpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmemlog library - NVM Library for Persistent Memory support - log memory pool. +Description: PMDK libpmemlog library + PMDK Library for Persistent Memory support - log memory pool. Package: libpmemlog-dev Section: libdevel @@ -276,8 +276,8 @@ Description: Development files for libpmemlog Package: libpmemcto Architecture: any Depends: libpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmemcto library - NVM Library for Persistent Memory support - close-to-open pesistence. +Description: PMDK libpmemcto library + PMDK Library for Persistent Memory support - close-to-open pesistence. Package: libpmemcto-dev Section: libdevel @@ -289,8 +289,8 @@ Description: Development files for libpmemcto Package: libpmemobj Architecture: any Depends: libpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmemobj library - NVM Library for Persistent Memory support - transactional object store. +Description: PMDK libpmemobj library + PMDK Library for Persistent Memory support - transactional object store. Package: libpmemobj-dev Section: libdevel @@ -302,8 +302,8 @@ Description: Development files for libpmemobj Package: libpmempool Architecture: any Depends: libpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} -Description: NVML libpmempool library - NVM Library for Persistent Memory support - pool management library. +Description: PMDK libpmempool library + PMDK Library for Persistent Memory support - pool management library. Package: libpmempool-dev Section: libdevel @@ -315,8 +315,8 @@ Description: Development files for libpmempool Package: libvmem Architecture: any Depends: \${shlibs:Depends}, \${misc:Depends} -Description: NVML libvmem library - NVM Library for volatile-memory support on top of Persistent Memory. +Description: PMDK libvmem library + PMDK Library for volatile-memory support on top of Persistent Memory. Package: libvmem-dev Section: libdevel @@ -328,8 +328,8 @@ Description: Development files for libvmem Package: libvmmalloc Architecture: any Depends: \${shlibs:Depends}, \${misc:Depends} -Description: NVML libvmmalloc library - NVML general purpose volatile-memory allocation library on top of Persistent Memory. +Description: PMDK libvmmalloc library + PMDK general purpose volatile-memory allocation library on top of Persistent Memory. Package: libvmmalloc-dev Section: libdevel @@ -343,8 +343,8 @@ Section: debug Priority: extra Architecture: any Depends: libvmem (=\${binary:Version}), libvmmalloc (=\${binary:Version}), libpmem (=\${binary:Version}), libpmemblk (=\${binary:Version}), libpmemlog (=\${binary:Version}), libpmemobj (=\${binary:Version}), libpmemcto (=\${binary:Version}), libpmempool (=\${binary:Version}), \${misc:Depends} -Description: Debug symbols for NVML libraries - Debug symbols for all NVML libraries. +Description: Debug symbols for PMDK libraries + Debug symbols for all PMDK libraries. Package: $PACKAGE_NAME-tools Section: misc @@ -377,8 +377,8 @@ override_dh_auto_install: dh_auto_install -- EXPERIMENTAL=${EXPERIMENTAL} CPP_DOC_DIR="${OBJ_CPP_DOC_DIR}" prefix=/$PREFIX libdir=/$LIB_DIR includedir=/$INC_DIR docdir=/$DOC_DIR man1dir=/$MAN1_DIR man3dir=/$MAN3_DIR man5dir=/$MAN5_DIR man7dir=/$MAN7_DIR sysconfdir=/etc NORPATH=1 override_dh_install: - mkdir -p debian/tmp/usr/share/nvml/ - cp utils/nvml.magic debian/tmp/usr/share/nvml/ + mkdir -p debian/tmp/usr/share/pmdk/ + cp utils/pmdk.magic debian/tmp/usr/share/pmdk/ dh_install ${CHECK_CMD} @@ -398,7 +398,7 @@ EOF cat << EOF > debian/libpmem.install $LIB_DIR/libpmem.so.* -usr/share/nvml/nvml.magic +usr/share/pmdk/pmdk.magic EOF cat $MAGIC_INSTALL > debian/libpmem.postinst @@ -411,9 +411,9 @@ libpmem: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmem-dev.install -$LIB_DIR/nvml_debug/libpmem.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmem.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmem.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmem.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmem.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmem.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmem.so $LIB_DIR/pkgconfig/libpmem.pc $INC_DIR/libpmem.h @@ -433,7 +433,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libpmemblk.install @@ -447,9 +447,9 @@ libpmemblk: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmemblk-dev.install -$LIB_DIR/nvml_debug/libpmemblk.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemblk.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemblk.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmemblk.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemblk.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemblk.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmemblk.so $LIB_DIR/pkgconfig/libpmemblk.pc $INC_DIR/libpmemblk.h @@ -470,7 +470,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libpmemlog.install @@ -484,9 +484,9 @@ libpmemlog: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmemlog-dev.install -$LIB_DIR/nvml_debug/libpmemlog.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemlog.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemlog.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmemlog.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemlog.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemlog.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmemlog.so $LIB_DIR/pkgconfig/libpmemlog.pc $INC_DIR/libpmemlog.h @@ -507,7 +507,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libpmemcto.install @@ -521,9 +521,9 @@ libpmemcto: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmemcto-dev.install -$LIB_DIR/nvml_debug/libpmemcto.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemcto.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemcto.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmemcto.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemcto.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemcto.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmemcto.so $LIB_DIR/pkgconfig/libpmemcto.pc $INC_DIR/libpmemcto.h @@ -544,7 +544,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libpmemobj.install @@ -558,9 +558,9 @@ libpmemobj: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmemobj-dev.install -$LIB_DIR/nvml_debug/libpmemobj.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemobj.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmemobj.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmemobj.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemobj.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmemobj.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmemobj.so $LIB_DIR/pkgconfig/libpmemobj.pc $INC_DIR/libpmemobj.h @@ -588,7 +588,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libpmempool.install @@ -602,9 +602,9 @@ libpmempool: package-name-doesnt-match-sonames EOF cat << EOF > debian/libpmempool-dev.install -$LIB_DIR/nvml_debug/libpmempool.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmempool.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libpmempool.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libpmempool.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmempool.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libpmempool.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libpmempool.so $LIB_DIR/pkgconfig/libpmempool.pc $INC_DIR/libpmempool.h @@ -625,7 +625,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libvmem.install @@ -639,9 +639,9 @@ libvmem: package-name-doesnt-match-sonames EOF cat << EOF > debian/libvmem-dev.install -$LIB_DIR/nvml_debug/libvmem.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libvmem.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libvmem.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libvmem.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libvmem.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libvmem.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libvmem.so $LIB_DIR/pkgconfig/libvmem.pc $INC_DIR/libvmem.h @@ -657,7 +657,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libvmem-dev.triggers @@ -675,9 +675,9 @@ libvmmalloc: package-name-doesnt-match-sonames EOF cat << EOF > debian/libvmmalloc-dev.install -$LIB_DIR/nvml_debug/libvmmalloc.a $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libvmmalloc.so $LIB_DIR/nvml_dbg/ -$LIB_DIR/nvml_debug/libvmmalloc.so.* $LIB_DIR/nvml_dbg/ +$LIB_DIR/pmdk_debug/libvmmalloc.a $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libvmmalloc.so $LIB_DIR/pmdk_dbg/ +$LIB_DIR/pmdk_debug/libvmmalloc.so.* $LIB_DIR/pmdk_dbg/ $LIB_DIR/libvmmalloc.so $LIB_DIR/pkgconfig/libvmmalloc.pc $INC_DIR/libvmmalloc.h @@ -692,7 +692,7 @@ new-package-should-close-itp-bug postinst-has-useless-call-to-ldconfig postrm-has-useless-call-to-ldconfig # We do not want to compile with -O2 for debug version -hardening-no-fortify-functions $LIB_DIR/nvml_dbg/* +hardening-no-fortify-functions $LIB_DIR/pmdk_dbg/* EOF cat << EOF > debian/libvmmalloc-dev.triggers @@ -742,9 +742,9 @@ EOF cat << EOF > debian/${OBJ_CPP_NAME}.doc-base Document: ${OBJ_CPP_NAME} -Title: NVML libpmemobj C++ bindings Manual -Author: NVML Developers -Abstract: This is the HTML docs for the C++ bindings for NVML's libpmemobj. +Title: PMDK libpmemobj C++ bindings Manual +Author: PMDK Developers +Abstract: This is the HTML docs for the C++ bindings for PMDK's libpmemobj. Section: Programming Format: HTML diff --git a/utils/check-commit.sh b/utils/check-commit.sh index adb5048fe62..0524dfb392e 100755 --- a/utils/check-commit.sh +++ b/utils/check-commit.sh @@ -33,15 +33,15 @@ # # Used to check whether all the commit messages in a pull request -# follow the GIT/NVML guidelines. +# follow the GIT/PMDK guidelines. # # usage: ./check-commit.sh # -if [[ $TRAVIS_REPO_SLUG != "pmem/nvml" \ +if [[ $TRAVIS_REPO_SLUG != "pmem/pmdk" \ || $TRAVIS_EVENT_TYPE != "pull_request" ]]; then - echo "SKIP: $0 can only be executed for pull requests to pmem/nvml" + echo "SKIP: $0 can only be executed for pull requests to pmem/pmdk" exit 0 fi diff --git a/utils/check-doc.sh b/utils/check-doc.sh index 7dca2c37624..fe637748315 100755 --- a/utils/check-doc.sh +++ b/utils/check-doc.sh @@ -46,10 +46,10 @@ if [[ -z "$TRAVIS" ]]; then exit 1 fi -if [[ $TRAVIS_REPO_SLUG != "pmem/nvml" \ +if [[ $TRAVIS_REPO_SLUG != "pmem/pmdk" \ || $TRAVIS_EVENT_TYPE != "pull_request" ]]; then - echo "SKIP: $0 can only be executed for pull requests to pmem/nvml" + echo "SKIP: $0 can only be executed for pull requests to pmem/pmdk" exit 0 fi diff --git a/utils/docker/README b/utils/docker/README index 702fe6c2cc0..88e4966d3c4 100644 --- a/utils/docker/README +++ b/utils/docker/README @@ -1,16 +1,16 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is utils/docker/README. Scripts in this directory let Travis CI run a Docker container with ubuntu- -or fedora-based environment and build NVML project inside it. +or fedora-based environment and build PMDK project inside it. -'build-local.sh' can be used to build NVML locally. +'build-local.sh' can be used to build PMDK locally. -'build-travis.sh' is used for building NVML on Travis. +'build-travis.sh' is used for building PMDK on Travis. NOTE: -(for those, who have Travis builds enabled for their fork of the NVML project) +(for those, who have Travis builds enabled for their fork of the PMDK project) If you commit changes to any Dockerfile or shell script in the 'images' subdirectory and then do git-rebase before pushing your commits to the repository, make sure that you do not squash the commit which is the head in diff --git a/utils/docker/build-local.sh b/utils/docker/build-local.sh index 8f548ff8576..b3c58db999b 100755 --- a/utils/docker/build-local.sh +++ b/utils/docker/build-local.sh @@ -32,14 +32,14 @@ # # build-local.sh - runs a Docker container from a Docker image with environment -# prepared for building NVML project and starts building NVML +# prepared for building PMDK project and starts building PMDK # -# this script is for building NVML locally (not on Travis) +# this script is for building PMDK locally (not on Travis) # # Notes: # - run this script from its location or set the variable 'HOST_WORKDIR' to -# where the root of the NVML project is on the host machine, -# - set variables 'OS' and 'OS_VER' properly to a system you want to build NVML +# where the root of the PMDK project is on the host machine, +# - set variables 'OS' and 'OS_VER' properly to a system you want to build PMDK # on (for proper values take a look on the list of Dockerfiles at the # utils/docker/images directory), eg. OS=ubuntu, OS_VER=16.04. # - set 'KEEP_TEST_CONFIG' variable to 1 if you do not want the tests to be @@ -58,8 +58,8 @@ export REMOTE_TESTS=${REMOTE_TESTS:-1} export MAKE_PKG=${MAKE_PKG:-0} export EXTRA_CFLAGS=${EXTRA_CFLAGS:--DUSE_VALGRIND} export EXTRA_CXXFLAGS=${EXTRA_CXXFLAGS:-} -export NVML_CC=${NVML_CC:-gcc} -export NVML_CXX=${NVML_CXX:-g++} +export PMDK_CC=${PMDK_CC:-gcc} +export PMDK_CXX=${PMDK_CXX:-g++} export USE_LLVM_LIBCPP=${USE_LLVM_LIBCPP:-} export LIBCPP_LIBDIR=${LIBCPP_LIBDIR:-} export LIBCPP_INCDIR=${LIBCPP_INCDIR:-} @@ -91,22 +91,22 @@ fi if [ -n "$DNS_SERVER" ]; then DNS_SETTING=" --dns=$DNS_SERVER "; fi -WORKDIR=/nvml +WORKDIR=/pmdk SCRIPTSDIR=$WORKDIR/utils/docker echo Building ${OS}-${OS_VER} # Run a container with # - environment variables set (--env) -# - host directory containing nvml source mounted (-v) +# - host directory containing PMDK source mounted (-v) # - working directory set (-w) docker run --privileged=true --name=$containerName -ti \ $RM_SETTING \ $DNS_SETTING \ --env http_proxy=$http_proxy \ --env https_proxy=$https_proxy \ - --env CC=$NVML_CC \ - --env CXX=$NVML_CXX \ + --env CC=$PMDK_CC \ + --env CXX=$PMDK_CXX \ --env EXTRA_CFLAGS=$EXTRA_CFLAGS \ --env EXTRA_CXXFLAGS=$EXTRA_CXXFLAGS \ --env USE_LLVM_LIBCPP=$USE_LLVM_LIBCPP \ diff --git a/utils/docker/build-travis.sh b/utils/docker/build-travis.sh index f37fd82574a..981e569643c 100755 --- a/utils/docker/build-travis.sh +++ b/utils/docker/build-travis.sh @@ -32,9 +32,9 @@ # # build-travis.sh - runs a Docker container from a Docker image with environment -# prepared for building NVML project and starts building NVML +# prepared for building PMDK project and starts building PMDK # -# this script is for building NVML on Travis only +# this script is for building PMDK on Travis only # set -e @@ -61,7 +61,7 @@ fi if [[ -z "$HOST_WORKDIR" ]]; then echo "ERROR: The variable HOST_WORKDIR has to contain a path to " \ - "the root of the nvml project on the host machine" + "the root of the PMDK project on the host machine" exit 1 fi @@ -83,20 +83,20 @@ fi if [ -n "$DNS_SERVER" ]; then DNS_SETTING=" --dns=$DNS_SERVER "; fi -WORKDIR=/nvml +WORKDIR=/pmdk SCRIPTSDIR=$WORKDIR/utils/docker # Run a container with # - environment variables set (--env) -# - host directory containing nvml source mounted (-v) +# - host directory containing PMDK source mounted (-v) # - working directory set (-w) docker run --rm --privileged=true --name=$containerName -ti \ $DNS_SETTING \ $ci_env \ --env http_proxy=$http_proxy \ --env https_proxy=$https_proxy \ - --env CC=$NVML_CC \ - --env CXX=$NVML_CXX \ + --env CC=$PMDK_CC \ + --env CXX=$PMDK_CXX \ --env EXTRA_CFLAGS=$EXTRA_CFLAGS \ --env EXTRA_CXXFLAGS=$EXTRA_CXXFLAGS \ --env USE_LLVM_LIBCPP=$USE_LLVM_LIBCPP \ diff --git a/utils/docker/configure-tests.sh b/utils/docker/configure-tests.sh index 45b1af6efb0..dcc4b877f8c 100755 --- a/utils/docker/configure-tests.sh +++ b/utils/docker/configure-tests.sh @@ -32,7 +32,7 @@ # # configure-tests.sh - is called inside a Docker container; configures tests -# and ssh server for use during build of NVML project. +# and ssh server for use during build of PMDK project. # set -e diff --git a/utils/docker/images/Dockerfile.fedora-25 b/utils/docker/images/Dockerfile.fedora-25 index d19cb3f02b9..ccc047c50b3 100644 --- a/utils/docker/images/Dockerfile.fedora-25 +++ b/utils/docker/images/Dockerfile.fedora-25 @@ -31,7 +31,7 @@ # # Dockerfile - a 'recipe' for Docker to build an image of fedora-based -# environment for building the NVML project. +# environment for building the PMDK project. # # Pull base image diff --git a/utils/docker/images/Dockerfile.ubuntu-16.04 b/utils/docker/images/Dockerfile.ubuntu-16.04 index 02cf6b3b380..4ae68708dfc 100644 --- a/utils/docker/images/Dockerfile.ubuntu-16.04 +++ b/utils/docker/images/Dockerfile.ubuntu-16.04 @@ -31,7 +31,7 @@ # # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based -# environment for building the NVML project. +# environment for building the PMDK project. # # Pull base image diff --git a/utils/docker/images/README b/utils/docker/images/README index 5b967474bc8..0b8c551e441 100644 --- a/utils/docker/images/README +++ b/utils/docker/images/README @@ -1,6 +1,6 @@ -Non-Volatile Memory Library +Persistent Memory Development Kit This is utils/docker/images/README. Scripts in this directory let you prepare Docker images for building -NVML project under specified OS (ubuntu, fedora). +PMDK project under specified OS (ubuntu, fedora). diff --git a/utils/docker/images/build-image.sh b/utils/docker/images/build-image.sh index 99bd59ae713..c6867a43945 100755 --- a/utils/docker/images/build-image.sh +++ b/utils/docker/images/build-image.sh @@ -32,7 +32,7 @@ # # build-image.sh - prepares a Docker image with -based -# environment for building NVML project, according +# environment for building PMDK project, according # to the Dockerfile. file located # in the same directory. # diff --git a/utils/docker/prepare-for-build.sh b/utils/docker/prepare-for-build.sh index d9d00fbb0ba..a02133e8e20 100755 --- a/utils/docker/prepare-for-build.sh +++ b/utils/docker/prepare-for-build.sh @@ -33,7 +33,7 @@ # # prepare-for-build.sh - is called inside a Docker container; prepares # the environment inside a Docker container for -# running build of NVML project. +# running build of PMDK project. # set -e diff --git a/utils/docker/pull-or-rebuild-image.sh b/utils/docker/pull-or-rebuild-image.sh index da0664e6ca1..e232e0937a0 100755 --- a/utils/docker/pull-or-rebuild-image.sh +++ b/utils/docker/pull-or-rebuild-image.sh @@ -64,13 +64,13 @@ fi if [[ -z "$HOST_WORKDIR" ]]; then echo "ERROR: The variable HOST_WORKDIR has to contain a path to " \ - "the root of the nvml project on the host machine" + "the root of the PMDK project on the host machine" exit 1 fi # TRAVIS_COMMIT_RANGE is usually invalid for force pushes - ignore such values # when used with non-upstream repository -if [ -n "$TRAVIS_COMMIT_RANGE" -a $TRAVIS_REPO_SLUG != "pmem/nvml" ]; then +if [ -n "$TRAVIS_COMMIT_RANGE" -a $TRAVIS_REPO_SLUG != "pmem/pmdk" ]; then if ! git rev-list $TRAVIS_COMMIT_RANGE; then TRAVIS_COMMIT_RANGE= fi @@ -108,11 +108,11 @@ for file in $files; do popd # Check if the image has to be pushed to Docker Hub - # (i.e. the build is triggered by commits to the pmem/nvml + # (i.e. the build is triggered by commits to the pmem/pmdk # repository's master branch, and the Travis build is not # of the "pull_request" type). In that case, create the empty # file. - if [[ $TRAVIS_REPO_SLUG == "pmem/nvml" \ + if [[ $TRAVIS_REPO_SLUG == "pmem/pmdk" \ && $TRAVIS_BRANCH == "master" \ && $TRAVIS_EVENT_TYPE != "pull_request" ]] then diff --git a/utils/docker/run-build-package.sh b/utils/docker/run-build-package.sh index 170796011ee..347ae27b211 100755 --- a/utils/docker/run-build-package.sh +++ b/utils/docker/run-build-package.sh @@ -32,7 +32,7 @@ # # run-build-package.sh - is called inside a Docker container; prepares -# the environment and starts a build of NVML project. +# the environment and starts a build of PMDK project. # set -e diff --git a/utils/docker/run-build.sh b/utils/docker/run-build.sh index 2d73b6869cd..c2fa02810d0 100755 --- a/utils/docker/run-build.sh +++ b/utils/docker/run-build.sh @@ -32,7 +32,7 @@ # # run-build.sh - is called inside a Docker container; prepares the environment -# and starts a build of NVML project. +# and starts a build of PMDK project. # set -e diff --git a/utils/docker/run-coverage.sh b/utils/docker/run-coverage.sh index 4778beceab8..b317fb3ebc2 100755 --- a/utils/docker/run-coverage.sh +++ b/utils/docker/run-coverage.sh @@ -37,7 +37,7 @@ set -e -# Get and prepare NVML source +# Get and prepare PMDK source ./prepare-for-build.sh # Build librpmem even if libfabric is not compiled with ibverbs diff --git a/utils/get_aliases.sh b/utils/get_aliases.sh index bce1debca9b..abee5c404f3 100755 --- a/utils/get_aliases.sh +++ b/utils/get_aliases.sh @@ -34,7 +34,7 @@ # # get_aliases.sh -- generate map of manuals functions and libraries # -# usage: run from /nvml/doc/generated location without parameters: +# usage: run from /pmdk/doc/generated location without parameters: # ./../../utils/get_aliases.sh # # This script searches manpages from section 7 then diff --git a/utils/libpmem.pc.in b/utils/libpmem.pc.in index 3afdee7e17c..06350422dc5 100644 --- a/utils/libpmem.pc.in +++ b/utils/libpmem.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmem -Description: libpmem library from NVML project +Description: libpmem library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires: Libs: -L${libdir} -lpmem Cflags: -I${includedir} diff --git a/utils/libpmemblk.pc.in b/utils/libpmemblk.pc.in index 183771ca1ea..11f6f9be240 100644 --- a/utils/libpmemblk.pc.in +++ b/utils/libpmemblk.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmemblk -Description: libpmemblk library from NVML project +Description: libpmemblk library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: libpmem Libs: -L${libdir} -lpmemblk Cflags: -I${includedir} diff --git a/utils/libpmemcto.pc.in b/utils/libpmemcto.pc.in index 1c0e0067a6f..7f12fdc6508 100644 --- a/utils/libpmemcto.pc.in +++ b/utils/libpmemcto.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmemcto -Description: libpmemcto library from NVML project +Description: libpmemcto library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: libpmem Libs: -L${libdir} -lpmemcto Cflags: -I${includedir} diff --git a/utils/libpmemlog.pc.in b/utils/libpmemlog.pc.in index 020c69762c7..453f26f0807 100644 --- a/utils/libpmemlog.pc.in +++ b/utils/libpmemlog.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmemlog -Description: libpmemlog library from NVML project +Description: libpmemlog library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: libpmem Libs: -L${libdir} -lpmemlog Cflags: -I${includedir} diff --git a/utils/libpmemobj++.pc.in b/utils/libpmemobj++.pc.in index 37908cb12eb..85c58f35e8c 100644 --- a/utils/libpmemobj++.pc.in +++ b/utils/libpmemobj++.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmemobj++ -Description: C++ bindings for the libpmemobj library from NVML project +Description: C++ bindings for the libpmemobj library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: Libs: -L${libdir} -lpmemobj Cflags: -I${includedir} diff --git a/utils/libpmemobj.pc.in b/utils/libpmemobj.pc.in index 3cf143100ee..1da43b81a6c 100644 --- a/utils/libpmemobj.pc.in +++ b/utils/libpmemobj.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmemobj -Description: libpmemobj library from NVML project +Description: libpmemobj library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: libpmem Libs: -L${libdir} -lpmemobj Libs.private: -ldl diff --git a/utils/libpmempool.pc.in b/utils/libpmempool.pc.in index 55c99e37977..952a7146e91 100644 --- a/utils/libpmempool.pc.in +++ b/utils/libpmempool.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libpmempool -Description: libpmempool library from NVML project +Description: libpmempool library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires.private: libpmem Libs: -L${libdir} -lpmempool Libs.private: -ldl diff --git a/utils/librpmem.pc.in b/utils/librpmem.pc.in index 3384e858a57..1f1bc57e7cd 100644 --- a/utils/librpmem.pc.in +++ b/utils/librpmem.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: librpmem -Description: librpmem library from NVML project +Description: librpmem library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires: Libs: -L${libdir} -lpmem Cflags: -I${includedir} diff --git a/utils/libvmem.pc.in b/utils/libvmem.pc.in index 99a244b3953..b57b5dac3d4 100644 --- a/utils/libvmem.pc.in +++ b/utils/libvmem.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libvmem -Description: libvmem library from NVML project +Description: libvmem library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires: Libs: -L${libdir} -lvmem Cflags: -I${includedir} diff --git a/utils/libvmmalloc.pc.in b/utils/libvmmalloc.pc.in index dcca48a4c57..a17dfebb65b 100644 --- a/utils/libvmmalloc.pc.in +++ b/utils/libvmmalloc.pc.in @@ -1,9 +1,9 @@ includedir=${prefix}/include Name: libvmmalloc -Description: libvmmalloc library from NVML project +Description: libvmmalloc library from PMDK project Version: ${version} -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Requires: Libs: -L${libdir} -lvmmalloc Cflags: -I${includedir} diff --git a/utils/magic-install.sh b/utils/magic-install.sh index 48d53225e38..e3898903810 100644 --- a/utils/magic-install.sh +++ b/utils/magic-install.sh @@ -34,10 +34,10 @@ # set -e -if ! grep -q "File: nvml" /etc/magic +if ! grep -q "File: pmdk" /etc/magic then - echo "Appending NVML magic to /etc/magic" - cat /usr/share/nvml/nvml.magic >> /etc/magic + echo "Appending PMDK magic to /etc/magic" + cat /usr/share/pmdk/pmdk.magic >> /etc/magic else - echo "NVML magic already exists" + echo "PMDK magic already exists" fi diff --git a/utils/magic-uninstall.sh b/utils/magic-uninstall.sh index d7d4c0b8392..cb500b664bb 100644 --- a/utils/magic-uninstall.sh +++ b/utils/magic-uninstall.sh @@ -34,15 +34,15 @@ # set -e -HDR_LOCAL=$(grep "File: nvml" /etc/magic) -HDR_PKG=$(grep "File: nvml" /usr/share/nvml/nvml.magic) +HDR_LOCAL=$(grep "File: pmdk" /etc/magic) +HDR_PKG=$(grep "File: pmdk" /usr/share/pmdk/pmdk.magic) if [[ $HDR_LOCAL == $HDR_PKG ]] then - echo "Removing NVML magic from /etc/magic" - HDR_LINE=$(grep -n "File: nvml" /etc/magic | cut -f1 -d:) - HDR_PKG_LINE=$(grep -n "File: nvml" /usr/share/nvml/nvml.magic | cut -f1 -d:) - HDR_LINES=$(cat /usr/share/nvml/nvml.magic | wc -l) + echo "Removing PMDK magic from /etc/magic" + HDR_LINE=$(grep -n "File: pmdk" /etc/magic | cut -f1 -d:) + HDR_PKG_LINE=$(grep -n "File: pmdk" /usr/share/pmdk/pmdk.magic | cut -f1 -d:) + HDR_LINES=$(cat /usr/share/pmdk/pmdk.magic | wc -l) HDR_FIRST=$(($HDR_LINE - $HDR_PKG_LINE + 1)) HDR_LAST=$(($HDR_FIRST + $HDR_LINES)) sed -i "${HDR_FIRST},${HDR_LAST}d" /etc/magic diff --git a/utils/nvml.spec.in b/utils/nvml.spec.in index 1018ccfa092..7740a0b59ac 100644 --- a/utils/nvml.spec.in +++ b/utils/nvml.spec.in @@ -23,14 +23,14 @@ %define min_libfabric_ver __LIBFABRIC_MIN_VER__ -Name: nvml +Name: pmdk Version: __VERSION__ Release: 1%{?dist} Summary: __PACKAGE_SUMMARY__ Packager: __PACKAGE_MAINTAINER__ Group: __GROUP_SYS_LIBS__ License: __LICENSE__ -URL: http://pmem.io/nvml +URL: http://pmem.io/pmdk Source0: %{name}-%{version}.tar.gz @@ -50,9 +50,9 @@ BuildRequires: libfabric-devel >= %{min_libfabric_ver} # Debug variants of the libraries should be filtered out of the provides. -%global __provides_exclude_from ^%{_libdir}/nvml_debug/.*\\.so.*$ +%global __provides_exclude_from ^%{_libdir}/pmdk_debug/.*\\.so.*$ -# By design, NVML does not support any 32-bit architecture. +# By design, PMDK does not support any 32-bit architecture. # Due to dependency on xmmintrin.h and some inline assembly, it can be # compiled only for x86_64 at the moment. # Other 64-bit architectures could also be supported, if only there is @@ -68,8 +68,8 @@ BuildRequires: libfabric-devel >= %{min_libfabric_ver} ExclusiveArch: x86_64 %description -The NVM Library is a collection of libraries for using memory-mapped -persistence, optimized specifically for persistent memory. +The Persistent Memory Development Kit is a collection of libraries for +using memory-mapped persistence, optimized specifically for persistent memory. %package -n libpmem__PKG_NAME_SUFFIX__ @@ -82,9 +82,9 @@ to pmem is provided. %files -n libpmem__PKG_NAME_SUFFIX__ %defattr(-,root,root,-) -%dir %{_datadir}/nvml +%dir %{_datadir}/pmdk %{_libdir}/libpmem.so.* -%{_datadir}/nvml/nvml.magic +%{_datadir}/pmdk/pmdk.magic %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -127,14 +127,14 @@ to pmem is provided. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmem-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmem.so -%{_libdir}/nvml_debug/libpmem.so.* -%{_libdir}/nvml_debug/libpmem.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmem.so +%{_libdir}/pmdk_debug/libpmem.so.* +%{_libdir}/pmdk_debug/libpmem.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -196,14 +196,14 @@ failure or program interruption (no torn blocks). This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmemblk-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmemblk.so -%{_libdir}/nvml_debug/libpmemblk.so.* -%{_libdir}/nvml_debug/libpmemblk.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmemblk.so +%{_libdir}/pmdk_debug/libpmemblk.so.* +%{_libdir}/pmdk_debug/libpmemblk.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -261,14 +261,14 @@ level libraries like libpmemobj to be more generally useful. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmemlog-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmemlog.so -%{_libdir}/nvml_debug/libpmemlog.so.* -%{_libdir}/nvml_debug/libpmemlog.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmemlog.so +%{_libdir}/pmdk_debug/libpmemlog.so.* +%{_libdir}/pmdk_debug/libpmemlog.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -333,14 +333,14 @@ probably want to start with this library. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmemobj-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmemobj.so -%{_libdir}/nvml_debug/libpmemobj.so.* -%{_libdir}/nvml_debug/libpmemobj.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmemobj.so +%{_libdir}/pmdk_debug/libpmemobj.so.* +%{_libdir}/pmdk_debug/libpmemobj.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -396,14 +396,14 @@ its own malloc-style API. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libvmem-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libvmem.so -%{_libdir}/nvml_debug/libvmem.so.* -%{_libdir}/nvml_debug/libvmem.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libvmem.so +%{_libdir}/pmdk_debug/libvmem.so.* +%{_libdir}/pmdk_debug/libvmem.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -464,14 +464,14 @@ application. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libvmmalloc-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libvmmalloc.so -%{_libdir}/nvml_debug/libvmmalloc.so.* -%{_libdir}/nvml_debug/libvmmalloc.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libvmmalloc.so +%{_libdir}/pmdk_debug/libvmmalloc.so.* +%{_libdir}/pmdk_debug/libvmmalloc.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -551,14 +551,14 @@ pools created by libpmemlog, libpemblk and libpmemobj libraries. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmempool-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmempool.so -%{_libdir}/nvml_debug/libpmempool.so.* -%{_libdir}/nvml_debug/libpmempool.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmempool.so +%{_libdir}/pmdk_debug/libpmempool.so.* +%{_libdir}/pmdk_debug/libpmempool.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -617,14 +617,14 @@ to replicate peristent memory regions over RDMA protocol. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n librpmem-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/librpmem.so -%{_libdir}/nvml_debug/librpmem.so.* -%{_libdir}/nvml_debug/librpmem.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/librpmem.so +%{_libdir}/pmdk_debug/librpmem.so.* +%{_libdir}/pmdk_debug/librpmem.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -692,14 +692,14 @@ imposed by run-time flushing or transactional updates. This sub-package contains debug variant of the library, providing run-time assertions and trace points. The typical way to access the debug version is to set the environment variable LD_LIBRARY_PATH to -/usr/lib64/nvml_debug. +/usr/lib64/pmdk_debug. %files -n libpmemcto-debug %defattr(-,root,root,-) -%dir %{_libdir}/nvml_debug -%{_libdir}/nvml_debug/libpmemcto.so -%{_libdir}/nvml_debug/libpmemcto.so.* -%{_libdir}/nvml_debug/libpmemcto.a +%dir %{_libdir}/pmdk_debug +%{_libdir}/pmdk_debug/libpmemcto.so +%{_libdir}/pmdk_debug/libpmemcto.so.* +%{_libdir}/pmdk_debug/libpmemcto.a %license LICENSE %doc ChangeLog CONTRIBUTING.md README.md @@ -747,8 +747,8 @@ make install DESTDIR=%{buildroot} \ sysconfdir=%{_sysconfdir} \ docdir=%{_docdir} \ CPP_DOC_DIR=libpmemobj++-devel -mkdir -p %{buildroot}%{_datadir}/nvml -cp utils/nvml.magic %{buildroot}%{_datadir}/nvml/ +mkdir -p %{buildroot}%{_datadir}/pmdk +cp utils/pmdk.magic %{buildroot}%{_datadir}/pmdk/ __MAKE_INSTALL_FDUPES__ diff --git a/utils/pkg-config.sh b/utils/pkg-config.sh index 1c0c9470831..5cb1b679309 100644 --- a/utils/pkg-config.sh +++ b/utils/pkg-config.sh @@ -30,16 +30,16 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Name of package -PACKAGE_NAME="nvml" +PACKAGE_NAME="pmdk" # Name and email of package maintainer PACKAGE_MAINTAINER="Krzysztof Czurylo " # Brief description of the package -PACKAGE_SUMMARY="Non-Volatile Memory Library" +PACKAGE_SUMMARY="Persistent Memory Development Kit" # Full description of the package -PACKAGE_DESCRIPTION="NVM Library for Persistent Memory Programming" +PACKAGE_DESCRIPTION="The collection of libraries and utilities for Persistent Memory Programming" # Website -PACKAGE_URL="http://pmem.io/nvml" +PACKAGE_URL="http://pmem.io/pmdk" diff --git a/utils/nvml.magic b/utils/pmdk.magic similarity index 69% rename from utils/nvml.magic rename to utils/pmdk.magic index 399b6077259..a3c657fee57 100644 --- a/utils/nvml.magic +++ b/utils/pmdk.magic @@ -1,9 +1,9 @@ #------------------------------------------------------------------------------ -# $File: nvml,v 1.1 2016/09/30 22:10:00 -# nvml: file(1) magic for NVM Library pool files +# $File: pmdk,v 1.2 2017/12/11 20:00:00 +# pmdk: file(1) magic for Persistent Memory Development Kit pool files # -# The NVM Library specific format of pool files. +# The PMDK specific format of pool files. # # PMEM signature 0 string PMEM diff --git a/utils/sort_solution b/utils/sort_solution index ff6da9bdda5..a262cc5c2d2 100755 --- a/utils/sort_solution +++ b/utils/sort_solution @@ -80,7 +80,7 @@ my $arg = $ARGV[0]; if($arg ne "check" && $arg ne "sort") { help; } -my $filename = dirname(abs_path($0)).'/../src/NVML.sln'; +my $filename = dirname(abs_path($0)).'/../src/PMDK.sln'; my $tempfile = dirname(abs_path($0)).'/../src/temp.sln'; open(my $temp_fh, '>', $tempfile) @@ -145,7 +145,7 @@ if($arg eq "check") { exit; } - print "NVML solution file is not sorted, " . + print "PMDK solution file is not sorted, " . "please use sort_solution script before pushing your changes\n"; unlink $tempfile; exit 1;