Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove TRACE macros #4341

Merged
merged 21 commits into from
Apr 12, 2024
Merged

Remove TRACE macros #4341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
366c22c
bin/trace indents are now 4 spaces
derobins Apr 7, 2024
92ab47b
Handle restrict type qualifier
derobins Apr 7, 2024
a054008
Remove TRACE macro addition
derobins Apr 7, 2024
ddc9c73
Removed NO TRACE comments
derobins Apr 7, 2024
d03b9b4
Removed H5TRACE lines from source
derobins Apr 7, 2024
dd61ac1
Removed noise comment in H5DO.c
derobins Apr 7, 2024
39120e0
Remove H5TRACE macros from H5private.h
derobins Apr 7, 2024
96d18a2
Update autogen.sh comment
derobins Apr 7, 2024
dc4f4b5
Update bin/README.md
derobins Apr 7, 2024
d6df14b
Remove API counts from output
derobins Apr 7, 2024
43f553f
Removed $trace
derobins Apr 7, 2024
d7bb8cb
Remove $rettype
derobins Apr 7, 2024
64cbfae
Only count changed H5ARG_TRACE macros
derobins Apr 7, 2024
d44a302
Only exclude "external" source files
derobins Apr 7, 2024
b18ff8b
Capital I looks nicer
derobins Apr 7, 2024
169a4b1
Removed length limit since that no longer matters
derobins Apr 7, 2024
fdb61bd
Grammaring
derobins Apr 7, 2024
ce72608
Add a helpful comment to the script
derobins Apr 7, 2024
82f57f5
Minor commenting
derobins Apr 7, 2024
f9ea713
H5private.h trace macro cleanup
derobins Apr 7, 2024
9ab3e17
Add NAMECHECK_ONLY macros to .clang-format
derobins Apr 7, 2024
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
4 changes: 3 additions & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ BraceWrapping:
BreakBeforeBraces: Stroustrup
BreakAfterJavaFieldAnnotations: true
BreakStringLiterals: true
ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also
ColumnLimit: 110
IndentWidth: 4
---
Language: Cpp
Expand Down Expand Up @@ -68,12 +68,14 @@ StatementMacros:
- CATCH
- END_MEMBERS
- FUNC_ENTER_API
- FUNC_ENTER_API_NAMECHECK_ONLY
- FUNC_ENTER_NOAPI
- FUNC_ENTER_NOAPI_NOERR
- FUNC_ENTER_NOAPI_NOINIT
- FUNC_ENTER_NOAPI_NOINIT_NOERR
- FUNC_ENTER_PACKAGE
- FUNC_LEAVE_API
- FUNC_LEAVE_API_NAMECHECK_ONLY
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were causing clang-format to mess up H5TS.c

- FUNC_LEAVE_NOAPI
- FUNC_LEAVE_NOAPI_NOFS
- H5E_END_TRY
Expand Down
5 changes: 2 additions & 3 deletions autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ echo
# compilation.

# Run trace script
# The trace script adds H5TRACE macros to library source files. It should
# have no effect on files that don't have HDF5 API macros in them.
echo "Running trace script:"
# The trace script updates H5ARG_TRACE macros in library source files.
echo "Running arg trace script:"
bin/trace src/H5*.c || exit 1
echo

Expand Down
2 changes: 1 addition & 1 deletion bin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Programs run via `autogen.sh` (or the equivalent in CMake) are indicated.
|`restore.sh`|Removes files generated by `autogen.sh`|
|`runbkprog`|Used by CMake to run test programs in the background|
|`switch_maint_mode`|Switches maintainer mode on/off in `configure.ac`|
|`trace`|Adds `TRACE` macros to HDF5 C library source files (run by `autogen.sh`)|
|`trace`|Updates `H5ARG_TRACE` macros in H5ES\_insert() calls (run by `autogen.sh`)|
|`warnhist`|Generates compiler warning statistics for gcc/clang when fed output of make|

## TODO
Expand Down
Loading
Loading