From 9fa55df4eb3d731ee5ed6cc40f2d3ca29c8ae292 Mon Sep 17 00:00:00 2001
From: Joseph Wayne Norton <norton@alum.mit.edu>
Date: Fri, 18 Sep 2009 23:26:43 +0900
Subject: [PATCH] fix http links

---
 README                                         |  6 +++---
 src/Unit-EUnit-Files/stateful_plugin_test.erl  |  2 +-
 src/Unit-EUnit-Files/stateless_plugin_test.erl |  2 +-
 src/contract_manager.erl                       | 10 ++++++++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 952748b..b2e6c8c 100644
--- a/README
+++ b/README
@@ -8,10 +8,10 @@ To build
 ========
 
 1. Get and install an erlang system
-   (http://www.erlang.org)
+   http://www.erlang.org
 
 2. Optionally, get and install erlang-rfc4627
-   (http://www.lshift.net/blog/2007/02/17/json-and-json-rpc-for-erlang)
+   http://www.lshift.net/blog/2007/02/17/json-and-json-rpc-for-erlang
 
 3. Change to the src directory and type make
    $ cd src
@@ -152,7 +152,7 @@ What about ABNF?
 ================
 
 See the ubf-abnf open source repository
-(http://github.com/norton/ubf-abnf) for details.  ubf-abnf is a
+http://github.com/norton/ubf-abnf for details.  ubf-abnf is a
 framework for integrating UBF and ABNF.
 
 
diff --git a/src/Unit-EUnit-Files/stateful_plugin_test.erl b/src/Unit-EUnit-Files/stateful_plugin_test.erl
index 917c891..1dc722d 100644
--- a/src/Unit-EUnit-Files/stateful_plugin_test.erl
+++ b/src/Unit-EUnit-Files/stateful_plugin_test.erl
@@ -32,7 +32,7 @@ all_tests_(Setup,Teardown) ->
      Teardown,
      (all_actual_tests_("localhost",3000,ubf,false))(not_used)
      ++ (all_actual_tests_("localhost",3001,ebf,false))(not_used)
-     %% DISABLE ++ (all_actual_tests_("localhost",3002,jsf,false))(not_used)
+     ++ (all_actual_tests_("localhost",3002,jsf,false))(not_used)
      ++ (all_actual_tests_(none,none,etf,false))(not_used)
     }.
 
diff --git a/src/Unit-EUnit-Files/stateless_plugin_test.erl b/src/Unit-EUnit-Files/stateless_plugin_test.erl
index 2fb6ace..dccaaa3 100644
--- a/src/Unit-EUnit-Files/stateless_plugin_test.erl
+++ b/src/Unit-EUnit-Files/stateless_plugin_test.erl
@@ -32,7 +32,7 @@ all_tests_(Setup,Teardown) ->
      Teardown,
      (all_actual_tests_("localhost",3000,ubf,true))(not_used)
      ++ (all_actual_tests_("localhost",3001,ebf,true))(not_used)
-     %% DISABLE ++ (all_actual_tests_("localhost",3002,jsf,true))(not_used)
+     ++ (all_actual_tests_("localhost",3002,jsf,true))(not_used)
      ++ (all_actual_tests_(none,none,etf,true))(not_used)
     }.
 
diff --git a/src/contract_manager.erl b/src/contract_manager.erl
index 9692e8f..c908fb9 100644
--- a/src/contract_manager.erl
+++ b/src/contract_manager.erl
@@ -81,12 +81,19 @@ loop(Client, Server, State1, Mod, VerboseRPC) ->
             exit({serverContractManager, Why})
     end.
 
+tlogCheckIn() ->
+    now().
+tlogCheckOut(StartTime, Mod, Q, Reply, Status0) ->
+    gmt_tlog_h:tlog_ubf(StartTime, Mod, Q, Reply, Status0).
+
 do_rpc(Client, Server, State1, Mod, Q, VerboseRPC) ->
     %% check contract
+    StartTime = tlogCheckIn(),
     case checkIn(Q, State1, Mod) of
         [] ->
             Expect = Mod:contract_state(State1),
             Client ! {self(), {{clientBrokeContract, Q, Expect}, State1}},
+            tlogCheckOut(StartTime, Mod, Q, undefined, client_broke_contract),
             loop(Client, Server, State1, Mod, VerboseRPC);
         FSM2 ->
             if VerboseRPC ->
@@ -102,14 +109,17 @@ do_rpc(Client, Server, State1, Mod, Q, VerboseRPC) ->
                             case Next of
                                 same ->
                                     Client ! {self(), {Reply, State2}},
+                                    tlogCheckOut(StartTime, Mod, Q, Reply, ok),
                                     loop(Client, Server, State2, Mod, VerboseRPC);
                                 {new, NewMod, State3} ->
                                     Client ! {self(), {Reply, State3}},
+                                    tlogCheckOut(StartTime, Mod, Q, Reply, ok),
                                     loop(Client, Server, State3, NewMod, VerboseRPC)
                             end;
                         false ->
                             Expect = map(fun(I) -> element(2, I) end, FSM2),
                             Client ! {self(), {{serverBrokeContract, {Q, Reply}, Expect}, State1}},
+                            tlogCheckOut(StartTime, Mod, Q, Reply, server_broke_contract),
                             loop(Client, Server, State1, Mod, VerboseRPC)
                     end;
                 stop ->