Merged shebang support: scripts with #!/usr/bin/env snabb

.gitignore

@@ -4,5 +4,4 @@ obj
 *.o
 *#
 /src/snabbswitch
-
-/src/app-selftest.dot
+/src/snabb

src/Makefile

@@ -33,27 +33,31 @@ TESTMODS = $(shell find . -regex '[^\#]*\.lua' -printf '%P ' | \
 
 PATH := ../deps/luajit/usr/local/bin:$(PATH)
 
-all: snabbswitch
+all: snabb
+
+install: snabb
+	cp snabb /usr/local/bin/
 
 markdown: $(RMOBJS)
 
-snabbswitch: $(LUAOBJ) $(HOBJ) $(COBJ) $(ASMOBJ)
+snabb: $(LUAOBJ) $(HOBJ) $(COBJ) $(ASMOBJ)
 	$(E) "LINK      $@"
 	$(Q) gcc -Wl,-E -Werror -Wall -o $@ $^ \
 	    ../deps/luajit/src/libluajit.a \
 	    -lc -ldl -lm -lrt -lpthread
 	@echo -n "Firmware: "
-	@ls -sh snabbswitch
+	@ln -fs snabb snabbswitch
+	@ls -sh snabb
 
 test: $(TESTMODS)
 
 test_ci: FAIL_ON_FIRST="true"
 
 test_ci: $(TESTMODS)
 
-$(TESTMODS): testlog snabbswitch
+$(TESTMODS): testlog snabb
 	$(E) "TEST      $@"
-	$(Q) ./snabbswitch -t $@ > testlog/$@ || ( \
+	$(Q) ./snabb -t $@ > testlog/$@ || ( \
 		EXITCODE="$$?"; \
 		[ "$$EXITCODE" -eq $(TEST_SKIPPED) ] \
 		&& ( \
@@ -136,7 +140,7 @@ doc/snabbswitch.html doc/snabbswitch.epub: doc/snabbswitch.md
 	$(E) "PANDOC    $@"
 	$(Q) pandoc -S --toc --chapters -o $@ $<
 
-CLEAN = snabbswitch obj doc/snabbswitch.* doc/obj/*.md testlog
+CLEAN = snabb snabbswitch obj doc/snabbswitch.* doc/obj/*.md testlog
 
 clean:
 	$(E) "RM        $(CLEAN)"

src/core/main.lua

@@ -1,5 +1,9 @@
 module(...,package.seeall)
 
+-- Default to not using any Lua code on the filesystem.
+-- (Can be overridden with -P argument: see below.)
+package.path = ''
+
 local ffi = require("ffi")
 local zone = require("jit.zone")
 local C   = ffi.C
@@ -17,8 +21,9 @@ ffi.cdef[[
 ]]
 
 local usage = [[
-Usage: snabbswitch [options] <module> [args...]
+Usage: snabb [options] <module> [args...]
 Available options are:
+-P pathspec  Set library load path (Lua 'package.path').
 -e chunk     Execute string 'chunk'.
 -l name      Require library 'name'.
 -t name      Test module 'name' with selftest().
@@ -45,7 +50,10 @@ function main ()
    end
    local i = 1
    while i <= #args do
-      if args[i] == '-l' and i < #args then
+      if args[i] == '-P' and i < #args then
+         package.path = args[i+1]
+         i = i + 2
+      elseif args[i] == '-l' and i < #args then
 	 require(args[i+1])
 	 i = i + 2
       elseif args[i] == '-t' and i < #args then
@@ -69,15 +77,15 @@ function main ()
 	 jit_dump.start("", args[i+1])
 	 i = i + 2
       elseif i <= #args then
-         -- Syntax: <module> [args...]
+         -- Syntax: <script> [args...]
          local module = args[i]
          i = i + 1
          while i <= #args do
             table.insert(parameters, args[i])
             i = i + 1
          end
          zone("module "..module)
-         require(module)
+         dofile(module)
          exit(0)
       else
 	 print(usage)

src/designs/loadgen/README.md

@@ -16,7 +16,7 @@ descriptors). See performance notes below.
 
 ### Usage
 
-    snabbswitch [opts...] designs.loadgen.loadgen <pcapfile> [port...]
+    loadgen <pcapfile> [port...]
 
 Generates load by replaying the Pcap trace file in a loop on each
 selected ethernet port.
@@ -29,17 +29,17 @@ controller.
 Examples (from chur.snabb.co test server):
 
     # Use all NICs
-    snabbswitch designs.loadgen.loadgen foo.pcap
+    loadgen foo.pcap
 
     # Use two NICs, one from each NUMA node
-    snabbswitch designs.loadgen.loadgen foo.pcap 0000:01:00.1 0000:82:00.1
+    loadgen foo.pcap 0000:01:00.1 0000:82:00.1
     # (shorter version)
-    snabbswitch designs.loadgen.loadgen foo.pcap 01:00.1 82:00.1
+    loadgen foo.pcap 01:00.1 82:00.1
 
     # Use all NICs on NUMA node 0
-    taskset -c <cpu0> snabbswitch designs.loadgen.loadgen foo.pcap 0000:0
+    taskset -c <cpu0> loadgen foo.pcap 0000:0
     # Use all NICs on NUMA node 1
-    taskset -c <cpu1> snabbswitch designs.loadgen.loadgen foo.pcap 0000:8
+    taskset -c <cpu1> loadgen foo.pcap 0000:8
 
 
 ### Performance

src/designs/loadgen/README.md.src

@@ -39,7 +39,7 @@ descriptors). See performance notes below.
 
 ### Usage
 
-    snabbswitch [opts...] designs.loadgen.loadgen <pcapfile> [port...]
+    loadgen <pcapfile> [port...]
 
 Generates load by replaying the Pcap trace file in a loop on each
 selected ethernet port.
@@ -52,17 +52,17 @@ controller.
 Examples (from chur.snabb.co test server):
 
     # Use all NICs
-    snabbswitch designs.loadgen.loadgen foo.pcap
+    loadgen foo.pcap
 
     # Use two NICs, one from each NUMA node
-    snabbswitch designs.loadgen.loadgen foo.pcap 0000:01:00.1 0000:82:00.1
+    loadgen foo.pcap 0000:01:00.1 0000:82:00.1
     # (shorter version)
-    snabbswitch designs.loadgen.loadgen foo.pcap 01:00.1 82:00.1
+    loadgen foo.pcap 01:00.1 82:00.1
 
     # Use all NICs on NUMA node 0
-    taskset -c <cpu0> snabbswitch designs.loadgen.loadgen foo.pcap 0000:0
+    taskset -c <cpu0> loadgen foo.pcap 0000:0
     # Use all NICs on NUMA node 1
-    taskset -c <cpu1> snabbswitch designs.loadgen.loadgen foo.pcap 0000:8
+    taskset -c <cpu1> loadgen foo.pcap 0000:8
 
 
 ### Performance

src/designs/loadgen/loadgen.lua → src/designs/loadgen/loadgen

@@ -1,4 +1,4 @@
-module(...,package.seeall)
+#!/usr/bin/env snabb
 
 local app       = require("core.app")
 local buffer    = require("core.buffer")