Generate static callbacks #208

-			func_list.Add (func_wrapper);
-			gdk_display_add_client_message_filter (Handle, message_type == null ? IntPtr.Zero : message_type.Handle, func_wrapper.NativeDelegate, IntPtr.Zero);
+			var gch = GCHandle.Alloc (func);
+			gdk_display_add_client_message_filter (Handle, message_type == null ? IntPtr.Zero : message_type.Handle, GdkSharp.FilterFuncWrapper.NativeDelegate, (IntPtr)gch);


Can we add a comment that this leaks forever and that there is no gdk_display_remove_client_message_filter to allow cleanup to happen?

Therzok · 2017-12-12T15:09:31Z

https://gist.github.com/Therzok/7c79efe0f070277f35c19ef44b9cd770

Latest diff
144 files changed, 1001 insertions(+), 5650 deletions(-)

alanmcgovern · 2017-12-12T15:03:24Z

gdk/Window.custom

 		hash.Remove (function);
-		gdk_window_remove_filter (Handle, wrapper.NativeDelegate, IntPtr.Zero);
+		gdk_window_remove_filter (Handle, GdkSharp.FilterFuncWrapper.NativeDelegate, (IntPtr)gch);
+		gch.Free();
 	}

 #if MANLY_ENOUGH_TO_INCLUDE


Yeah, noticed it too

alanmcgovern · 2017-12-12T15:07:09Z

glade/XML.custom

+				}
+
+				gch = GCHandle.Alloc (value);
+				glade_set_custom_handler(GladeSharp.XMLCustomWidgetHandlerWrapper.NativeDelegate, (IntPtr)gch);


Don't we need to set callback_wrapper? It'll always be null here, right? Should this be changed to:

- static Glade.XMLCustomWidgetHandler callback_wrapper = null; ... ... if (gch.IsAllocated) gch.Free ();

gch.IsAllocated only works after alloc/free, afaik, not with empty gchandle

alanmcgovern · 2017-12-12T15:21:22Z

gtk/TreeModelFilter.custom

@@ -68,7 +68,7 @@
 			IntPtr[] native_types = new IntPtr [types.Length];
 			for (int i = 0; i < types.Length; i++)
 				native_types [i] = types [i].Val;
-			GCHandle gch = GCHandle.Alloc (func);
+			GCHandle gch = func != null ? GCHandle.Alloc (func) : (GCHandle)IntPtr.Zero;
 			gtk_tree_model_filter_set_modify_func (Handle, n_columns, native_types, GtkSharp.TreeModelFilterModifyFuncWrapper.NativeDelegate, (IntPtr) gch, GLib.DestroyHelper.NotifyHandler);


Do we want to pass a null destroy callback when func is null? It'd be consistent with everything else if we passed a null destroy callback when the func is null, but not a big deal

Also, is there a particular reason why we want to keep passing GtkSharp.TreeModelFilterModifyFuncWrapper.NativeDelegate to native when the func is null?

DestroyNotify handles null gchandle, so we're ok:

static void ReleaseGCHandle (IntPtr data) { if (data == IntPtr.Zero) return; GCHandle gch = (GCHandle) data; gch.Free (); }

Hmmm, maybe not. I can send in null. This was custom bound, didn't verify integrity of it

Therzok force-pushed the generate-static-callbacks branch from 7b97e04 to 8e3f2a5 Compare June 17, 2017 15:58

Therzok changed the title ~~Generate static callbacks~~ [DO NOT MERGE]Generate static callbacks Jun 17, 2017

Therzok force-pushed the generate-static-callbacks branch 5 times, most recently from 0caa8fd to 367262d Compare June 17, 2017 16:57

Therzok changed the title ~~[DO NOT MERGE]Generate static callbacks~~ Generate static callbacks Jun 17, 2017

Therzok force-pushed the generate-static-callbacks branch 5 times, most recently from c34e822 to c61521b Compare June 17, 2017 20:15

Therzok added 8 commits December 9, 2017 14:01

