Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
split out classes for IPConnection, TCPConnection, UDPConnection
Browse files Browse the repository at this point in the history
  • Loading branch information
@jakedouglas
jakedouglas committed Sep 10, 2009
1 parent ef9bf31 commit 3da8dad
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 31 deletions.
45 changes: 26 additions & 19 deletions ext/rubymain.cpp
View file
Expand Up @@ -18,8 +18,11 @@

static VALUE EmModule;
static VALUE EmConnection;
static VALUE EmIPConnection;
static VALUE EmTCPConnection;
static VALUE EmUDPConnection;
static VALUE EmReactor;
static VALUE EmAcceptor;
static VALUE EmTCPServer;

static VALUE rb_cSocket;

Expand Down Expand Up @@ -177,21 +180,21 @@ EventableDescriptor* ensure_connection(VALUE conn, const char *msg)
return ed;
}

static VALUE build_handler(VALUE handler)
static VALUE build_handler(VALUE handler, VALUE baseklass)
{
if (RTEST(handler)) {
if (rb_obj_is_kind_of(handler, rb_cClass) == Qtrue) {
if (!rb_class_inherited_p(handler, EmConnection))
rb_raise(rb_eArgError, "must provide module or subclass of EventMachine::Connection");
if (!rb_class_inherited_p(handler, baseklass))
rb_raise(rb_eArgError, "must provide module or subclass of EventMachine::%s", rb_class2name(baseklass));
return handler;
}
else {
VALUE anon_klass = rb_funcall(rb_cClass, Intern_new, 1, EmConnection);
VALUE anon_klass = rb_funcall(rb_cClass, Intern_new, 1, baseklass);
rb_include_module(anon_klass, handler);
return anon_klass;
}
}
return EmConnection;
return baseklass;
}

static VALUE reactor_release(VALUE reactor)
Expand Down Expand Up @@ -294,7 +297,7 @@ static VALUE reactor_connect_tcp(int argc, VALUE *argv, VALUE reactor)

// This stuff should be moved into another function for generic handler instantiation
if (cd) {
VALUE real_handler = build_handler(handler);
VALUE real_handler = build_handler(handler, EmTCPConnection);
VALUE cdobj = Data_Wrap_Struct(real_handler, NULL, NULL, cd);
rb_ivar_set(cdobj, Intern_reactor, cd->GetReactor()->GetBinding());

Expand Down Expand Up @@ -326,9 +329,9 @@ static VALUE reactor_start_tcp_server(int argc, VALUE *argv, VALUE reactor)
AcceptorDescriptor *ad = em->CreateTcpServer(RSTRING_PTR(server), FIX2INT(port));
if (!ad)
rb_sys_fail("start_server failed");
ad->SetHandler(build_handler(handler));
ad->SetHandler(build_handler(handler, EmTCPConnection));
ad->SetHandlerArgv(extra);
VALUE adobj = Data_Wrap_Struct(EmConnection, evma_acceptor_mark, NULL, ad);
VALUE adobj = Data_Wrap_Struct(EmTCPServer, evma_acceptor_mark, NULL, ad);
rb_ivar_set(adobj, Intern_reactor, ad->GetReactor()->GetBinding());
ad->SetBinding(adobj);
return adobj;
Expand Down Expand Up @@ -395,14 +398,6 @@ static VALUE conn_get_sockname(VALUE conn)

extern "C" void Init_rubyeventmachine()
{
rb_require("socket");
rb_cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));

EmModule = rb_define_module ("EventMachine");
EmConnection = rb_define_class_under (EmModule, "Connection", rb_cObject);
EmReactor = rb_define_class_under (EmModule, "Reactor", rb_cObject);
EmAcceptor = rb_define_class_under (EmModule, "Acceptor", rb_cObject);

Intern_run_deferred_callbacks = rb_intern("run_deferred_callbacks");
Intern_at_timers = rb_intern("@timers");
Intern_reactor = rb_intern("@reactor");
Expand All @@ -420,6 +415,17 @@ extern "C" void Init_rubyeventmachine()
Intern_new = rb_intern("new");
Intern_unpack_sockaddr_in = rb_intern("unpack_sockaddr_in");

rb_require("socket");
rb_cSocket = rb_const_get(rb_cObject, rb_intern("Socket"));

EmModule = rb_define_module ("EventMachine");
EmReactor = rb_define_class_under (EmModule, "Reactor", rb_cObject);
EmTCPServer = rb_define_class_under (EmModule, "TCPServer", rb_cObject);
EmConnection = rb_define_class_under (EmModule, "Connection", rb_cObject);
EmIPConnection = rb_define_class_under (EmModule, "IPConnection", EmConnection);
EmTCPConnection = rb_define_class_under (EmModule, "TCPConnection", EmIPConnection);
EmUDPConnection = rb_define_class_under (EmModule, "UDPConnection", EmIPConnection);

