Fix assertion in Mutex::destroy() on DragonFly (#20698) #20741
Conversation
|
(rust_highfive has picked a reviewer for you, use r? to override) |
| // on a mutex that was just initialized with | ||
| // ffi::PTHREAD_MUTEX_INITIALIZER. Once it is used (locked/unlocked) | ||
| // or pthread_mutex_init() is called, this behaviour no longer occurs. | ||
| debug_assert!(r == 0 || r == 22); |
There was a problem hiding this comment.
Is there an EINVAL const somewhere in liblibc you could use instead of a raw 22?
|
@sfackler: I will look out for EINVAL and try to use it. There are some more similar patches to come for condvar.rs and rwlock.rs. Cross-compiling to DragonFly is slow and I thought this would fix all my issues... |
On DragonFly pthread_{mutex,rwlock,condvar}_destroy() returns EINVAL
when called on a pthread_{mutex,rwlock,condvar}_t that was just
initialized via PTHREAD_{MUTEX,RWLOCK,CONDVAR}_INITIALIZER and not used
in the meantime or initialized via pthread_{mutex,rwlock,condvar}_init().
Change the code to treat a return value of EINVAL on DragonFly as success.
|
Ok, now I also fixed condvar and rwlock, now it's building a working Rust compiler for DragonFly!!! |
|
I do think that this may actually be a bug in the pthread implementation, it sounds like patterns like this are supposed to work. We've had problems in the past with buggy pthreads implementations as well. That being said, I'm not totally opposed to having a special case. It's a little unfortunate to start growing an array of Out of curiosity, do you know if this issue could be brought up with DragonFly maintainers? |
|
@alexcrichton: The related DragonFly bug report is here, but I doubt it will change, and even if it will be "fixed", there will always be older versions of DragonFly and Rust won't work on them. The way it is implemented in DragonFly protects you against duplicate |
|
Alright, sounds good to me! Thanks for opening a report with them :) |
|
@alexcrichton: We fixed it with this commit. It's now questionable if we still need to apply this pull request. I can update my DragonFly system, anyone else who wants to run Rust should do so too. |
|
Nice! Do you know how quickly updates roll out to DragonFly? If it takes awhile, we could just slate this for deletion in 6 months or so. |
Fix assertion in Mutex::destroy() on DragonFly (#20698) Reviewed-by: alexcrichton
|
Usually every 6 months there is a new DragonFly release. Agreed, let's remove it some time in the future. Thanks! |
On DragonFly pthread_mutex_destroy() returns EINVAL (22) if called on a
pthread_mutex_t that was just initialized via PTHREAD_MUTEX_INITIALIZER
and not used otherwise or initialized via pthread_mutex_init(). Change
the code to treat a return value of EINVAL on DragonFly as success, too.
This fixes issue #20698.