Install libuv in travis

Author: lolgab

.travis.yml

@@ -1,5 +1,5 @@
 os: linux
-dist: xenial
+dist: bionic
 language: scala
 branches:
   only:
@@ -10,8 +10,12 @@ jdk:
   - openjdk8
 before_cache:
   - find $HOME/.sbt -name "*.lock" -print -delete
-compiler: clang
-script: sbt test
+before_install:
+  # Install libuv
+  - sudo apt-get update
+  - sudo apt-get install -y libuv1-dev
+script:
+  - sbt test
 cache:
   directories:
     - $HOME/.sbt

core/src/main/scala/scala/scalanative/loop/Eventloop.scala

@@ -78,8 +78,6 @@ object LibUV {
   def uv_loop_close(loop: Loop): CInt                             = extern
   def uv_is_active(handle: Ptr[Byte]): Int                        = extern
   def uv_handle_size(h_type: Int): CSize                          = extern
-  def uv_handle_get_data(handle: Ptr[Byte]): Long                 = extern
-  def uv_handle_set_data(handle: Ptr[Byte], data: Long): Unit     = extern
   def uv_req_size(r_type: Int): CSize                             = extern
   def uv_prepare_init(loop: Loop, handle: PrepareHandle): Int     = extern
   def uv_prepare_start(handle: PrepareHandle, cb: PrepareCB): Int = extern

core/src/main/scala/scala/scalanative/loop/internals/HandleUtils.scala

@@ -1,26 +1,30 @@
 package scala.scalanative.loop
 package internals
 
+import scala.scalanative.runtime._
 import scala.scalanative.runtime.Intrinsics._
 import scala.scalanative.unsafe.Ptr
 import scala.scalanative.libc.stdlib
 import scala.collection.mutable
 import LibUV._
 
 private[loop] object HandleUtils {
-  private val references = mutable.Map.empty[Long, Int]
+  private val references = mutable.Map.empty[Object, Int]
 
   @inline def getData[T <: Object](handle: Ptr[Byte]): T = {
-    val data   = LibUV.uv_handle_get_data(handle)
-    val rawptr = castLongToRawPtr(data)
+    // data is the first member of uv_loop_t
+    val ptrOfPtr = handle.asInstanceOf[Ptr[Ptr[Byte]]]
+    val rawptr = toRawPtr(!ptrOfPtr)
     castRawPtrToObject(rawptr).asInstanceOf[T]
   }
-  @inline def setData[T <: Object](handle: Ptr[Byte], function: T): Unit = {
-    val rawptr = castObjectToRawPtr(function)
-    val data   = castRawPtrToLong(rawptr)
-    if (references.contains(data)) references(data) += 1
-    else references(data) = 1
-    LibUV.uv_handle_set_data(handle, data)
+  @inline def setData(handle: Ptr[Byte], obj: Object): Unit = {
+    if (references.contains(obj)) references(obj) += 1
+    else references(obj) = 1
+  
+    // data is the first member of uv_loop_t
+    val ptrOfPtr = handle.asInstanceOf[Ptr[Ptr[Byte]]]
+    val rawptr = castObjectToRawPtr(obj)
+    !ptrOfPtr = fromRawPtr[Byte](rawptr)
   }
   private val onCloseCB = new CloseCB {
     def apply(handle: UVHandle): Unit = {
@@ -29,7 +33,7 @@ private[loop] object HandleUtils {
   }
   @inline def close(handle: Ptr[Byte]): Unit = {
     uv_close(handle, onCloseCB)
-    val data    = LibUV.uv_handle_get_data(handle)
+    val data    = getData[Object](handle)
     val current = references(data)
     if (current > 1) references(data) -= 1
     else references.remove(data)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.10
+sbt.version=1.3.13