svn commit: r990973 - in /incubator/thrift/trunk/lib/erl: include/ src/

[dr...@apache.org]

Author: dreiss
Date: Mon Aug 30 22:05:20 2010
New Revision: 990973

URL: http://svn.apache.org/viewvc?rev=990973&view=rev
Log:
erlang: Add some initial specs for thrift_transport and its implementations

Added:
    incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl
Modified:
    incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
    incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl
    incubator/thrift/trunk/lib/erl/src/thrift_transport.erl

Added: incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl?rev=990973&view=auto
==============================================================================
--- incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl (added)
+++ incubator/thrift/trunk/lib/erl/include/thrift_transport_impl.hrl Mon Aug 30 22:05:20 2010
@@ -0,0 +1,31 @@
+%%
+%% Licensed to the Apache Software Foundation (ASF) under one
+%% or more contributor license agreements. See the NOTICE file
+%% distributed with this work for additional information
+%% regarding copyright ownership. The ASF licenses this file
+%% to you under the Apache License, Version 2.0 (the
+%% "License"); you may not use this file except in compliance
+%% with the License. You may obtain a copy of the License at
+%%
+%%   http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing,
+%% software distributed under the License is distributed on an
+%% "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+%% KIND, either express or implied. See the License for the
+%% specific language governing permissions and limitations
+%% under the License.
+%%
+
+%% Signature specifications for transport implementations.
+
+-ifndef(THRIFT_TRANSPORT_IMPL_INCLUDED).
+-define(THRIFT_TRANSPORT_IMPL_INCLUDED, true).
+
+-spec write(state(), iolist() | binary()) -> ok | {error, _Reason}.
+-spec read(state(), non_neg_integer()) -> {ok, binary()} | {error, _Reason}.
+-spec flush(state()) -> ok | {error, _Reason}.
+-spec close(state()) -> ok | {error, _Reason}.
+
+
+-endif.

Modified: incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_base64_transport.erl Mon Aug 30 22:05:20 2010
@@ -29,6 +29,8 @@
 
 %% State
 -record(b64_transport, {wrapped}).
+-type state() :: #b64_transport{}.
+-include("thrift_transport_impl.hrl").
 
 new(Wrapped) ->
     State = #b64_transport{wrapped = Wrapped},

Modified: incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_buffered_transport.erl Mon Aug 30 22:05:20 2010
@@ -35,6 +35,9 @@
 -record(buffered_transport, {wrapped, % a thrift_transport
                              write_buffer % iolist()
                             }).
+-type state() :: pid().
+-include("thrift_transport_impl.hrl").
+
 
 %%====================================================================
 %% API

Modified: incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_disk_log_transport.erl Mon Aug 30 22:05:20 2010
@@ -35,6 +35,8 @@
                        close_on_close = false,
                        sync_every = infinity,
                        sync_tref}).
+-type state() :: #dl_transport{}.
+-include("thrift_transport_impl.hrl").
 
 
 %% Create a transport attached to an already open log.

Modified: incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_file_transport.erl Mon Aug 30 22:05:20 2010
@@ -29,6 +29,8 @@
 -record(t_file_transport, {device,
                            should_close = true,
                            mode = write}).
+-type state() :: #t_file_transport{}.
+-include("thrift_transport_impl.hrl").
 
 %%%% CONSTRUCTION   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

Modified: incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_framed_transport.erl Mon Aug 30 22:05:20 2010
@@ -36,6 +36,8 @@
                            read_buffer, % iolist()
                            write_buffer % iolist()
                           }).
+-type state() :: pid().
+-include("thrift_transport_impl.hrl").
 
 %%====================================================================
 %% API

Modified: incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_http_transport.erl Mon Aug 30 22:05:20 2010
@@ -43,6 +43,8 @@
                          http_options, % see http(3)
                          extra_headers % [{str(), str()}, ...]
                         }).
+-type state() :: pid().
+-include("thrift_transport_impl.hrl").
 
 %%====================================================================
 %% API

Modified: incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_memory_buffer.erl Mon Aug 30 22:05:20 2010
@@ -33,6 +33,8 @@
 -export([write/2, read/2, flush/1, close/1]).
 
 -record(memory_buffer, {buffer}).
+-type state() :: #memory_buffer{}.
+-include("thrift_transport_impl.hrl").
 
 %%====================================================================
 %% API

Modified: incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_socket_transport.erl Mon Aug 30 22:05:20 2010
@@ -29,6 +29,8 @@
 
 -record(data, {socket,
                recv_timeout=infinity}).
+-type state() :: #data{}.
+-include("thrift_transport_impl.hrl").
 
 new(Socket) ->
     new(Socket, []).

Modified: incubator/thrift/trunk/lib/erl/src/thrift_transport.erl
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/erl/src/thrift_transport.erl?rev=990973&r1=990972&r2=990973&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/erl/src/thrift_transport.erl (original)
+++ incubator/thrift/trunk/lib/erl/src/thrift_transport.erl Mon Aug 30 22:05:20 2010
@@ -41,17 +41,20 @@ new(Module, Data) when is_atom(Module) -
     {ok, #transport{module = Module,
                     data = Data}}.
 
-%% Data :: iolist()
+-spec write(#transport{}, iolist() | binary()) -> ok | {error, _Reason}.
 write(Transport, Data) ->
     Module = Transport#transport.module,
     Module:write(Transport#transport.data, Data).
 
+-spec read(#transport{}, non_neg_integer()) -> {ok, binary()} | {error, _Reason}.
 read(Transport, Len) when is_integer(Len) ->
     Module = Transport#transport.module,
     Module:read(Transport#transport.data, Len).
 
+-spec flush(#transport{}) -> ok | {error, _Reason}.
 flush(#transport{module = Module, data = Data}) ->
     Module:flush(Data).
 
+-spec close(#transport{}) -> ok | {error, _Reason}.
 close(#transport{module = Module, data = Data}) ->
     Module:close(Data).