Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
376af5ba
Commit
376af5ba
authored
Jun 17, 2014
by
Tomoyuki Sahara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re-implement TCPServer.accept. fixes #12.
parent
cb84ce30
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
4 deletions
+28
-4
mrblib/socket.rb
mrblib/socket.rb
+16
-2
src/socket.c
src/socket.c
+12
-2
No files found.
mrblib/socket.rb
View file @
376af5ba
...
@@ -224,7 +224,7 @@ end
...
@@ -224,7 +224,7 @@ end
class
TCPSocket
class
TCPSocket
def
initialize
(
host
,
service
,
local_host
=
nil
,
local_service
=
nil
)
def
initialize
(
host
,
service
,
local_host
=
nil
,
local_service
=
nil
)
if
self
.
is_a?
TCPServer
if
@init_with_fd
super
(
host
,
service
)
super
(
host
,
service
)
else
else
s
=
nil
s
=
nil
...
@@ -243,12 +243,20 @@ class TCPSocket
...
@@ -243,12 +243,20 @@ class TCPSocket
end
end
end
end
def
self
.
new_with_prelude
pre
,
*
args
o
=
self
.
_allocate
o
.
instance_eval
(
&
pre
)
o
.
initialize
(
*
args
)
o
end
#def self.gethostbyname(host)
#def self.gethostbyname(host)
end
end
class
TCPServer
class
TCPServer
def
initialize
(
host
=
nil
,
service
)
def
initialize
(
host
=
nil
,
service
)
ai
=
Addrinfo
.
getaddrinfo
(
host
,
service
,
nil
,
nil
,
nil
,
Socket
::
AI_PASSIVE
)[
0
]
ai
=
Addrinfo
.
getaddrinfo
(
host
,
service
,
nil
,
nil
,
nil
,
Socket
::
AI_PASSIVE
)[
0
]
@init_with_fd
=
true
super
(
Socket
.
_socket
(
ai
.
afamily
,
Socket
::
SOCK_STREAM
,
0
),
"r+"
)
super
(
Socket
.
_socket
(
ai
.
afamily
,
Socket
::
SOCK_STREAM
,
0
),
"r+"
)
Socket
.
_bind
(
self
.
fileno
,
ai
.
to_sockaddr
)
Socket
.
_bind
(
self
.
fileno
,
ai
.
to_sockaddr
)
listen
(
5
)
listen
(
5
)
...
@@ -256,7 +264,13 @@ class TCPServer
...
@@ -256,7 +264,13 @@ class TCPServer
end
end
def
accept
def
accept
TCPSocket
.
for_fd
(
self
.
sysaccept
)
fd
=
self
.
sysaccept
begin
TCPSocket
.
new_with_prelude
(
proc
{
@init_with_fd
=
true
},
fd
,
"r+"
)
rescue
IO
.
_sysclose
(
fd
)
rescue
nil
raise
end
end
end
def
accept_nonblock
def
accept_nonblock
...
...
src/socket.c
View file @
376af5ba
...
@@ -599,6 +599,17 @@ mrb_socket_socket(mrb_state *mrb, mrb_value klass)
...
@@ -599,6 +599,17 @@ mrb_socket_socket(mrb_state *mrb, mrb_value klass)
return
mrb_fixnum_value
(
s
);
return
mrb_fixnum_value
(
s
);
}
}
static
mrb_value
mrb_tcpsocket_allocate
(
mrb_state
*
mrb
,
mrb_value
klass
)
{
struct
RClass
*
c
=
mrb_class_ptr
(
klass
);
enum
mrb_vtype
ttype
=
MRB_INSTANCE_TT
(
c
);
/* copied from mrb_instance_alloc() */
if
(
ttype
==
0
)
ttype
=
MRB_TT_OBJECT
;
return
mrb_obj_value
((
struct
RObject
*
)
mrb_obj_alloc
(
mrb
,
ttype
,
c
));
}
void
void
mrb_mruby_socket_gem_init
(
mrb_state
*
mrb
)
mrb_mruby_socket_gem_init
(
mrb_state
*
mrb
)
{
{
...
@@ -634,8 +645,7 @@ mrb_mruby_socket_gem_init(mrb_state* mrb)
...
@@ -634,8 +645,7 @@ mrb_mruby_socket_gem_init(mrb_state* mrb)
mrb_define_method
(
mrb
,
ipsock
,
"recvfrom"
,
mrb_ipsocket_recvfrom
,
MRB_ARGS_REQ
(
1
)
|
MRB_ARGS_OPT
(
1
));
mrb_define_method
(
mrb
,
ipsock
,
"recvfrom"
,
mrb_ipsocket_recvfrom
,
MRB_ARGS_REQ
(
1
)
|
MRB_ARGS_OPT
(
1
));
tcpsock
=
mrb_define_class
(
mrb
,
"TCPSocket"
,
ipsock
);
tcpsock
=
mrb_define_class
(
mrb
,
"TCPSocket"
,
ipsock
);
//mrb_define_class_method(mrb, tcpsock, "open", mrb_tcpsocket_open, MRB_ARGS_REQ(2)|MRB_ARGS_OPT(2));
mrb_define_class_method
(
mrb
,
tcpsock
,
"_allocate"
,
mrb_tcpsocket_allocate
,
MRB_ARGS_NONE
());
//mrb_define_class_method(mrb, tcpsock, "new", mrb_tcpsocket_open, MRB_ARGS_REQ(2)|MRB_ARGS_OPT(2));
mrb_define_class
(
mrb
,
"TCPServer"
,
tcpsock
);
mrb_define_class
(
mrb
,
"TCPServer"
,
tcpsock
);
udpsock
=
mrb_define_class
(
mrb
,
"UDPSocket"
,
ipsock
);
udpsock
=
mrb_define_class
(
mrb
,
"UDPSocket"
,
ipsock
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment