renet 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3737971e23b29665d821c54b1dc8a21df161a8
-  data.tar.gz: 695578b48b98cd09a6d3ba636f4e87f0485bab29
+  metadata.gz: f332d6f6ddc4ab88a3040a50807e1bab8244e2e0
+  data.tar.gz: d05c0480678a493730ac76734c72c7bc4e01dbea
 SHA512:
-  metadata.gz: d1aee7548aa76a3b622841acbc3a7107a75ce6e5f969f5c5b541f9bd09a33ee8ff97d833c51dee7de918ee18263e50dcbe381761bb69847a3746837e2093cb93
-  data.tar.gz: 7e15e9b139aad404af1d79f32f5ec240c8eeb3c0347db7363183e2b5e804212d51c054658eca38c4439acb63b2e8b70af168f7489eece6585bf145212b257b7d
+  metadata.gz: b54950e6c229e46b00ef6e87b7e41b48cd0c87011c88df24ade3d4962db1ef6aeac7bf73a931f32dacd3cff6dfcb91bffe4ec23864b3e5de08a52657911ff01c
+  data.tar.gz: 8e51547c005807b50e85bad9bf60dead316ffc68015119966a417c614e5b0b979a8856a8cee314192ce626d3afd305983d6e2a02fbde8f0f94745cb55ae5d5d9

data/ext/renet/renet_connection.c

@@ -17,6 +17,7 @@
 */
 
 #include "renet_connection.h"
+#include <ruby.h>
 
 void init_renet_connection()
 {
@@ -110,31 +111,25 @@ typedef struct
 {
   Connection * connection;
   enet_uint32 timeout;
+  int result;
 } CallbackData;
 
-static VALUE do_service(void *data)
+static void* do_service(void *data)
 {
   CallbackData* temp_data = data;
-  int result = enet_host_service(temp_data->connection->host, temp_data->connection->event, temp_data->timeout);
-  // this will do weird things with the negative numbers but we'll undo it on the other side
-  return (unsigned int)result;
+  temp_data->result = enet_host_service(temp_data->connection->host, temp_data->connection->event, temp_data->timeout);
+  return NULL;
 }
 
 static int service(VALUE self, Connection* connection, enet_uint32 timeout)
 {
-  CallbackData data = {connection, timeout};
-  VALUE result;
+  CallbackData data = {connection, timeout, -1};
   if (timeout > 0)
-  {
-    result = rb_thread_blocking_region(do_service, &data, RUBY_UBF_IO, 0);
-  }
+  { rb_thread_call_without_gvl(do_service, &data, RUBY_UBF_IO, NULL); }
   else
-  {
-    result = do_service(&data);
-  }
-  // undo our cast to VALUE in a way that will properly restore negative numbers
-  unsigned int fix_negatives = (unsigned int)result;
-  return (int)fix_negatives;
+  { do_service(&data); }
+
+  return data.result;
 }
 
 

data/ext/renet/renet_server.c

@@ -17,7 +17,7 @@
 */
 
 #include "renet_server.h"
-
+#include <ruby.h>
 
 void init_renet_server()
 {
@@ -170,31 +170,26 @@ typedef struct
 {
   Server * server;
   enet_uint32 timeout;
+  int result;
 } CallbackData;
 
-static VALUE do_service(void *data)
+static void* do_service(void *data)
 {
   CallbackData* temp_data = data;
-  int result = enet_host_service(temp_data->server->host, temp_data->server->event, temp_data->timeout);
-  // this will do weird things with the negative numbers but we'll undo it on the other side
-  return (unsigned int)result;
+  temp_data->result = enet_host_service(temp_data->server->host, temp_data->server->event, temp_data->timeout);
+  return NULL;
 }
 
 static int service(VALUE self, Server* server, enet_uint32 timeout)
 {
-  CallbackData data = {server, timeout};
-  VALUE result;
+  CallbackData data = {server, timeout, -1};
+
   if (timeout > 0)
-  {
-    result = rb_thread_blocking_region(do_service, &data, RUBY_UBF_IO, 0);
-  }
+  { rb_thread_call_without_gvl(do_service, &data, RUBY_UBF_IO, NULL); }
   else
-  {
-    result = do_service(&data);
-  }
-  // undo our cast to VALUE in a way that will properly restore negative numbers
-  unsigned int fix_negatives = (unsigned int)result;
-  return (int)fix_negatives;
+  { do_service(&data); }
+
+  return data.result;
 }
 
 VALUE renet_server_update(VALUE self, VALUE timeout)

data/ext/renet/win32.c

@@ -5,6 +5,7 @@
 #ifdef _WIN32
 
 #define ENET_BUILDING_LIB 1
+#define INCL_WINSOCK_API_TYPEDEFS 1
 #include "enet/enet.h"
 #include <windows.h>
 #include <mmsystem.h>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dahrkael & Job Vranish
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library for games networking. Uses ENet as backend
 email: dark.wolf.warrior@gmail.com