Skip to content

Correct type TCPSocket for Julia 0.3.8 compatibility #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skovsgaard wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Correct type TCPSocket for Julia 0.3.8 compatibility #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f43523
Changed type TCPSocket to Base.TcpSocket due to bug in 0.3.8
skovsgaard May 30, 2015
f78cfa2
Removed breaking type declaration in form_request
skovsgaard May 31, 2015
7c0e224
Added ##Usage to README.md
skovsgaard May 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,16 @@ FsServer
========

TCP based Erlang binary term server for Julia.

## Usage

Run

make

then

```julia

>FsServer.serve(2004) #2004 is the default port for the fs_client Erlang module.
```
14 changes: 7 additions & 7 deletions src/gen_server.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,40 +11,40 @@ export noreply, noreply_close
# Generic Server Functions
#------------------------------------------------------------------------------

function reply (s::TCPSocket, x::Any)
function reply (s::Base.TcpSocket, x::Any)
term, nbytes = encode_message((:reply, x))
nbytes_written = write_erlang_term(s, term)
nbytes_written
end

function reply_stream (s::TCPSocket, bytes::Array{Uint8})
function reply_stream (s::Base.TcpSocket, bytes::Array{Uint8})
term, nbytes = encode_message((:reply, length(bytes)))
write_erlang_term(s, term)
bin, nbytes = encode_message(bytes)
write_binary_stream(s, bin)
end

function reply_stream_close (s::TCPSocket, bytes::Array{Uint8})
function reply_stream_close (s::Base.TcpSocket, bytes::Array{Uint8})
reply_stream(s, bytes)
close(s)
end

function reply_close (s::TCPSocket, x::Any)
function reply_close (s::Base.TcpSocket, x::Any)
reply(s, x)
close(s)
end

function reply_info (s::TCPSocket, command::Symbol, options)
function reply_info (s::Base.TcpSocket, command::Symbol, options)
term, nbytes = encode_message((:info, command, options))
write_erlang_term(s, term)
end

function noreply (s::TCPSocket)
function noreply (s::Base.TcpSocket)
term, nbytes = encode_message(tuple(:noreply))
write_erlang_term(s, term)
end

function noreply_close (s::TCPSocket)
function noreply_close (s::Base.TcpSocket)
noreply(s)
close(s)
end
Expand Down
18 changes: 9 additions & 9 deletions src/request.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export handle_request
# Base Request Handler
#------------------------------------------------------------------------------

function handle_request (s::TCPSocket)
function handle_request (s::Base.TcpSocket)
r = nothing

while isopen(s)
Expand All @@ -24,38 +24,38 @@ end
# Generic Request Handlers
#------------------------------------------------------------------------------

function handle_request (s::TCPSocket, r::CallRequest)
function handle_request (s::Base.TcpSocket, r::CallRequest)
x::Any = r.fun((r.args)...)
info("[request] Applied $(r.fun) to $(r.args)")
handle_response(s, x)
end

function handle_request (s::TCPSocket, r::CastRequest)
function handle_request (s::Base.TcpSocket, r::CastRequest)
info("[request] CastRequest received")
noreply(s)
x::Any = r.fun((r.args)...)
x
end

function handle_request (s::TCPSocket, r::InfoRequest)
function handle_request (s::Base.TcpSocket, r::InfoRequest)
info("[request] InfoRequest received")
noreply(s)
end

function handle_request (s::TCPSocket, r::ErrorRequest)
function handle_request (s::Base.TcpSocket, r::ErrorRequest)
info("[request] ErrorRequest received")
noreply_close(s)
error("Error request $r signaled")
end

function handle_request (s::TCPSocket, r::StreamingCallRequest)
function handle_request (s::Base.TcpSocket, r::StreamingCallRequest)
info("[request] StreamingCallRequest received")
bytes::Array{Uint8} = read_binary_stream(s)
x::Any = r.fun((r.args)..., bytes)
handle_response(s, x)
end

function handle_request (s::TCPSocket, r::CallbackCastRequest)
function handle_request (s::Base.TcpSocket, r::CallbackCastRequest)
info("[request] CallbackCastRequest received")
noreply(s)
x::Any = r.fun((r.args)...)
Expand All @@ -67,7 +67,7 @@ end
# Request Formation Functions
#------------------------------------------------------------------------------

function form_request (s::TCPSocket, r::Union(Request,Void))
function form_request (s::Base.TcpSocket, r)#::Union(Request,Void))
if r == nothing
next_request(s)
else
Expand All @@ -76,7 +76,7 @@ function form_request (s::TCPSocket, r::Union(Request,Void))
end
end

function next_request (s::TCPSocket)
function next_request (s::Base.TcpSocket)
info("[request] Reading next request")
bytes = read_erlang_term(s)
info("[request] Read erlang term $bytes")
Expand Down
4 changes: 2 additions & 2 deletions src/response.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export handle_response
# Response Handlers
#------------------------------------------------------------------------------

function handle_response (s::TCPSocket, x::Any)
function handle_response (s::Base.TcpSocket, x::Any)
info("[response] Response $x")
reply_close(s, x)
end
Expand All @@ -19,7 +19,7 @@ be streamed out. It is assumed that each byte array is one 'chunk' terminated
by a 4 byte 0 header. This should change soon.
=#

function handle_response (s::TCPSocket, bytes::Array{Uint8})
function handle_response (s::Base.TcpSocket, bytes::Array{Uint8})
info("[response] Forming streaming response")
reply_info(s, :stream, [])
reply_stream_close(s, bytes)
Expand Down
8 changes: 4 additions & 4 deletions src/socket_io.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export write_erlang_term, write_binary_stream
# Byte Reading Functions
#------------------------------------------------------------------------------

function read_erlang_term (s::TCPSocket)
function read_erlang_term (s::Base.TcpSocket)
bytes = Array(Uint8, 0)
length_header = readbytes(s, 4)
nbytes = decode_integer(length_header)
Expand All @@ -22,7 +22,7 @@ function read_erlang_term (s::TCPSocket)
vcat(length_header, bytes)
end

function read_binary_stream (s::TCPSocket)
function read_binary_stream (s::Base.TcpSocket)
bytes = Array(Uint8, 0)
length_header = readbytes(s, 4)
nbytes = decode_integer(length_header)
Expand All @@ -45,7 +45,7 @@ end
# Byte Writing Functions
#------------------------------------------------------------------------------

function write_erlang_term (s::TCPSocket, bytes::Array{Uint8})
function write_erlang_term (s::Base.TcpSocket, bytes::Array{Uint8})
nbytes = length(bytes)
nbytes_written = 0
nbytes_written_total = 0
Expand All @@ -58,7 +58,7 @@ function write_erlang_term (s::TCPSocket, bytes::Array{Uint8})
nbytes_written_total
end

function write_binary_stream (s::TCPSocket, bytes::Array{Uint8})
function write_binary_stream (s::Base.TcpSocket, bytes::Array{Uint8})
length_header = encode_integer(uint32(length(bytes)))
bytes = vcat(length_header, bytes)
bytes = vcat(bytes, uint8([0,0,0,0]))
Expand Down