Changeset 433

Timestamp:

07/17/07 12:54:08 (1 year ago)

Author:

blackhedd

Message:

implemented EventMachine#stop_server

Files:

• version_0/ext/cmain.cpp (modified) (1 diff)
• version_0/ext/ed.cpp (modified) (1 diff)
• version_0/ext/ed.h (modified) (1 diff)
• version_0/ext/eventmachine.h (modified) (1 diff)
• version_0/ext/rubymain.cpp (modified) (2 diffs)
• version_0/lib/eventmachine.rb (modified) (1 diff)
• version_0/Rakefile (modified) (1 diff)
• version_0/tests/test_servers.rb (added)

version_0/ext/cmain.cpp

@@ -169 +169 @@
-                throw std::runtime_error ("not initialized");
-        ConnectionDescriptor::CloseConnection (binding, (after_writing ? true : false));
+}
+
+/********************
+evma_stop_tcp_server
+********************/
+
+extern "C" void evma_stop_tcp_server (const char *binding)
+{
+        if (!EventMachine)
+                throw std::runtime_error ("not initialized");
+        AcceptorDescriptor::StopAcceptor (binding);
-}
-

version_0/ext/ed.cpp

@@ -778 +778 @@
-}
-
+/****************************************
+STATIC: AcceptorDescriptor::StopAcceptor
+****************************************/
+
+void AcceptorDescriptor::StopAcceptor (const char *binding)
+{
+        // TODO: This is something of a hack, or at least it's a static method of the wrong class.
+        AcceptorDescriptor *ad = dynamic_cast <AcceptorDescriptor*> (Bindable_t::GetObject (binding));
+        if (ad)
+                ad->ScheduleClose (false);
+        else
+                throw std::runtime_error ("failed to close nonexistent acceptor");
+}
+
-
-/************************

version_0/ext/ed.h

@@ -256 +256 @@
-                virtual bool SelectForRead() {return true;}
-                virtual bool SelectForWrite() {return false;}
+
+                static void StopAcceptor (const char *binding);
-};
-

version_0/ext/eventmachine.h

@@ -40 +40 @@
-        const char *evma_connect_to_server (const char *server, int port);
-        const char *evma_connect_to_unix_server (const char *server);
+        void evma_stop_tcp_server (const char *signature);
-        const char *evma_create_tcp_server (const char *address, int port);
-        const char *evma_create_unix_domain_server (const char *filename);

version_0/ext/rubymain.cpp

@@ -91 +91 @@
-                rb_raise (rb_eRuntimeError, "no acceptor");
-        return rb_str_new2 (f);
+}
+
+/*************
+t_stop_server
+*************/
+
+static VALUE t_stop_server (VALUE self, VALUE signature)
+{
+        evma_stop_tcp_server (StringValuePtr (signature));
+        return Qnil;
-}
-
@@ -421 +431 @@
-        rb_define_module_function (EmModule, "add_oneshot_timer", (VALUE(*)(...))t_add_oneshot_timer, 1);
-        rb_define_module_function (EmModule, "start_tcp_server", (VALUE(*)(...))t_start_server, 2);
+        rb_define_module_function (EmModule, "stop_tcp_server", (VALUE(*)(...))t_stop_server, 1);
-        rb_define_module_function (EmModule, "start_unix_server", (VALUE(*)(...))t_start_unix_server, 1);
-        rb_define_module_function (EmModule, "start_tls", (VALUE(*)(...))t_start_tls, 1);

version_0/lib/eventmachine.rb

@@ -475 +475 @@
-    s = start_tcp_server server, port
-    @acceptors[s] = [klass,block]
+    s
-  end
-
+
+  # Stop a TCP server socket that was started with EventMachine#start_server.
+  #--
+  # Requested by Kirk Haines. TODO, this isn't OOP enough. We ought somehow
+  # to have #start_server return an object that has a close or a stop method on it.
+  #
+  def EventMachine::stop_server signature
+          EventMachine::stop_tcp_server signature
+  end
-
-  def EventMachine::start_unix_domain_server filename, handler=nil, &block

version_0/Rakefile

@@ -263 +263 @@
-end
-
+desc "Test Servers"
+task :test_servers do |t|
+  run_tests t, :extension, "test_servers*.rb"
+end
+
-
-desc "Build everything"