Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
ignore:
- '.*test.*'
- '.*valgrind.*'
- '.*benchmarks.*'

comment:
layout: "diff"
Expand Down
45 changes: 0 additions & 45 deletions .github/actions/pmem_benchmark_run/action.yml

This file was deleted.

1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
- name: Install dependencies
run: |
sudo pip install flake8
sudo apt-get install clang-format-14

- name: Check license
id: check_license
Expand Down
112 changes: 0 additions & 112 deletions .github/workflows/pmem_benchmark.yml

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
!.github
!.gitignore
!.gitattributes
!.clang-format
!.mailmap
!.codecov.yml
!.pre-commit-config.yml
Expand Down
2 changes: 1 addition & 1 deletion CODING_STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ conventions for git commit messages:
the short summary.
- Valid area names are: **pmem**, **pmem2**, **obj**, **set**, **test**,
**doc**, **daxio**, **pmreorder**, **pool** (for *libpmempool* and *pmempool*),
**benchmark**, **examples**, **core** and **common** (for everything else).
**examples**, **core** and **common** (for everything else).
- It is acceptable for the short summary to be the only thing in the commit
message if it is a trivial change. Otherwise, the second line must be
a blank line.
Expand Down
18 changes: 3 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,9 @@ Before contributing please remember to run:
$ make cstyle
```

This will check all C/C++ files in the tree for style issues. To check C++
files you have to have clang-format version 14.0, otherwise they will be
skipped. If you want to run this target automatically at build time, you can
pass CSTYLEON=1 to make. If you want cstyle to be run, but not fail the build,
pass CSTYLEON=2 to make.
There is also a target for automatic C++ code formatting, to do this run:
```
$ make format
```

There are cases, when you might have several clang-format-X.Y binaries and either
no clang-format or it pointing to an older version. In such case run:
```
$ make CLANG_FORMAT=/path/to/clang-format cstyle|format
```
This will check all C and Python files in the tree for style issues. If you want to
run this target automatically at build time, you can pass CSTYLEON=1 to make.
If you want cstyle to be run, but not fail the build, pass CSTYLEON=2 to make.

### Bug Reports

Expand Down
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2014-2023, Intel Corporation
# Copyright 2026, Hewlett Packard Enterprise Development LP

#
# Makefile -- top-level Makefile for PMDK
Expand Down Expand Up @@ -80,10 +81,6 @@ cstyle: check-commits check-whitespace check-license
$(MAKE) -C src $@
$(MAKE) -C utils $@

format:
$(MAKE) -C src $@
@echo Done.

check-whitespace:
@echo Checking files for whitespace issues...
@utils/check_whitespace -g
Expand Down Expand Up @@ -129,5 +126,5 @@ ifeq ($(DOC),y)
endif

.PHONY: all clean clobber test check cstyle check-license install uninstall\
source rpm dpkg pkg-clean pcheck format doc\
source rpm dpkg pkg-clean pcheck doc\
$(SUBDIRS)
22 changes: 6 additions & 16 deletions src/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2014-2023, Intel Corporation
# Copyright 2026, Hewlett Packard Enterprise Development LP

#
# src/Makefile -- Makefile for PMDK
Expand All @@ -14,7 +15,7 @@ TARGETS = libpmem libpmemobj libpmempool tools libpmem2
ALL_TARGETS = $(TARGETS) common core
# all available targets
POSSIBLE_TARGETS = $(TARGETS) common core test\
examples benchmarks
examples

SCOPE_DIRS = $(TARGETS) common core

Expand All @@ -26,11 +27,6 @@ ifneq ($(BUILD_EXAMPLES),n)
RELEASE_TARGETS += examples
endif

ifneq ($(BUILD_BENCHMARKS),n)
ALL_TARGETS += benchmarks
RELEASE_TARGETS += benchmarks
endif

CLEAN_TARGETS = $(POSSIBLE_TARGETS)
CLOBBER_TARGETS = $(POSSIBLE_TARGETS)
CSTYLE_TARGETS = $(POSSIBLE_TARGETS)
Expand Down Expand Up @@ -90,16 +86,14 @@ uninstall: $(INSTALL_TARGETS:=-uninstall)
clean: $(CLEAN_TARGETS:=-clean)
clobber: $(CLOBBER_TARGETS:=-clobber)
cstyle: $(CSTYLE_TARGETS:=-cstyle)
format: $(CSTYLE_TARGETS:=-format)
examples benchmarks: $(EXAMPLES_TARGETS)
benchmarks: examples
examples: $(EXAMPLES_TARGETS)
sparse: $(SPARSE_TARGETS:=-sparse)

custom_build = $(DEBUG)$(OBJDIR)

tools: libpmem libpmemobj libpmempool
libpmempool libpmemobj: libpmem
benchmarks test tools: common core
test tools: common core

pkg-cfg-common:
@printf "version=%s\nlibdir=%s\nprefix=%s\nrasdeps=%s\n" "$(SRCVERSION)" "$(libdir)" "$(prefix)" "$(LIBNDCTL_PKG_CONFIG_DEPS_VAR)" > $(PKG_CONFIG_COMMON)
Expand All @@ -121,7 +115,6 @@ $(eval $(call sub-target,$(INSTALL_TARGETS),uninstall,y))
$(eval $(call sub-target,$(CLEAN_TARGETS),clean,y))
$(eval $(call sub-target,$(CLOBBER_TARGETS),clobber,y))
$(eval $(call sub-target,$(CSTYLE_TARGETS),cstyle,n))
$(eval $(call sub-target,$(CSTYLE_TARGETS),format,n))
$(eval $(call sub-target,$(SPARSE_TARGETS),sparse,n))

$(DEBUG_RELEASE_TARGETS):
Expand Down Expand Up @@ -177,12 +170,9 @@ uninstall:
$(RM) $(PMREORDER_BIN)/pmreorder

cstyle:
$(STYLE_CHECK) check $(HEADERS)
$(STYLE_CHECK) $(HEADERS)
$(CHECK_SHEBANG) $(SCRIPTS)

format:
$(STYLE_CHECK) format $(HEADERS)

cscope:
cscope -q -b $(SCOPEFILES)
ctags -e $(SCOPEFILES)
Expand All @@ -194,6 +184,6 @@ clean: clean-here

clobber: clean-here

.PHONY: all install uninstall clean clobber cstyle format test check pcheck\
.PHONY: all install uninstall clean clobber cstyle test check pcheck\
cscope $(ALL_TARGETS)\
pkg-config clean-here pkg-cfg-common
3 changes: 0 additions & 3 deletions src/benchmarks/.gitignore

This file was deleted.

Loading
Loading