Skip to content
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

Change KEvent to treat udata as an intptr_t instead of a uintptr_t. #463

Merged
merged 2 commits into from
Nov 15, 2016
Merged

Change KEvent to treat udata as an intptr_t instead of a uintptr_t. #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ac31d2
Change KEvent to treat udata as an intptr_t instead of a uintptr_t.
asomers Nov 11, 2016
7e96529
Added combined CHANGELOG entry for PRs 415, 442, and 463
asomers Nov 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- The minimum supported version of rustc is now 1.7.0.
([#444](https://github.com/nix-rust/nix/pull/444))
- Implement `Send` for `KEvent`
([#442](https://github.com/nix-rust/nix/pull/442))
- Changed `KEvent` to an opaque structure that may only be modified by its
constructor and the `ev_set` method.
([#415](https://github.com/nix-rust/nix/pull/415))
([#442](https://github.com/nix-rust/nix/pull/442))
([#463](https://github.com/nix-rust/nix/pull/463))
- `pipe2` now calls `libc::pipe2` where available. Previously it was emulated
using `pipe`, which meant that setting `O_CLOEXEC` was not atomic.
([#427](https://github.com/nix-rust/nix/pull/427))
Expand Down
12 changes: 6 additions & 6 deletions src/sys/event.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ pub fn kqueue() -> Result<RawFd> {


// KEvent can't derive Send because on some operating systems, udata is defined
// as a void*. However, KEvent's public API always treats udata as a uintptr_t,
// as a void*. However, KEvent's public API always treats udata as an intptr_t,
// which is safe to Send.
unsafe impl Send for KEvent {
}

impl KEvent {
pub fn new(ident: uintptr_t, filter: EventFilter, flags: EventFlag,
fflags:FilterFlag, data: intptr_t, udata: uintptr_t) -> KEvent {
fflags:FilterFlag, data: intptr_t, udata: intptr_t) -> KEvent {
KEvent { kevent: libc::kevent {
ident: ident,
filter: filter as type_of_event_filter,
Expand Down Expand Up @@ -231,8 +231,8 @@ impl KEvent {
self.kevent.data
}

pub fn udata(&self) -> uintptr_t {
self.kevent.udata as uintptr_t
pub fn udata(&self) -> intptr_t {
self.kevent.udata as intptr_t
}
}

Expand Down Expand Up @@ -282,7 +282,7 @@ pub fn ev_set(ev: &mut KEvent,
filter: EventFilter,
flags: EventFlag,
fflags: FilterFlag,
udata: uintptr_t) {
udata: intptr_t) {

ev.kevent.ident = ident as uintptr_t;
ev.kevent.filter = filter as type_of_event_filter;
Expand All @@ -294,7 +294,7 @@ pub fn ev_set(ev: &mut KEvent,

#[test]
fn test_struct_kevent() {
let udata : uintptr_t = 12345;
let udata : intptr_t = 12345;

let expected = libc::kevent{ident: 0xdeadbeef,
filter: libc::EVFILT_READ,
Expand Down