Skip to content

Clean out non-thread-safe time functions (except ctime(3) where it's okay); fix #11560 #13284

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

Jump to bottom
Closed
wants to merge 7 commits into from
Closed

Clean out non-thread-safe time functions (except ctime(3) where it's okay); fix #11560 #13284

wants to merge 7 commits into from

Conversation

nabijaczleweli
Copy link
Contributor

@nabijaczleweli nabijaczleweli commented Apr 4, 2022 •
edited
Loading

Description

All other exit hooks for the progress thread indiscriminately pthread_cancel() it, not sure why this one didn't.

They were all slightly different but identical, so I fixed that as well.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

  • My code follows the OpenZFS code style requirements.
  • I have updated the documentation accordingly.
  • I have read the contributing document.
  • I have added tests to cover my changes. – none apply
  • I have run the ZFS Test Suite with this change applied. – CI take my hand
  • All commit messages are properly formatted and contain Signed-off-by.

@nabijaczleweli
zdb: standardise on ctime()
d4789b0 
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli
libzfs: sendrecv: send_progress_thread: use localtime_r()
e48c65b 
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli
libspl: print_timestamp: use localtime_r()
b399065 
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli
libspl: zed: event: use localtime_r()
5928c36 
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli
Forbid asctime{,_r}(), gmtime(), localtime()
c5cf0f7 
ctime() is only used in binary main threads, which is fine

Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
3aff8f0 
This is in line with all the other uses of the progress thread

Closes openzfs#11560
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
@nabijaczleweli nabijaczleweli mentioned this pull request Apr 4, 2022
Closed
@behlendorf behlendorf added Status: Code Review Needed Ready for review and testing Status: Accepted Ready to integrate (reviewed, tested) and removed Status: Code Review Needed Ready for review and testing labels Apr 5, 2022
@behlendorf behlendorf closed this in d503649 Apr 5, 2022
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: send_progress_thread: use localtime_r()
8ab2794 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13284
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libspl: print_timestamp: use localtime_r()
ae3683c 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13284
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libspl: zed: event: use localtime_r()
9185303 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13284
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
Forbid asctime{,_r}(), gmtime(), localtime()
3c69b53 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13284
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
1217fd1 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #11560
Closes #13284
behlendorf pushed a commit that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: use common progress thread killer
e3e4c30 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13284
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 5, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
284cba4 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
behlendorf pushed a commit to behlendorf/zfs that referenced this pull request Apr 6, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
12aa6fd 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
zdb: standardise on ctime()
01518a1 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
libzfs: sendrecv: send_progress_thread: use localtime_r()
bbf14f7 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
libspl: print_timestamp: use localtime_r()
a854c2e 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
libspl: zed: event: use localtime_r()
ce692f0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
Forbid asctime{,_r}(), gmtime(), localtime()
0905980 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
521eb0e 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
BrainSlayer pushed a commit to BrainSlayer/zfs that referenced this pull request Apr 11, 2022
@nabijaczleweli @BrainSlayer
libzfs: sendrecv: use common progress thread killer
968ef1e 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
behlendorf pushed a commit that referenced this pull request Apr 11, 2022
@nabijaczleweli @behlendorf
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
1f4c79b 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #11560
Closes #13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: use common progress thread killer
40026be 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
zdb: standardise on ctime()
6e434e8 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: send_progress_thread: use localtime_r()
5796dff 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: print_timestamp: use localtime_r()
b4ac760 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: zed: event: use localtime_r()
155c75d 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
Forbid asctime{,_r}(), gmtime(), localtime()
fdc168e 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
7437c77 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: use common progress thread killer
dedb6f9 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
zdb: standardise on ctime()
e39a445 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: send_progress_thread: use localtime_r()
2eda086 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: print_timestamp: use localtime_r()
d72b66e 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: zed: event: use localtime_r()
5854c1d 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
Forbid asctime{,_r}(), gmtime(), localtime()
5250559 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
46688ad 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: use common progress thread killer
7998320 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
zdb: standardise on ctime()
64d60b5 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: send_progress_thread: use localtime_r()
a3a029b 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: print_timestamp: use localtime_r()
94d1cbb 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: zed: event: use localtime_r()
99009f6 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
Forbid asctime{,_r}(), gmtime(), localtime()
1c49e41 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
38e4582 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: use common progress thread killer
7791776 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
zdb: standardise on ctime()
a86e81e 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: send_progress_thread: use localtime_r()
2c78ef0 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: print_timestamp: use localtime_r()
c4c7754 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libspl: zed: event: use localtime_r()
8f57413 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
Forbid asctime{,_r}(), gmtime(), localtime()
872b73b 
ctime() is only used in binary main threads, which is fine

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: always cancel progress thread in zfs_send_one()
21031c9 
This is in line with all the other uses of the progress thread

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#11560
Closes openzfs#13284
andrewc12 pushed a commit to andrewc12/openzfs that referenced this pull request Sep 23, 2022
@nabijaczleweli @andrewc12
libzfs: sendrecv: use common progress thread killer
1870708 
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13284
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nabijaczleweli @behlendorf