fix #419

Author: pchampio

application.go

@@ -206,7 +206,6 @@ func (a *Application) Run() error {
 
 	// Attach GL callback functions onto the engine
 	a.engine.GLMakeCurrent = func() bool {
-		fmt.Println("-- GLMakeCurrent")
 		a.window.MakeContextCurrent()
 		return true
 	}
@@ -225,7 +224,6 @@ func (a *Application) Run() error {
 		if a.resourceWindow == nil {
 			return false
 		}
-		fmt.Println("-- GLMakeResourceCurrent")
 		a.resourceWindow.MakeContextCurrent()
 		return true
 	}

event-loop.go

@@ -6,7 +6,6 @@ import (
 	"math"
 	"time"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/go-flutter-desktop/go-flutter/embedder"
 	"github.com/go-flutter-desktop/go-flutter/internal/currentthread"
 	"github.com/go-flutter-desktop/go-flutter/internal/priorityqueue"
@@ -26,13 +25,12 @@ type EventLoop struct {
 	platformMessageRefreshRate time.Duration
 
 	// identifier for the current thread
-	mainThreadID int64
+	mainThreadID currentthread.ThreadID
 }
 
 func newEventLoop(postEmptyEvent func(), onExpiredTask func(*embedder.FlutterTask) embedder.Result) *EventLoop {
 	pq := priorityqueue.NewPriorityQueue()
 	heap.Init(pq)
-	fmt.Println("EventLoop Thread id: " + spew.Sdump(currentthread.ID()))
 	return &EventLoop{
 		priorityqueue:  pq,
 		postEmptyEvent: postEmptyEvent,
@@ -54,9 +52,7 @@ func newEventLoop(postEmptyEvent func(), onExpiredTask func(*embedder.FlutterTas
 // RunOnCurrentThread return true if tasks posted on the
 // calling thread will be run on that same thread.
 func (t *EventLoop) RunOnCurrentThread() bool {
-	id := currentthread.ID()
-	fmt.Println("Task Thread id: " + spew.Sdump(id))
-	return id == t.mainThreadID
+	return currentthread.Equal(currentthread.ID(), t.mainThreadID)
 }
 
 // PostTask posts a Flutter engine tasks to the event loop for delayed execution.

internal/currentthread/thread-id.go

@@ -1,4 +1,4 @@
-// Package currentthread gives you access to the underlying thread id.
+// Package currentthread gives you access to the underlying C thread id.
 package currentthread
 
 // //
@@ -8,29 +8,38 @@ package currentthread
 // /* Platform specific includes */
 // #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
 //   #include <windows.h>
-//   typedef HANDLE thrd_t;
+//   typedef DWORD thrd_t;
 // #else
 //   #include <pthread.h>
 //   typedef pthread_t thrd_t;
 // #endif
 //
+// int thrd_equal(thrd_t thr0, thrd_t thr1) {
+// #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
+//   return thr0 == thr1;
+// #else
+//   return pthread_equal(thr0, thr1);
+// #endif
+// }
+//
 // thrd_t thrd_current(void) {
 //   #if defined(_WIN32) || defined(__WIN32__) || defined(__WINDOWS__)
-//     return GetCurrentThread();
+//     return GetCurrentThreadId();
 //   #else
 //     return pthread_self();
 //   #endif
 // }
-// size_t getCurrentThreadID() { return (size_t)thrd_current(); }
 import "C"
-import (
-	"fmt"
 
-	"github.com/davecgh/go-spew/spew"
-)
+// ThreadID correspond to an opaque thread identifier
+type ThreadID C.thrd_t
 
 // ID returns the id of the current thread
-func ID() int64 {
-	fmt.Println("Real Thread id: " + spew.Sdump(C.thrd_current()))
-	return (int64)(C.getCurrentThreadID())
+func ID() ThreadID {
+	return (ThreadID)(C.thrd_current())
+}
+
+// Equal compares two thread identifiers.
+func Equal(t1, t2 ThreadID) bool {
+	return C.thrd_equal((C.thrd_t)(t1), (C.thrd_t)(t2)) != 0
 }