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

[CoreFoundation] Refactor Dispatch code to take advantage of recent code improvements. #4939

Merged
merged 8 commits into from
Oct 11, 2018
Merged

[CoreFoundation] Refactor Dispatch code to take advantage of recent code improvements. #4939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b4b3e8d
[CoreFoundation] Make DispatchObject inherit from NativeObject to sha…
rolfbjarne Sep 13, 2018
c4a9814
[CoreFoundation] Replace calls to Check () with calls to GetCheckedHa…
rolfbjarne Sep 13, 2018
ddf5549
[CoreFoundation] Simplify a bit by reusing code in base constructors.
rolfbjarne Sep 13, 2018
279c1d5
[CoreFoundation] Use Handle instead of handle.
rolfbjarne Sep 13, 2018
cbe48e2
[CoreFoundation] Use InitializeHandle instead of setting the 'handle'…
rolfbjarne Sep 13, 2018
2add8d1
[CoreFoundation] Remove temporary 'handle' field.
rolfbjarne Sep 13, 2018
f715def
[CoreFoundation] Remove needless 'unsafe' blocks.
rolfbjarne Sep 13, 2018
328dcac
Reintroduce DispatchObject.Check, since it's public API.
rolfbjarne Oct 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 39 additions & 69 deletions src/CoreFoundation/Dispatch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.ComponentModel;
using System.Runtime.InteropServices;
using System.Threading;
using ObjCRuntime;
Expand All @@ -47,26 +48,18 @@ public enum DispatchQueuePriority : int {
Background = Int16.MinValue
}

public abstract class DispatchObject : INativeObject
#if !COREBUILD
, IDisposable
#endif
public abstract class DispatchObject : NativeObject
{
#if !COREBUILD
internal IntPtr handle;

//
// Constructors and lifecycle
//
[Preserve (Conditional = true)]
internal DispatchObject (IntPtr handle, bool owns)
: base (handle, owns)
{
if (handle == IntPtr.Zero)
throw new ArgumentNullException ("handle");

this.handle = handle;
if (!owns)
dispatch_retain (handle);
}

internal DispatchObject ()
Expand All @@ -79,27 +72,14 @@ internal DispatchObject ()
[DllImport (Constants.libcLibrary)]
extern static IntPtr dispatch_retain (IntPtr o);

~DispatchObject ()
{
Dispose (false);
}

public void Dispose ()
protected override void Retain ()
{
Dispose (true);
GC.SuppressFinalize (this);
dispatch_retain (Handle);
}

public IntPtr Handle {
get { return handle; }
}

protected virtual void Dispose (bool disposing)
protected override void Release ()
{
if (handle != IntPtr.Zero){
dispatch_release (handle);
handle = IntPtr.Zero;
}
dispatch_release (Handle);
}

public static bool operator == (DispatchObject a, DispatchObject b)
Expand All @@ -114,7 +94,7 @@ protected virtual void Dispose (bool disposing)
} else {
if (ob == null)
return false;
return a.handle == b.handle;
return a.Handle == b.Handle;
}
}

Expand All @@ -128,19 +108,22 @@ public override bool Equals (object other)
var od = other as DispatchQueue;
if (od == null)
return false;
return od.handle == handle;
return od.Handle == Handle;
}

public override int GetHashCode ()
{
return (int) handle;
return (int) Handle;
}

#if !XAMCORE_4_0
[EditorBrowsable (EditorBrowsableState.Never)]
[Obsolete ("Use 'GetCheckedHandle' instead.")]
protected void Check ()
{
if (handle == IntPtr.Zero)
throw new ObjectDisposedException (GetType ().ToString ());
}
GetCheckedHandle ();
}
#endif

[DllImport (Constants.libcLibrary)]
extern static void dispatch_set_target_queue (/* dispatch_object_t */ IntPtr queue, /* dispatch_queue_t */ IntPtr target);
Expand All @@ -149,7 +132,7 @@ public void SetTargetQueue (DispatchQueue queue)
{
// note: null is allowed because DISPATCH_TARGET_QUEUE_DEFAULT is defined as NULL (dispatch/queue.h)
IntPtr q = queue == null ? IntPtr.Zero : queue.Handle;
dispatch_set_target_queue (handle, q);
dispatch_set_target_queue (Handle, q);
}

[DllImport (Constants.libcLibrary)]
Expand All @@ -171,11 +154,10 @@ public DispatchQueue (IntPtr handle) : base (handle, false)
{
}

public DispatchQueue (string label) : base ()
public DispatchQueue (string label)
: base (dispatch_queue_create (label, IntPtr.Zero), true)
{
// Initialized in owned state for the queue.
handle = dispatch_queue_create (label, IntPtr.Zero);
if (handle == IntPtr.Zero)
if (Handle == IntPtr.Zero)
throw new Exception ("Error creating dispatch queue");
}

Expand All @@ -189,9 +171,9 @@ static IntPtr ConcurrentQueue {
}

public DispatchQueue (string label, bool concurrent)
: base (dispatch_queue_create (label, concurrent ? ConcurrentQueue : IntPtr.Zero), true)
{
handle = dispatch_queue_create (label, concurrent ? ConcurrentQueue : IntPtr.Zero);
if (handle == IntPtr.Zero)
if (Handle == IntPtr.Zero)
throw new Exception ("Error creating dispatch queue");
}

Expand All @@ -201,10 +183,7 @@ public DispatchQueue (string label, bool concurrent)

public string Label {
get {
if (handle == IntPtr.Zero)
throw new ObjectDisposedException ("DispatchQueue");

return Marshal.PtrToStringAnsi (dispatch_queue_get_label (handle));
return Marshal.PtrToStringAnsi (dispatch_queue_get_label (GetCheckedHandle ()));
}
}

