From 503f7c31770677928fd494e68c0e7285550c2406 Mon Sep 17 00:00:00 2001
From: "Robert G. Jakabosky" <bobby@sharedrealm.com>
Date: Fri, 22 Apr 2011 08:57:19 -0700
Subject: [PATCH] Remove 'disable_ffi' support.

---
 README.md                  | 3 ++-
 perf/no_msg/local_lat.lua  | 9 ++-------
 perf/no_msg/local_thr.lua  | 9 ++-------
 perf/no_msg/remote_lat.lua | 9 ++-------
 perf/no_msg/remote_thr.lua | 9 ++-------
 5 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 41b5a0f..eac5f5f 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,7 @@ Running benchmarks
 When running the benchmarks you will need run two different scripts (one 'local' and one 'remote').  Both scripts can be run on the same computer or on different computers.  Make sure to start the 'local' script first.
 
 Throughput benchmark:
+
 	# first start local script
 	$ luajit-2 perf/local_thr.lua "tcp://lo:5555" 30 1000000
 	
@@ -97,11 +98,11 @@ Throughput benchmark:
 	$ luajit-2 perf/remote_thr.lua "tcp://localhost:5555" 30 1000000
 
 Latency benchmark:
+
 	# first start local script
 	$ luajit-2 perf/local_lat.lua "tcp://lo:5555" 1 100000
 	
 	# then in another window start remote script
 	$ luajit-2 perf/remote_lat.lua "tcp://localhost:5555" 1 100000
 
-You can disable the FFI support when running under LuaJIT2 by passing a forth parameter `disable_ffi`
 
diff --git a/perf/no_msg/local_lat.lua b/perf/no_msg/local_lat.lua
index adac027..61aa512 100644
--- a/perf/no_msg/local_lat.lua
+++ b/perf/no_msg/local_lat.lua
@@ -19,20 +19,15 @@
 -- THE SOFTWARE.
 
 if not arg[3] then
-    print("usage: lua local_lat.lua <bind-to> <message-size> <roundtrip-count> [<zmq-module>]")
+    print("usage: lua local_lat.lua <bind-to> <message-size> <roundtrip-count>")
     os.exit()
 end
 
 local bind_to = arg[1]
 local message_size = tonumber(arg[2])
 local roundtrip_count = tonumber(arg[3])
-local mod = arg[4] or "zmq"
-if mod == 'disable_ffi' then
-	disable_ffi = true
-	mod = 'zmq'
-end
 
-local zmq = require(mod)
+local zmq = require'zmq'
 
 local ctx = zmq.init(1)
 local s = ctx:socket(zmq.REP)
diff --git a/perf/no_msg/local_thr.lua b/perf/no_msg/local_thr.lua
index 6e845e5..45f2646 100644
--- a/perf/no_msg/local_thr.lua
+++ b/perf/no_msg/local_thr.lua
@@ -19,20 +19,15 @@
 -- THE SOFTWARE.
 
 if not arg[3] then
-    print("usage: lua local_thr.lua <bind-to> <message-size> <message-count> [<zmq-module>]")
+    print("usage: lua local_thr.lua <bind-to> <message-size> <message-count>")
     os.exit()
 end
 
 local bind_to = arg[1]
 local message_size = tonumber(arg[2])
 local message_count = tonumber(arg[3])
-local mod = arg[4] or "zmq"
-if mod == 'disable_ffi' then
-	disable_ffi = true
-	mod = 'zmq'
-end
 
-local zmq = require(mod)
+local zmq = require'zmq'
 
 local socket = require"socket"
 local time = socket.gettime
diff --git a/perf/no_msg/remote_lat.lua b/perf/no_msg/remote_lat.lua
index 76a4e96..08f7501 100644
--- a/perf/no_msg/remote_lat.lua
+++ b/perf/no_msg/remote_lat.lua
@@ -19,20 +19,15 @@
 -- THE SOFTWARE.
 
 if not arg[3] then
-    print("usage: lua remote_lat.lua <connect-to> <message-size> <roundtrip-count> [<zmq-module>]")
+    print("usage: lua remote_lat.lua <connect-to> <message-size> <roundtrip-count>")
     os.exit()
 end
 
 local connect_to = arg[1]
 local message_size = tonumber(arg[2])
 local roundtrip_count = tonumber(arg[3])
-local mod = arg[4] or "zmq"
-if mod == 'disable_ffi' then
-	disable_ffi = true
-	mod = 'zmq'
-end
 
-local zmq = require(mod)
+local zmq = require'zmq'
 
 local socket = require"socket"
 local time = socket.gettime
diff --git a/perf/no_msg/remote_thr.lua b/perf/no_msg/remote_thr.lua
index 97fbd1f..8759c39 100644
--- a/perf/no_msg/remote_thr.lua
+++ b/perf/no_msg/remote_thr.lua
@@ -19,20 +19,15 @@
 -- THE SOFTWARE.
 
 if not arg[3] then
-    print("usage: lua remote_thr.lua <connect-to> <message-size> <message-count> [<zmq-module>]")
+    print("usage: lua remote_thr.lua <connect-to> <message-size> <message-count>")
     os.exit()
 end
 
 local connect_to = arg[1]
 local message_size = tonumber(arg[2])
 local message_count = tonumber(arg[3])
-local mod = arg[4] or "zmq"
-if mod == 'disable_ffi' then
-	disable_ffi = true
-	mod = 'zmq'
-end
 
-local zmq = require(mod)
+local zmq = require'zmq'
 
 local ctx = zmq.init(1)
 local s = ctx:socket(zmq.PUB)