rb_define_alloc_func(EmReactor, reactor_alloc);

rb_define_method(EmReactor, "signal_loopbreak", (VALUE(*)(...))reactor_signal_loopbreak, 0);
Expand All @@ -434,6 +440,7 @@ extern "C" void Init_rubyeventmachine()
rb_define_method(EmConnection, "close_connection", (VALUE(*)(...))conn_close_connection, -1);
rb_define_method(EmConnection, "proxy_incoming_to", (VALUE(*)(...))conn_proxy_incoming_to, 1);
rb_define_method(EmConnection, "stop_proxy", (VALUE(*)(...))conn_stop_proxy, 0);
rb_define_method(EmConnection, "get_peername", (VALUE(*)(...))conn_get_peername, 0);
rb_define_method(EmConnection, "get_sockname", (VALUE(*)(...))conn_get_sockname, 0);

rb_define_method(EmIPConnection, "get_peername", (VALUE(*)(...))conn_get_peername, 0);
rb_define_method(EmIPConnection, "get_sockname", (VALUE(*)(...))conn_get_sockname, 0);
}
36 changes: 24 additions & 12 deletions newtest/tests/tcp.rb
View file
Expand Up @@ -23,7 +23,8 @@ def connection_completed

reactor = EM::Reactor.new
reactor.run {
reactor.connect("google.com", 80, handler)
c = reactor.connect("google.com", 80, handler)
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:connection_completed].should == true
reactor.release
Expand All @@ -40,7 +41,8 @@ def initialize(arg1, arg2)

reactor = EM::Reactor.new
reactor.run {
reactor.connect("google.com", 80, handler, "TEST ARG", "OTHER TEST ARG 2")
c = reactor.connect("google.com", 80, handler, "TEST ARG", "OTHER TEST ARG 2")
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:arg1].should == "TEST ARG"
$test[:arg2].should == "OTHER TEST ARG 2"
Expand All @@ -60,7 +62,8 @@ def receive_data(data)

reactor = EM::Reactor.new
reactor.run {
reactor.connect("google.com", 80, handler)
c = reactor.connect("google.com", 80, handler)
c.class.ancestors.include?(EM::TCPConnection)
}
$test[:data].should.be.kind_of(String)
$test[:data].should.not.be.empty
Expand All @@ -83,7 +86,8 @@ def unbind

reactor = EM::Reactor.new
reactor.run {
reactor.connect("google.com", 80, handler)
c = reactor.connect("google.com", 80, handler)
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:unbound].should == true
reactor.release
Expand Down Expand Up @@ -112,8 +116,10 @@ def unbind

reactor = EM::Reactor.new
reactor.run {
reactor.start_server("127.0.0.1", 9999, server)
reactor.connect("127.0.0.1", 9999, client)
s = reactor.start_server("127.0.0.1", 9999, server)
c = reactor.connect("127.0.0.1", 9999, client)
s.class.should == EM::TCPServer
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:server_data].should == "testingdata123"
$test[:client_data].should == "moretestingdata321"
Expand All @@ -132,8 +138,10 @@ def initialize(arg1, arg2, arg3, arg4)
end
reactor = EM::Reactor.new
reactor.run {
reactor.start_server("127.0.0.1", 9999, server, "foo", "bar", "baz", "eggology")
reactor.connect("127.0.0.1", 9999)
s = reactor.start_server("127.0.0.1", 9999, server, "foo", "bar", "baz", "eggology")
c = reactor.connect("127.0.0.1", 9999)
s.class.should == EM::TCPServer
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:arg1].should == "foo"
$test[:arg2].should == "bar"
Expand All @@ -158,8 +166,10 @@ def connection_completed
end
reactor = EM::Reactor.new
reactor.run {
reactor.start_server("127.0.0.1", 12345, server)
reactor.connect("127.0.0.1", 12345, client)
s = reactor.start_server("127.0.0.1", 12345, server)
c = reactor.connect("127.0.0.1", 12345, client)
s.class.should == EM::TCPServer
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:server][0].should == "127.0.0.1"
$test[:server][1].kind_of?(Integer).should == true
Expand All @@ -183,8 +193,10 @@ def connection_completed
end
reactor = EM::Reactor.new
reactor.run {
reactor.start_server("127.0.0.1", 12345, server)
reactor.connect("127.0.0.1", 12345, client)
s = reactor.start_server("127.0.0.1", 12345, server)
c = reactor.connect("127.0.0.1", 12345, client)
s.class.should == EM::TCPServer
c.class.ancestors.should.include?(EM::TCPConnection)
}
$test[:server].should == ["127.0.0.1", 12345]
$test[:client][0].should == "127.0.0.1"
Expand Down

0 comments on commit 3da8dad

Please sign in to comment.