[Gen] Generate with static callback where applicable.

6438490

[Gdk] Fix extra space which didn't match type.

6ce8e67

[Gen] Fix generator not validating imported data

3a642df

This, for example, makes parameters available for imported callbacks. Thus, Gtk.Object now implements Atk.Implementor

[Gtk] Get rid of some hacks and properly implement quit/input add

f55855f

[Gtk] Modify custom TextBuffer delegate wrapper.

7bdc338

[Gen] Set some callback gen members on validation

42f63e4

Avoids codegen of bloat

[Gen] Improve codegen of callbacks.

ee63d91

[Gen] Avoid generating invoker if not used.

8c54918

Therzok force-pushed the generate-static-callbacks branch from 83ec0c1 to 8c54918 Compare December 9, 2017 13:09

[Gen] Handle all user data cases

b9c5953

[Gen] Avoid allocating wrapper class if not needed.

b8d274b

Therzok requested a review from alanmcgovern December 9, 2017 15:37

[Gen] Some more static generation in async handlers

7fa0084

Therzok force-pushed the generate-static-callbacks branch from ea5f08b to 7fa0084 Compare December 9, 2017 19:29

[Gen] Fix callback marshal return so static can be used

ae7dcdf

Therzok force-pushed the generate-static-callbacks branch from 831efbe to ae7dcdf Compare December 9, 2017 23:06

[Gen] Marshal Gdk.FilterFunc as static wrapper

ab2d1e4

Therzok added 2 commits December 10, 2017 14:06

[Clipboard] Make some callbacks static.

7605b6c

[Gen] Fix handlers to return a managed delegate for a native one

dc98831

Therzok added 2 commits December 12, 2017 15:33

[Gen] Manually gen callback returning pinvokes.

9fd1bf1

[Gen] Use WeakReference instead of IntPtr to track delegates

4832c29

alanmcgovern reviewed Dec 12, 2017

View reviewed changes

Therzok added 2 commits December 12, 2017 17:06

Add missing files

b2f8dbb

Remove useless metadata

f0be1c5

alanmcgovern reviewed Dec 12, 2017

View reviewed changes

Therzok added 3 commits December 12, 2017 17:12

Add comment explaining intentional leak

a77ebbe

Set callback_wrapper

7c7a632

[About] use the right pinvoke

bf83193

alanmcgovern approved these changes Dec 12, 2017

View reviewed changes

[TreeModelFilter] Don't gchandle.Alloc(null)

9c38c8b

alanmcgovern reviewed Dec 12, 2017

View reviewed changes

Review feedback

627d644

Therzok merged commit ada71f5 into gtk-sharp-2-12-branch Dec 13, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generate static callbacks #208

Generate static callbacks #208

Therzok commented Jun 17, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017 •

edited

Loading

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 11, 2017

alanmcgovern Dec 12, 2017

Therzok Dec 12, 2017

Therzok commented Dec 12, 2017

alanmcgovern Dec 12, 2017

Therzok Dec 12, 2017

alanmcgovern Dec 12, 2017

Therzok Dec 12, 2017 •

edited

Loading

Therzok Dec 12, 2017

alanmcgovern Dec 12, 2017 •

edited

Loading

alanmcgovern Dec 12, 2017 •

edited

Loading

Therzok Dec 12, 2017

Therzok Dec 12, 2017

Generate static callbacks #208

Generate static callbacks #208

Conversation

Therzok commented Jun 17, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017 • edited Loading

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 9, 2017

Therzok commented Dec 11, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Therzok commented Dec 12, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Therzok Dec 12, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alanmcgovern Dec 12, 2017 • edited Loading

Choose a reason for hiding this comment

alanmcgovern Dec 12, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Therzok commented Dec 9, 2017 •

edited

Loading

Therzok Dec 12, 2017 •

edited

Loading

alanmcgovern Dec 12, 2017 •

edited

Loading

alanmcgovern Dec 12, 2017 •

edited

Loading