Expand All @@ -217,14 +196,12 @@ public static string CurrentQueueLabel {

public void Suspend ()
{
Check ();
dispatch_suspend (handle);
dispatch_suspend (GetCheckedHandle ());
}

public void Resume ()
{
Check ();
dispatch_resume (handle);
dispatch_resume (GetCheckedHandle ());
}

[DllImport (Constants.libcLibrary)]
Expand All @@ -238,12 +215,10 @@ public void Resume ()

public IntPtr Context {
get {
Check ();
return dispatch_get_context (handle);
return dispatch_get_context (GetCheckedHandle ());
}
set {
Check ();
dispatch_set_context (handle, value);
dispatch_set_context (GetCheckedHandle (), value);
}
}

Expand Down Expand Up @@ -368,38 +343,38 @@ public void DispatchAsync (Action action)
if (action == null)
throw new ArgumentNullException ("action");

dispatch_async_f (handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
dispatch_async_f (Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
}

public void DispatchSync (Action action)
{
if (action == null)
throw new ArgumentNullException ("action");

dispatch_sync_f (handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
dispatch_sync_f (Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
}

public void DispatchBarrierAsync (Action action)
{
if (action == null)
throw new ArgumentNullException ("action");

dispatch_barrier_async_f (handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
dispatch_barrier_async_f (Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
}

public void DispatchAfter (DispatchTime when, Action action)
{
if (action == null)
throw new ArgumentNullException ("action");

dispatch_after_f (when.Nanoseconds, handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
dispatch_after_f (when.Nanoseconds, Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch);
}

public void Submit (Action<int> action, long times)
{
if (action == null)
throw new ArgumentNullException ("action");
dispatch_apply_f ((IntPtr) times, handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch_iterations);
dispatch_apply_f ((IntPtr) times, Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, this)), static_dispatch_iterations);
}

//
Expand Down Expand Up @@ -442,7 +417,7 @@ public override bool Equals (object other)
DispatchQueue o = other as DispatchQueue;
if (o == null)
return false;
return (o.Handle == handle);
return (o.Handle == Handle);
}

public static bool operator == (DispatchQueue left, DispatchQueue right)
Expand All @@ -461,7 +436,7 @@ public override bool Equals (object other)

public override int GetHashCode ()
{
return (int)handle;
return (int) Handle;
}

#if MONOMAC
Expand Down Expand Up @@ -548,8 +523,7 @@ public void DispatchAsync (DispatchQueue queue, Action action)
if (action == null)
throw new ArgumentNullException ("action");

Check ();
dispatch_group_async_f (handle, queue.handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, queue)), DispatchQueue.static_dispatch);
dispatch_group_async_f (GetCheckedHandle (), queue.Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, queue)), DispatchQueue.static_dispatch);
}

public void Notify (DispatchQueue queue, Action action)
Expand All @@ -559,26 +533,22 @@ public void Notify (DispatchQueue queue, Action action)
if (action == null)
throw new ArgumentNullException ("action");

Check ();
dispatch_group_notify_f (handle, queue.handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, queue)), DispatchQueue.static_dispatch);
dispatch_group_notify_f (GetCheckedHandle (), queue.Handle, (IntPtr) GCHandle.Alloc (Tuple.Create (action, queue)), DispatchQueue.static_dispatch);
}

public void Enter ()
{
Check ();
dispatch_group_enter (handle);
dispatch_group_enter (GetCheckedHandle ());
}

public void Leave ()
{
Check ();
dispatch_group_leave (handle);
dispatch_group_leave (GetCheckedHandle ());
}

public bool Wait (DispatchTime timeout)
{
Check ();
return dispatch_group_wait (handle, timeout.Nanoseconds) == 0;
return dispatch_group_wait (GetCheckedHandle (), timeout.Nanoseconds) == 0;
}

[DllImport (Constants.libcLibrary)]
Expand Down
8 changes: 4 additions & 4 deletions src/CoreFoundation/DispatchData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ public static DispatchData FromBuffer (IntPtr buffer, nuint size)
[DllImport (Constants.libcLibrary)]
extern static nuint dispatch_data_get_size (IntPtr handle);

public nuint Size => dispatch_data_get_size (handle);
public nuint Size => dispatch_data_get_size (Handle);

[DllImport (Constants.libcLibrary)]
extern static IntPtr dispatch_data_create_map (IntPtr handle, out IntPtr bufferPtr, out nuint size);

public DispatchData CreateMap (out IntPtr bufferPtr, out nuint size)
{
var nh = dispatch_data_create_map (handle, out bufferPtr, out size);
var nh = dispatch_data_create_map (Handle, out bufferPtr, out size);
return new DispatchData (nh, owns: true);
}

Expand All @@ -118,15 +118,15 @@ public static DispatchData Concat (DispatchData data1, DispatchData data2)
if (data2 == null)
throw new ArgumentNullException (nameof (data2));

return new DispatchData (dispatch_data_create_concat (data1.handle, data2.handle), owns: true);
return new DispatchData (dispatch_data_create_concat (data1.Handle, data2.Handle), owns: true);
}

[DllImport (Constants.libcLibrary)]
extern static IntPtr dispatch_data_create_subrange (IntPtr handle, nuint offset, nuint size);

public DispatchData CreateSubrange (nuint offset, nuint size)
{
return new DispatchData (dispatch_data_create_subrange (handle, offset, size), owns: true);
return new DispatchData (dispatch_data_create_subrange (Handle, offset, size), owns: true);
}
#endif
}
Expand Down
Loading