eventmachine 1.2.2-java → 1.2.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda1851dda6b43b1cdab3099c9027cbf44ebc3c4
-  data.tar.gz: 836c4e645e1a05ba2f3c0dc1cb2c6c2013208559
+  metadata.gz: 0d34f043edad6064ae6a30793513c5b36468f2ad
+  data.tar.gz: a942ce325fbc4a0f9e8e3a1bd729a53fe4eba37a
 SHA512:
-  metadata.gz: 3605cfbee0486eb0d38647ff0def7c015eef30ef10cf1127df340d280c50d395160b1c28972ee3a4abdb61f22507614a8eb68d568620edac4a7c8036bebff916
-  data.tar.gz: eb103b538060cc26095c74a284b1b07465b5544a738aeda3f78acf046c016deda7fe62f959f617401c4ff3e7f1d227d3205900d867b3ac7abe5ffe60d5a4838a
+  metadata.gz: c672d86005b527c946d82656d3dc7291fd8540d53acf944535fb03aa7ac468f96ccdb9537e81aa08137e3821394333a6db0fd87a984ea9b8fcfccf2c3b3d18cb
+  data.tar.gz: c012983ac47592012d78f6782d6b5e55ce160ce914ff6e3b123a429e9faacf6d46e7fd9649fa3e06a12e5f3614d0e15445ac1ebd69898242b28f6c255c802f07

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 1.2.2 (January 23, 2016)
+## 1.2.3 (February 22, 2017)
+* Pure Ruby: Add get_sockname [#308, #772]
+* Fix segfault when an Exception is raised from unbind callback [#765, #766]
+* Allow destructors to throw when compiling in >= C++11 [#767]
+
+## 1.2.2 (January 23, 2017)
 * Java: Fix Fixnum deprecated warning in Ruby 2.4+ [#759]
 * Fix uncaught C++ exception in file watcher and raise InvalidSignature [#512, #757]
 * Fix connection count off-by-one for epoll and kqueue [#750]

data/ext/binder.cpp

@@ -116,7 +116,7 @@ Bindable_t::Bindable_t()
 Bindable_t::~Bindable_t
 ***********************/
 
-Bindable_t::~Bindable_t()
+Bindable_t::~Bindable_t() NO_EXCEPT_FALSE
 {
 	BindingBag.erase (Binding);
 }

data/ext/binder.h

@@ -21,6 +21,12 @@ See the file COPYING for complete licensing information.
 #define __ObjectBindings__H_
 
 
+#if __cplusplus >= 201103L
+#define NO_EXCEPT_FALSE noexcept(false)
+#else
+#define NO_EXCEPT_FALSE
+#endif
+
 class Bindable_t
 {
 	public:
@@ -30,7 +36,7 @@ class Bindable_t
 
 	public:
 		Bindable_t();
-		virtual ~Bindable_t();
+		virtual ~Bindable_t() NO_EXCEPT_FALSE;
 
 		const uintptr_t GetBinding() {return Binding;}
 

data/ext/ed.cpp

@@ -126,7 +126,7 @@ EventableDescriptor::EventableDescriptor (SOCKET sd, EventMachine_t *em):
 EventableDescriptor::~EventableDescriptor
 *****************************************/
 
-EventableDescriptor::~EventableDescriptor()
+EventableDescriptor::~EventableDescriptor() NO_EXCEPT_FALSE
 {
 	if (NextHeartbeat)
 		MyEventMachine->ClearHeartbeat(NextHeartbeat, this);

data/ext/ed.h

@@ -37,7 +37,7 @@ class EventableDescriptor: public Bindable_t
 {
 	public:
 		EventableDescriptor (SOCKET, EventMachine_t*);
-		virtual ~EventableDescriptor();
+		virtual ~EventableDescriptor() NO_EXCEPT_FALSE;
 
 		SOCKET GetSocket() {return MySocket;}
 		void SetSocketInvalid() { MySocket = INVALID_SOCKET; }
@@ -365,7 +365,7 @@ class PipeDescriptor: public EventableDescriptor
 {
 	public:
 		PipeDescriptor (SOCKET, pid_t, EventMachine_t*);
-		virtual ~PipeDescriptor();
+		virtual ~PipeDescriptor() NO_EXCEPT_FALSE;
 
 		virtual void Read();
 		virtual void Write();

data/ext/em.cpp

@@ -164,6 +164,8 @@ EventMachine_t::~EventMachine_t()
 {
 	// Run down descriptors
 	size_t i;
+	for (i = 0; i < DescriptorsToDelete.size(); i++)
+ 		delete DescriptorsToDelete[i];
 	for (i = 0; i < NewDescriptors.size(); i++)
 		delete NewDescriptors[i];
 	for (i = 0; i < Descriptors.size(); i++)
@@ -840,6 +842,17 @@ void EventMachine_t::_CleanupSockets()
 		EventableDescriptor *ed = Descriptors[i];
 		assert (ed);
 		if (ed->ShouldDelete()) {
+			DescriptorsToDelete.push_back(ed);
+		}
+		else
+			Descriptors [j++] = ed;
+	}
+	while ((size_t)j < Descriptors.size())
+		Descriptors.pop_back();
+
+	nSockets = DescriptorsToDelete.size();
+	for (i=0; i < nSockets; i++) {
+		EventableDescriptor *ed = DescriptorsToDelete[i];
 		#ifdef HAVE_EPOLL
 			if (Poller == Poller_Epoll) {
 				assert (epfd != -1);
@@ -855,13 +868,9 @@ void EventMachine_t::_CleanupSockets()
 				ModifiedDescriptors.erase(ed);
 			}
 		#endif
-			delete ed;
-		}
-		else
-			Descriptors [j++] = ed;
+		delete ed;
 	}
-	while ((size_t)j < Descriptors.size())
-		Descriptors.pop_back();
+	DescriptorsToDelete.clear();
 }
 
 /*********************************

data/ext/em.h

@@ -242,6 +242,7 @@ class EventMachine_t
 		map<int, Bindable_t*> Pids;
 		vector<EventableDescriptor*> Descriptors;
 		vector<EventableDescriptor*> NewDescriptors;
+		vector<EventableDescriptor*> DescriptorsToDelete;
 		set<EventableDescriptor*> ModifiedDescriptors;
 
 		SOCKET LoopBreakerReader;

data/ext/extconf.rb

@@ -70,7 +70,7 @@ def pkg_config_wrapper(pretty_name, name)
 end
 
 if ENV['CROSS_COMPILING']
-  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.2j")
+  openssl_version = ENV.fetch("OPENSSL_VERSION", "1.0.2e")
   openssl_dir = File.expand_path("~/.rake-compiler/builds/openssl-#{openssl_version}/")
   if File.exist?(openssl_dir)
     FileUtils.mkdir_p Dir.pwd+"/openssl/"

data/ext/pipe.cpp

@@ -46,7 +46,7 @@ PipeDescriptor::PipeDescriptor (int fd, pid_t subpid, EventMachine_t *parent_em)
 PipeDescriptor::~PipeDescriptor
 *******************************/
 
-PipeDescriptor::~PipeDescriptor()
+PipeDescriptor::~PipeDescriptor() NO_EXCEPT_FALSE
 {
 	// Run down any stranded outbound data.
 	for (size_t i=0; i < OutboundPages.size(); i++)

data/lib/em/pure_ruby.rb

@@ -214,6 +214,12 @@ module EventMachine
       selectable.get_peername
     end
 
+    # @private
+    def get_sockname sig
+      selectable = Reactor.instance.get_selectable( sig ) or raise "unknown get_sockname target"
+      selectable.get_sockname
+    end
+
     # @private
     def open_udp_socket host, port
       EvmaUDPSocket.create(host, port).uuid
@@ -657,6 +663,7 @@ class IO
   def_delegator :@my_selectable, :send_data
   def_delegator :@my_selectable, :schedule_close
   def_delegator :@my_selectable, :get_peername
+  def_delegator :@my_selectable, :get_sockname
   def_delegator :@my_selectable, :send_datagram
   def_delegator :@my_selectable, :get_outbound_data_size
   def_delegator :@my_selectable, :set_inactivity_timeout
@@ -716,6 +723,10 @@ module EventMachine
       nil
     end
 
+    def get_sockname
+      nil
+    end
+
     def set_inactivity_timeout tm
       @inactivity_timeout = tm
     end
@@ -847,6 +858,14 @@ module EventMachine
       io.getpeername
     end
 
+    # #get_sockname
+    # This is defined in the normal way on connected stream objects.
+    # Return an object that is suitable for passing to Socket#unpack_sockaddr_in or variants.
+    # We could also use a convenience method that did the unpacking automatically.
+    def get_sockname
+      io.getsockname
+    end
+
     # #get_outbound_data_size
     def get_outbound_data_size
       @outbound_q.inject(0) {|memo,obj| memo += (obj || "").length}

data/lib/em/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/tests/test_exc.rb

@@ -1,6 +1,13 @@
 require 'em_test_helper'
 
 class TestSomeExceptions < Test::Unit::TestCase
+  class DoomedConnectionError < StandardError
+  end
+  class DoomedConnection < EventMachine::Connection
+    def unbind
+      raise DoomedConnectionError
+    end
+  end
 
   # Read the commentary in EM#run.
   # This test exercises the ensure block in #run that makes sure
@@ -25,4 +32,12 @@ class TestSomeExceptions < Test::Unit::TestCase
     }
   end
 
+  def test_exception_on_unbind
+    assert_raises(DoomedConnectionError) {
+      EM.run {
+      EM.connect("localhost", 8888, DoomedConnection)
+    }
+    }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement