This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12373

rust-hg-core: use correct type for libc hostname buffer
ClosedPublic

Authored by lukegb on Mar 14 2022, 10:11 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG59be65b7cdfd: rust-hg-core: use correct type for libc hostname buffer
rHG8e828c0f647b: rust-hg-core: use correct type for libc hostname buffer
Summary

The type of libc::c_char is u8 on aarch64 rather than i8, which causes
the use of a specifically-typed constant to fail.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

lukegb created this revision.Mar 14 2022, 10:11 AM
lukegb added a comment.Mar 14 2022, 10:13 AM

I'm pulling this patch into nixpkgs directly (https://github.com/NixOS/nixpkgs/pull/164119) as well just to unblock us (and also to actually test this on an aarch64-linux system, since I don't have one to hand but we do have them in CI)

lukegb updated this revision to Diff 32636.Mar 14 2022, 10:20 AM
Alphare accepted this revision.Mar 14 2022, 10:23 AM
This revision is now accepted and ready to land.Mar 14 2022, 10:23 AM
lukegb added a commit: rHG8e828c0f647b: rust-hg-core: use correct type for libc hostname buffer.Mar 14 2022, 10:41 AM
Closed by commit rHG8e828c0f647b: rust-hg-core: use correct type for libc hostname buffer (authored by lukegb). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/lock.rs (2 lines)

Diff 32637

rust/hg-core/src/lock.rs

/// It's useful to detect "dead" processes and remove stale locks with /// It's useful to detect "dead" processes and remove stale locks with
/// confidence. Typically it's just hostname. On modern linux, we include an /// confidence. Typically it's just hostname. On modern linux, we include an
/// extra Linux-specific pid namespace identifier. /// extra Linux-specific pid namespace identifier.
static ref LOCK_PREFIX: String = { static ref LOCK_PREFIX: String = {
// Note: this must match the behavior of `_getlockprefix` in `mercurial/lock.py` // Note: this must match the behavior of `_getlockprefix` in `mercurial/lock.py`
/// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414 /// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414
const BUFFER_SIZE: usize = 1024; const BUFFER_SIZE: usize = 1024;
let mut buffer = [0_i8; BUFFER_SIZE]; let mut buffer = [0 as libc::c_char; BUFFER_SIZE];
let hostname_bytes = unsafe { let hostname_bytes = unsafe {
let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE); let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE);
if result != 0 { if result != 0 {
panic!("gethostname: {}", io::Error::last_os_error()) panic!("gethostname: {}", io::Error::last_os_error())
} }
std::ffi::CStr::from_ptr(buffer.as_mut_ptr()).to_bytes() std::ffi::CStr::from_ptr(buffer.as_mut_ptr()).to_bytes()
}; };
let hostname = let hostname =