Skip to content

bpo-30766: Make CHECK_STATUS_PTHREAD signal-safe. #2404

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

Closed
wants to merge 1 commit into from
Closed

bpo-30766: Make CHECK_STATUS_PTHREAD signal-safe. #2404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2017-06-26-14-41-42.bpo-30766.cejWuh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make CHECK_STATUS_PTHREAD signal-safe
14 changes: 12 additions & 2 deletions Python/thread_pthread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,19 @@ typedef struct {
pthread_mutex_t mut;
} pthread_lock;

#define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
Copy link
Member

Choose a reason for hiding this comment

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

Why casting strlen() to int?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know, I copied this macro from traceback.c.


#define CHECK_STATUS(name) if (status != 0) { perror(name); error = 1; }
#define CHECK_STATUS_PTHREAD(name) if (status != 0) { fprintf(stderr, \
"%s: %s\n", name, strerror(status)); error = 1; }
/* CHECK_STATUS_PTHREAD is async-signal-safe */
#define CHECK_STATUS_PTHREAD(name) \
Copy link
Member

Choose a reason for hiding this comment

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

I never understood the purpose of these functions. Do we really need these checks? Why not replacing them with an assertion?

If you want to get them at runtime, maybe call Py_FatalError()?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't know. I'm inclined not to remove them right now.
OTOH, this whole PR may be made obsolete by #2408.

Copy link
Member

Choose a reason for hiding this comment

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

I don't know. I'm inclined not to remove them right now. OTOH, this whole PR may be made obsolete by #2408.

Oh no, please finish your work. I like the idea of more reliable locks :-)

if (status != 0) { \
int _stderr_fd = 2; \
PUTS(_stderr_fd, name); \
PUTS(_stderr_fd, ": failed with status "); \
_Py_DumpDecimal(_stderr_fd, (unsigned long) status); \
PUTS(_stderr_fd, "\n"); \
error = 1; \
}

/*
* Initialization.
Expand Down