Add CFRunLoop #2

burtonageo · 2016-08-30T22:11:00Z

This also required defining some CFAllocator callback types, and some cf definitions from (CFDate), which I will add to in a future commit. Also, block parameters are passed as pointer, because the block crate (https://crates.io/crates/block) is not repr(C) safe.

Hope this is good to merge :-)

… types, and some cf definitions from (CFDate), which I will add to in a future commit. Also, block parameters are passed as pointer, because the `block` crate (https://crates.io/crates/block) is not repr(C) safe.

burtonageo · 2016-08-31T06:14:19Z

src/lib.rs

@@ -1,22 +1,28 @@
-#![allow(non_upper_case_globals,non_snake_case)]
+// TODO: remove allow(private_in_public), and fix compile errors
+#![allow(non_upper_case_globals,non_snake_case,private_in_public)]


I had to add this allow statement to get an easy fix for rust-lang/rust#34537 because I didn't want to muddle this pr with a comprehensive fix.

Is this still needed now that I merged #3?

Nope, I've removed it now

burtonageo · 2016-08-31T18:00:23Z

Maybe don't merge this until #3 has been merged, then I can base this commit on those fixes

burtonageo · 2016-10-03T19:36:30Z

All done!

dcuddeback · 2016-10-06T14:29:53Z

Cargo.toml

@@ -14,3 +14,4 @@ build = "build.rs"

 [dependencies]
 libc = "0.2"
+mach = "0.0"


mach_port_t was added in version 0.0.4, so we should restrict the mach version to prevent using versions older than that. 0.0.5 fixes private in public warnings, so I'd go with that version of mach.

All done, good catch :-)

dcuddeback

@burtonageo Thanks for submitting this. I double-checked the definitions against the header files in XCode. I found a few discrepancies that I pointed out as separate comments.

Out of curiosity, have you tried passing blocks from Rust to one of Apple's libraries? Based on reading the LLVM docs, it sounds like it will work correctly the way you defined the functions that take blocks in this PR. Just curious, because I've never tried it.

dcuddeback · 2016-10-12T15:30:59Z

src/runloop.rs

+
+pub type CFRunLoopRef = *mut __CFRunLoop;
+
+pub type CFRunLoopResult = i32;


I see CFRunLoopRunResult in CFRunLoop.h (missing the second Run).

dcuddeback · 2016-10-12T15:40:46Z

src/runloop.rs

+    pub fn CFRunLoopRemoveTimer(rl: CFRunLoopRef, timer: CFRunLoopTimerRef, mode: CFStringRef);
+    pub fn CFRunLoopContainsTimer(rl: CFRunLoopRef, timer: CFRunLoopTimerRef, mode: CFStringRef) -> Boolean;
+
+    pub fn CFRunLoopPerformBlock(rl: CFRunLoopRef, mode: CFStringRef, block: *mut c_void);


I see CFTypeRef for the second parameter:

CF_EXPORT void CFRunLoopPerformBlock(CFRunLoopRef rl, CFTypeRef mode, void (^block)(void)) CF_AVAILABLE(10_6, 4_0);

dcuddeback · 2016-10-12T15:50:39Z

src/runloop.rs

+pub type CFRunLoopGetPortCallBack = extern "C" fn(info: *mut c_void) -> mach_port_t;
+pub type CFRunLoopHashCallBack = extern "C" fn(info: *const c_void) -> CFHashCode;
+pub type CFRunLoopMachPerformCallBack = extern "C" fn(msg: *mut c_void, size: CFIndex, allocator: CFAllocatorRef,
+                                                      info: *mut c_void);


This callback returns a void * in CFRunLoopSourceContext1:

void * (*perform)(void *msg, CFIndex size, CFAllocatorRef allocator, void *info);

dcuddeback · 2016-10-12T15:52:07Z

src/runloop.rs

+    pub retain: CFAllocatorRetainCallBack,
+    pub release: CFAllocatorReleaseCallBack,
+    pub copyDescription: CFAllocatorCopyDescriptionCallBack,
+    pub equal: CFRunLoopEqualCallBack,


I don't see the CFRunLoop*Callback typedefs in CFRunLoop.h. Are those defined somewhere else?

dcuddeback · 2016-10-12T16:03:30Z

src/runloop.rs

+pub type CFRunLoopObserverCallBack = extern "C" fn(observer: CFRunLoopObserverRef, activity: CFRunLoopActivity,
+                                                   info: *mut c_void);
+
+pub type CFRunLoopActivity = u32;


This is typedef'd as CFOptionFlags:

typedef CF_OPTIONS(CFOptionFlags, CFRunLoopActivity) { ... }

which is a typedef for an unsigned long (Rust definition here:

core-foundation-sys/src/base.rs

Line 30 in 268c838

pub type CFOptionFlags = c_ulong;

). Since C doesn't guarantee that a long is 32 bits on all platforms, I think it's safest to keep the definitions as close as possible to how they're defined in C.

burtonageo · 2017-03-05T17:09:31Z

All nits addressed, and private_in_public warnings have been addressed too.

I have successfully used the Block crate to pass blocks from Rust to ObjC.

burtonageo added 2 commits August 30, 2016 23:02

Allow(private_in_public), and add todo comment to fix it later

ad07bce

burtonageo reviewed Aug 31, 2016
View reviewed changes

burtonageo added 3 commits October 3, 2016 20:33

Merge from new master

2da6415

Fix private in public warning for CFRunLoop

6fb8d6d

Remove allow(private_in_public) and TODO comment

7489b9b

dcuddeback reviewed Oct 6, 2016

View reviewed changes

Use mach v0.0.5 - has mach_port_t, and fixes public_in_private warning.

9e5ee9f

dcuddeback requested changes Oct 15, 2016

View reviewed changes

burtonageo added 3 commits March 5, 2017 16:35

Resolve merge conflict

76585d9

Fix nits

540229d

Mark extern blocks explicitly as extern "C"

cc180a5

dcuddeback approved these changes Mar 19, 2017

View reviewed changes

dcuddeback merged commit f358825 into dcuddeback:master Mar 19, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CFRunLoop #2

Add CFRunLoop #2

burtonageo commented Aug 30, 2016

burtonageo Aug 31, 2016

dcuddeback Oct 6, 2016

burtonageo Oct 9, 2016

burtonageo commented Aug 31, 2016

burtonageo commented Oct 3, 2016

dcuddeback Oct 6, 2016

burtonageo Oct 9, 2016

dcuddeback left a comment

dcuddeback Oct 12, 2016 •

edited

Loading

dcuddeback Oct 12, 2016

dcuddeback Oct 12, 2016

dcuddeback Oct 12, 2016

dcuddeback Oct 12, 2016

burtonageo commented Mar 5, 2017


		pub type CFRunLoopRef = *mut __CFRunLoop;

		pub type CFRunLoopResult = i32;

Add CFRunLoop #2

Add CFRunLoop #2

Conversation

burtonageo commented Aug 30, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

burtonageo commented Aug 31, 2016

burtonageo commented Oct 3, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dcuddeback left a comment

Choose a reason for hiding this comment

dcuddeback Oct 12, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

burtonageo commented Mar 5, 2017

dcuddeback Oct 12, 2016 •

edited

Loading