Skip to content

Commit 81026bc

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#128817
Rollup merge of rust-lang#128817 - biabbas:vxworks_update, r=tgross35 VxWorks code refactored 1. Extern TaskNameSet as minimum supported version of os is VxWorks 7 which would have taskNameSet 2. Vx_TASK_NAME_LEN is 31 on VxWorks7, defined variable res. 3. Add unsafe blocks on Non::Zero usage in available_parallelism() 4. Update vxworks docs. r? `@tgross35` cc `@devnexen`
2 parents 899eb03 + b20d9f0 commit 81026bc

File tree

3 files changed

+21
-29
lines changed

3 files changed

+21
-29
lines changed

‎library/std/src/sys/pal/unix/thread.rs

+13-23
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,7 @@ use crate::mem::{self, ManuallyDrop};
33
use crate::num::NonZero;
44
#[cfg(all(target_os = "linux", target_env = "gnu"))]
55
use crate::sys::weak::dlsym;
6-
#[cfg(any(
7-
target_os = "solaris",
8-
target_os = "illumos",
9-
target_os = "nto",
10-
target_os = "vxworks"
11-
))]
6+
#[cfg(any(target_os = "solaris", target_os = "illumos", target_os = "nto",))]
127
use crate::sys::weak::weak;
138
use crate::sys::{os, stack_overflow};
149
use crate::time::Duration;
@@ -220,23 +215,16 @@ impl Thread {
220215
#[cfg(target_os = "vxworks")]
221216
pub fn set_name(name: &CStr) {
222217
// FIXME(libc): adding real STATUS, ERROR type eventually.
223-
weak! {
224-
fn taskNameSet(
225-
libc::TASK_ID, *mut libc::c_char
226-
) -> libc::c_int
218+
extern "C" {
219+
fn taskNameSet(task_id: libc::TASK_ID, task_name: *mut libc::c_char) -> libc::c_int;
227220
}
228221

229-
// We can't assume taskNameSet is necessarily available.
230-
// VX_TASK_NAME_LEN can be found set to 31,
231-
// however older versions can be set to only 10.
232-
// FIXME(vxworks): if the minimum supported VxWorks is >= 7, the maximum length can be changed to 31.
233-
if let Some(f) = taskNameSet.get() {
234-
const VX_TASK_NAME_LEN: usize = 10;
222+
// VX_TASK_NAME_LEN is 31 in VxWorks 7.
223+
const VX_TASK_NAME_LEN: usize = 31;
235224

236-
let name = truncate_cstr::<{ VX_TASK_NAME_LEN }>(name);
237-
let status = unsafe { f(libc::taskIdSelf(), name.as_mut_ptr()) };
238-
debug_assert_eq!(res, libc::OK);
239-
}
225+
let mut name = truncate_cstr::<{ VX_TASK_NAME_LEN }>(name);
226+
let res = unsafe { taskNameSet(libc::taskIdSelf(), name.as_mut_ptr()) };
227+
debug_assert_eq!(res, libc::OK);
240228
}
241229

242230
#[cfg(any(
@@ -489,9 +477,11 @@ pub fn available_parallelism() -> io::Result<NonZero<usize>> {
489477
fn vxCpuEnabledGet() -> libc::cpuset_t;
490478
}
491479

492-
// always fetches a valid bitmask
493-
let set = unsafe { vxCpuEnabledGet() };
494-
Ok(NonZero::new_unchecked(set.count_ones() as usize))
480+
// SAFETY: `vxCpuEnabledGet` always fetches a mask with at least one bit set
481+
unsafe{
482+
let set = vxCpuEnabledGet();
483+
Ok(NonZero::new_unchecked(set.count_ones() as usize))
484+
}
495485
} else {
496486
// FIXME: implement on Redox, l4re
497487
Err(io::const_io_error!(io::ErrorKind::Unsupported, "Getting the number of hardware threads is not supported on the target platform"))

‎src/doc/rustc/src/platform-support.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ target | std | host | notes
282282
[`armv7-unknown-linux-uclibceabihf`](platform-support/armv7-unknown-linux-uclibceabihf.md) | ✓ | ? | Armv7-A Linux with uClibc, hardfloat
283283
`armv7-unknown-freebsd` | ✓ | ✓ | Armv7-A FreeBSD
284284
[`armv7-unknown-netbsd-eabihf`](platform-support/netbsd.md) | ✓ | ✓ | Armv7-A NetBSD w/hard-float
285-
[`armv7-wrs-vxworks-eabihf`](platform-support/vxworks.md) | ? | | Armv7-A for VxWorks
285+
[`armv7-wrs-vxworks-eabihf`](platform-support/vxworks.md) | ✓ | | Armv7-A for VxWorks
286286
[`armv7a-kmc-solid_asp3-eabi`](platform-support/kmc-solid.md) | ✓ | | ARM SOLID with TOPPERS/ASP3
287287
[`armv7a-kmc-solid_asp3-eabihf`](platform-support/kmc-solid.md) | ✓ | | ARM SOLID with TOPPERS/ASP3, hardfloat
288288
[`armv7a-none-eabihf`](platform-support/arm-none-eabi.md) | * | | Bare Armv7-A, hardfloat
@@ -308,7 +308,7 @@ target | std | host | notes
308308
`i686-uwp-windows-gnu` | ✓ | | [^x86_32-floats-return-ABI]
309309
`i686-uwp-windows-msvc` | ✓ | | [^x86_32-floats-return-ABI]
310310
[`i686-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 32-bit Windows 7 support [^x86_32-floats-return-ABI]
311-
[`i686-wrs-vxworks`](platform-support/vxworks.md) | ? | | [^x86_32-floats-return-ABI]
311+
[`i686-wrs-vxworks`](platform-support/vxworks.md) | ✓ | | [^x86_32-floats-return-ABI]
312312
[`m68k-unknown-linux-gnu`](platform-support/m68k-unknown-linux-gnu.md) | ? | | Motorola 680x0 Linux
313313
`mips-unknown-linux-gnu` | ✓ | ✓ | MIPS Linux (kernel 4.4, glibc 2.23)
314314
`mips-unknown-linux-musl` | ✓ | | MIPS Linux with musl 1.2.3
@@ -334,13 +334,13 @@ target | std | host | notes
334334
`powerpc-unknown-linux-musl` | ? | | PowerPC Linux with musl 1.2.3
335335
[`powerpc-unknown-netbsd`](platform-support/netbsd.md) | ✓ | ✓ | NetBSD 32-bit powerpc systems
336336
[`powerpc-unknown-openbsd`](platform-support/powerpc-unknown-openbsd.md) | * | |
337-
[`powerpc-wrs-vxworks-spe`](platform-support/vxworks.md) | ? | |
338-
[`powerpc-wrs-vxworks`](platform-support/vxworks.md) | ? | |
337+
[`powerpc-wrs-vxworks-spe`](platform-support/vxworks.md) | ✓ | |
338+
[`powerpc-wrs-vxworks`](platform-support/vxworks.md) | ✓ | |
339339
`powerpc64-unknown-freebsd` | ✓ | ✓ | PPC64 FreeBSD (ELFv1 and ELFv2)
340340
`powerpc64le-unknown-freebsd` | | | PPC64LE FreeBSD
341341
`powerpc-unknown-freebsd` | | | PowerPC FreeBSD
342342
`powerpc64-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.3
343-
`powerpc64-wrs-vxworks` | ? | |
343+
[`powerpc64-wrs-vxworks`](platform-support/vxworks.md) | ✓ | |
344344
`powerpc64le-unknown-linux-musl` | ? | | 64-bit PowerPC Linux with musl 1.2.3, Little Endian
345345
[`powerpc64-unknown-openbsd`](platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/powerpc64
346346
[`powerpc64-ibm-aix`](platform-support/aix.md) | ? | | 64-bit AIX (7.2 and newer)
@@ -383,7 +383,7 @@ target | std | host | notes
383383
`x86_64-uwp-windows-gnu` | ✓ | |
384384
`x86_64-uwp-windows-msvc` | ✓ | |
385385
[`x86_64-win7-windows-msvc`](platform-support/win7-windows-msvc.md) | ✓ | | 64-bit Windows 7 support
386-
[`x86_64-wrs-vxworks`](platform-support/vxworks.md) | ? | |
386+
[`x86_64-wrs-vxworks`](platform-support/vxworks.md) | ✓ | |
387387
[`x86_64h-apple-darwin`](platform-support/x86_64h-apple-darwin.md) | ✓ | ✓ | macOS with late-gen Intel (at least Haswell)
388388
[`x86_64-unknown-linux-none`](platform-support/x86_64-unknown-linux-none.md) | * | | 64-bit Linux with no libc
389389
[`xtensa-esp32-none-elf`](platform-support/xtensa.md) | * | | Xtensa ESP32

‎src/doc/rustc/src/platform-support/vxworks.md

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Target triplets available:
1212
- `i686-wrs-vxworks`
1313
- `armv7-wrs-vxworks-eabihf`
1414
- `powerpc-wrs-vxworks`
15+
- `powerpc64-wrs-vxworks`
1516
- `powerpc-wrs-vxworks-spe`
1617

1718
## Target maintainers
@@ -42,6 +43,7 @@ target = [
4243
"i686-wrs-vxworks",
4344
"armv7-wrs-vxworks-eabihf",
4445
"powerpc-wrs-vxworks",
46+
"powerpc64-wrs-vxworks",
4547
"powerpc-wrs-vxworks-spe",
4648
]
4749
```

0 commit comments

Comments
 (0)