From e924eed8761afb4fe2be21d8bc3cd2f962bedd7b Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Mon, 14 Nov 2016 11:37:58 +0200 Subject: [PATCH 01/15] First phase of updating repo to match vanilla MoonGen - WIP --- .gitmodules | 6 +++--- libmoon | 1 + phobos | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) create mode 160000 libmoon delete mode 160000 phobos diff --git a/.gitmodules b/.gitmodules index 8cf5f7b3d..bcef25b35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "phobos"] - path = phobos - url = https://github.com/Phobos-Framework/phobos +[submodule "libmoon"] + path = libmoon + url = https://github.com/libmoon/libmoon diff --git a/libmoon b/libmoon new file mode 160000 index 000000000..9df2e70df --- /dev/null +++ b/libmoon @@ -0,0 +1 @@ +Subproject commit 9df2e70df86506b1f343a4187303a977e5e4308e diff --git a/phobos b/phobos deleted file mode 160000 index 8e80c8fc4..000000000 --- a/phobos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e80c8fc49c21a5b582059e8d7f1771de9aced56 From 24c8abc261df46798448f3b66cac7959830d8b4e Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Mon, 14 Nov 2016 11:42:37 +0200 Subject: [PATCH 02/15] Updating repo - WIP --- CMakeLists.txt | 23 ++++++++++++----------- README.md | 16 ++++++++-------- bind-interfaces.sh | 6 +++--- build.sh | 4 ++-- setup-hugetlbfs.sh | 4 ++-- 5 files changed, 27 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 95c07b0da..982aacdf7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,34 +5,35 @@ set(CMAKE_CXX_FLAGS "-fno-stack-protector -Wall -Wextra -Wno-unused-parameter -g set(CMAKE_C_FLAGS "-fno-stack-protector -Wall -Wextra -Wno-unused-parameter -g -O3 -std=gnu11 -march=native -msse4.2") set(CMAKE_EXE_LINKER_FLAGS "-rdynamic") -set(PHOBOS_BUILD_LIBRARY true) -add_definitions(-DPHOBOS_LUA_MAIN_MODULE="moongen-main") -add_subdirectory(phobos) +set(LIBMOON_BUILD_LIBRARY true) +add_definitions(-DLIBMOON_LUA_MAIN_MODULE="moongen-main") +add_subdirectory(libmoon) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/lib - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/deps/dpdk/x86_64-native-linuxapp-gcc/include - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/deps/luajit/src - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/lib - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/src + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/deps/dpdk/x86_64-native-linuxapp-gcc/include + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/deps/luajit/src + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/lib + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/src ) set(files src/moongen-main src/software-timestamping src/crc-rate-limiter + src/software-rate-limiter ) set(libraries - -Wl,--whole-archive phobos -Wl,--no-whole-archive + -Wl,--whole-archive moon -Wl,--no-whole-archive ) link_directories( - ${CMAKE_CURRENT_BINARY_DIR}/phobos - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/deps/dpdk/x86_64-native-linuxapp-gcc/lib - ${CMAKE_CURRENT_SOURCE_DIR}/phobos/deps/luajit/usr/local/lib + ${CMAKE_CURRENT_BINARY_DIR}/libmoon + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/deps/dpdk/x86_64-native-linuxapp-gcc/lib + ${CMAKE_CURRENT_SOURCE_DIR}/libmoon/deps/luajit/usr/local/lib ) add_executable(MoonGen ${files}) diff --git a/README.md b/README.md index 763674771..1c6e6bbfa 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Detailed evaluation: [Paper](http://www.net.in.tum.de/fileadmin/bibtex/publicati # MoonGen Packet Generator -MoonGen is a scriptable high-speed packet generator built on [Phobos](https://github.com/Phobos-Framework/phobos). +MoonGen is a scriptable high-speed packet generator built on [libmoon](https://github.com/libmoon/libmoon). The whole load generator is controlled by a Lua script: all packets that are sent are crafted by a user-provided script. Thanks to the incredibly fast LuaJIT VM and the packet processing library DPDK, it can saturate a 10 Gbit/s Ethernet link with 64 Byte packets while using only a single CPU core. MoonGen can achieve this rate even if each packet is modified by a Lua script. It does not rely on tricks like replaying the same buffer. @@ -37,7 +37,7 @@ You can have a look at [our slides from a talk](https://raw.githubusercontent.co # Architecture -MoonGen is built on [Phobos](https://github.com/Phobos-Framework/phobos), a Lua wrapper for DPDK. +MoonGen is built on [libmoon](https://github.com/libmoon/libmoon), a Lua wrapper for DPDK. Users write custom scripts for their experiments. It is recommended to make use of hard-coded setup-specific constants in your scripts. The script is the configuration, it is beside the point to write a complicated configuration interface for a script. @@ -137,7 +137,7 @@ The effects of the switch on the packet spacing needs to be analyzed carefully, 5. sudo ./build/MoonGen examples/l3-load-latency.lua 0 1 Note: You need to bind NICs to DPDK to use them. `bind-interfaces.sh` does this for all unused NICs (no routing table entry in the system). -Use `phobos/deps/dpdk/tools/dpdk-devbind.py` to manage NICs manually. +Use `libmoon/deps/dpdk/tools/dpdk-devbind.py` to manage NICs manually. ## Dependencies @@ -154,8 +154,8 @@ MoonGen comes with examples in the examples folder which can be used as a basis The two command line arguments are the transmission and reception ports. MoonGen prints all available ports on startup, so adjust this if necessary. -You can also check out the examples of the [Phobos](https://github.com/Phobos-Framework/phobos) project. -All Phobos scripts are also valid MoonGen scripts as MoonGen extends Phobos. +You can also check out the examples of the [libmoon](https://github.com/libmoon/libmoon) project. +All libmoon scripts are also valid MoonGen scripts as MoonGen extends libmoon. # Frequently Asked Questions @@ -165,11 +165,11 @@ Hardware timestamping is currently supported and tested on Intel igb, ixgbe, and Use ``test-timestamping-capabilities.lua`` in ``examples/timestamping-tests`` to find out what your NIC supports. Hardware rate control is supported and tested on Intel ixgbe and i40e NICs. -### What's the difference between MoonGen and Phobos? -MoonGen builds on [Phobos](https://github.com/Phobos-Framework/phobos) by extending it with features for packet generators such as software rate control and software timestamping. +### What's the difference between MoonGen and libmoon? +MoonGen builds on [libmoon](https://github.com/libmoon/libmoon) by extending it with features for packet generators such as software rate control and software timestamping. If you want to write a packet generator or test your application: use MoonGen. -If you want to prototype DPDK applications: use [Phobos](https://github.com/Phobos-Framework/phobos). +If you want to prototype DPDK applications: use [libmoon](https://github.com/libmoon/libmoon). # References diff --git a/bind-interfaces.sh b/bind-interfaces.sh index 1a86abf2a..d5cc894ac 100755 --- a/bind-interfaces.sh +++ b/bind-interfaces.sh @@ -2,11 +2,11 @@ ( cd $(dirname "${BASH_SOURCE[0]}") -cd phobos +cd libmoon if [[ -e setup-hugetlbfs.sh ]] ; then - ERROR_MSG_SUBDIR="phobos/" ./bind-interfaces.sh + ERROR_MSG_SUBDIR="libmoon/" ./bind-interfaces.sh else - echo "Phobos not found. Please run git submodule update --init --recursive" + echo "libmoon not found. Please run git submodule update --init --recursive" fi ) diff --git a/build.sh b/build.sh index 04279efe7..214c64896 100755 --- a/build.sh +++ b/build.sh @@ -8,13 +8,13 @@ git submodule update --init --recursive NUM_CPUS=$(cat /proc/cpuinfo | grep "processor\\s: " | wc -l) ( -cd phobos/deps/luajit +cd libmoon/deps/luajit make -j $NUM_CPUS BUILDMODE=static 'CFLAGS=-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT' make install DESTDIR=$(pwd) ) ( -cd phobos/deps/dpdk +cd libmoon/deps/dpdk make -j $NUM_CPUS install T=x86_64-native-linuxapp-gcc ) diff --git a/setup-hugetlbfs.sh b/setup-hugetlbfs.sh index df015e368..cdcc6f2ff 100755 --- a/setup-hugetlbfs.sh +++ b/setup-hugetlbfs.sh @@ -2,11 +2,11 @@ ( cd $(dirname "${BASH_SOURCE[0]}") -cd phobos +cd libmoon if [[ -e setup-hugetlbfs.sh ]] ; then ./setup-hugetlbfs.sh else - echo "Phobos not found. Please run git submodule update --init --recursive" + echo "libmoon not found. Please run git submodule update --init --recursive" fi ) From ec6251d18539c0db938178d57137da032eac7e50 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Mon, 14 Nov 2016 11:58:54 +0200 Subject: [PATCH 03/15] Final step to updating repo to match vanilla MoonGen - WIP --- examples/rate-control-methods.lua | 15 ++----- lua/moongen-compat.lua | 6 +-- lua/moongen-main.lua | 2 +- lua/moongen.lua | 4 +- lua/software-ratecontrol.lua | 73 +++++++++++++++++++++++++++++++ src/moongen-main.cpp | 6 +-- src/software-rate-limiter.cpp | 26 ++++------- src/software-timestamping.c | 2 +- 8 files changed, 95 insertions(+), 39 deletions(-) diff --git a/examples/rate-control-methods.lua b/examples/rate-control-methods.lua index 05d4f2a77..e1193b1ad 100644 --- a/examples/rate-control-methods.lua +++ b/examples/rate-control-methods.lua @@ -5,7 +5,7 @@ local ts = require "timestamping" local stats = require "stats" local hist = require "histogram" local log = require "log" -local limiter = require "ratelimiter" +local limiter = require "software-ratecontrol" local PKT_SIZE = 60 local ETH_DST = "11:12:13:14:15:16" @@ -19,8 +19,9 @@ function master(txPort, rate, rc, pattern, threads) if pattern == "cbr" and threads ~= 1 then return log:error("cbr only supports one thread") end - local txDev = device.config{ port = txPort, txQueues = threads, disableOffloads = rc ~= "moongen" } + local txDev = device.config{port = txPort, txQueues = threads, disableOffloads = rc ~= "moongen"} device.waitForLinks() + stats.startStatsTask{txDevices = {txDev}} for i = 1, threads do local rateLimiter if rc == "sw" then @@ -39,45 +40,37 @@ function loadSlave(queue, txDev, rate, rc, pattern, rateLimiter, threadId, numTh ethType = 0x1234 } end) - local txCtr if rc == "hw" then local bufs = mem:bufArray() if pattern ~= "cbr" then return log:error("HW only supports CBR") end - txCtr = stats:newDevTxCounter(txDev, "plain") queue:setRate(rate * (PKT_SIZE + 4) * 8) mg.sleepMillis(100) -- for good meaasure while mg.running() do bufs:alloc(PKT_SIZE) queue:send(bufs) - if threadId == 1 then txCtr:update() end end elseif rc == "sw" then -- larger batch size is useful when sending it through a rate limiter local bufs = mem:bufArray(128) - txCtr = stats:newDevTxCounter(txDev, "plain") while mg.running() do bufs:alloc(PKT_SIZE) rateLimiter:send(bufs) - if threadId == 1 then txCtr:update() end end elseif rc == "moongen" then -- larger batch size is useful when sending it through a rate limiter local bufs = mem:bufArray(128) - txCtr = stats:newManualTxCounter(txDev, "plain") local dist = pattern == "poisson" and poissonDelay or function(x) return x end while mg.running() do bufs:alloc(PKT_SIZE) for _, buf in ipairs(bufs) do buf:setDelay(dist(10^10 / numThreads / 8 / (rate * 10^6) - PKT_SIZE - 24)) end - --txCtr:updateWithSize(queue:sendWithDelay(bufs), PKT_SIZE) - txCtr:updateWithSize(queue:sendWithDelay(bufs, rate * numThreads), PKT_SIZE) + queue:sendWithDelay(bufs, rate * numThreads) end else log:error("Unknown rate control method") end - txCtr:finalize() end diff --git a/lua/moongen-compat.lua b/lua/moongen-compat.lua index c2599eaf9..537e866d9 100644 --- a/lua/moongen-compat.lua +++ b/lua/moongen-compat.lua @@ -8,7 +8,7 @@ local device = require "device" dpdk.__name = "dpdk" moongen.__name = "moongen" --- make functions that were moved to the phobos/moongen module available +-- make functions that were moved to the libmoons/moongen module available local function deprecatedFunction(oldMod, oldName, newMod, newName) newName = newName or oldName oldMod[oldName] = function(...) @@ -47,7 +47,7 @@ function device.config(...) if type((...)) == "number" then local args = {...} -- this is for legacy compatibility when calling the function without named arguments - log:warn("device.config() without named arguments is deprecated and will be removed. See documentation for phobos device.config().") + log:warn("device.config() without named arguments is deprecated and will be removed. See documentation for libmoons device.config().") if not args[2] or type(args[2]) == "number" then args.port = args[1] args.rxQueues = args[2] @@ -57,7 +57,7 @@ function device.config(...) args.speed = args[6] args.dropEnable = args[7] else -- called with mempool which was changed to mempools (one per queue) - log:fatal("mempool option was removed. See phobos device.config() for the new \"mempools\" option.") + log:fatal("mempool option was removed. See libmoon device.config() for the new \"mempools\" option.") end return oldConfig(args) end diff --git a/lua/moongen-main.lua b/lua/moongen-main.lua index 0f6fc7783..1044aef7b 100644 --- a/lua/moongen-main.lua +++ b/lua/moongen-main.lua @@ -7,6 +7,6 @@ require "software-timestamps" require "crc-ratecontrol" require "software-ratecontrol" --- phobos main, contains main() +-- libmoon main, contains main() require "main" diff --git a/lua/moongen.lua b/lua/moongen.lua index 6250c160a..5285094e4 100644 --- a/lua/moongen.lua +++ b/lua/moongen.lua @@ -1,9 +1,9 @@ local mod = {} -local phobos = require "phobos" +local lm = require "libmoon" -- add moongen-specific functions here -setmetatable(mod, {__index = phobos}) +setmetatable(mod, {__index = lm}) return mod diff --git a/lua/software-ratecontrol.lua b/lua/software-ratecontrol.lua index e69de29bb..d956dd59a 100644 --- a/lua/software-ratecontrol.lua +++ b/lua/software-ratecontrol.lua @@ -0,0 +1,73 @@ +local ffi = require "ffi" +local pipe = require "pipe" +local mg = require "moongen" +local serpent = require "Serpent" +local memory = require "memory" +local log = require "log" + +local C = ffi.C + +ffi.cdef[[ + struct rate_limiter_batch { + int32_t size; + void* bufs[0]; + }; + + //void mg_rate_limiter_main_loop(struct rte_ring* ring, uint8_t device, uint16_t queue); + void mg_rate_limiter_cbr_main_loop(struct rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target); + void mg_rate_limiter_poisson_main_loop(struct rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target, uint32_t link_speed); +]] + +local mod = {} +local rateLimiter = {} +mod.rateLimiter = rateLimiter + +rateLimiter.__index = rateLimiter + +function rateLimiter:send(bufs) + repeat + if pipe:sendToPacketRing(self.ring, bufs) then + break + end + until not mg.running() +end + +function rateLimiter:__serialize() + return "require 'software-ratecontrol'; return " .. serpent.addMt(serpent.dumpRaw(self), "require('software-ratecontrol').rateLimiter"), true +end + +--- Create a new rate limiter that allows for precise inter-packet gap generation by wrapping a tx queue. +-- By default it uses packet delay information from buf:setDelay(). +-- Can only be created from the master task because it spawns a separate thread. +-- @param queue the wrapped tx queue +-- @param mode optional, either "cbr", "poisson", or "custom". Defaults to custom. +-- @param delay optional, inter-departure time in nanoseconds for cbr, 1/lambda (average) for poisson +function mod:new(queue, mode, delay) + mode = mode or "custom" + if mode ~= "poisson" and mode ~= "cbr" and mode ~= "custom" then + log:fatal("Unsupported mode " .. mode) + end + local ring = pipe:newPacketRing() + local obj = setmetatable({ + ring = ring.ring, + mode = mode, + delay = delay, + queue = queue + }, rateLimiter) + mg.startTask("__MG_RATE_LIMITER_MAIN", obj.ring, queue.id, queue.qid, mode, delay, queue.dev:getLinkStatus().speed) + return obj +end + + +function __MG_RATE_LIMITER_MAIN(ring, devId, qid, mode, delay, speed) + if mode == "cbr" then + C.mg_rate_limiter_cbr_main_loop(ring, devId, qid, delay) + elseif mode == "poisson" then + C.mg_rate_limiter_poisson_main_loop(ring, devId, qid, delay, speed) + else + log:fatal("generic IPG mode NYI, please specifiy either cbr or poisson") + end +end + +return mod + diff --git a/src/moongen-main.cpp b/src/moongen-main.cpp index e378e6498..e6c7ff52d 100644 --- a/src/moongen-main.cpp +++ b/src/moongen-main.cpp @@ -2,8 +2,8 @@ int main(int argc, char** argv) { // TODO: get the install-path via cmake - phobos::setup_base_dir({"phobos", "../phobos", "/usr/local/lib/moongen"}, true); - phobos::setup_extra_lua_path({"../lua/?.lua", "../lua/?/init.lua", "../lua/lib/?.lua", "../lua/lib/?/init.lua"}); - return phobos::main(argc, argv); + libmoon::setup_base_dir({"libmoon", "../libmoon", "/usr/local/lib/moongen"}, true); + libmoon::setup_extra_lua_path({"../lua/?.lua", "../lua/?/init.lua", "../lua/lib/?.lua", "../lua/lib/?/init.lua"}); + return libmoon::main(argc, argv); } diff --git a/src/software-rate-limiter.cpp b/src/software-rate-limiter.cpp index 7c664b79c..d1fd1e6a2 100644 --- a/src/software-rate-limiter.cpp +++ b/src/software-rate-limiter.cpp @@ -10,6 +10,7 @@ #include #include #include "ring.h" +#include "lifecycle.hpp" // required for gcc 4.7 for some reason // ??? @@ -24,22 +25,10 @@ namespace rate_limiter { constexpr int batch_size = 64; - // FIXME: actually do the right thing + // FIXME: NYI static inline void main_loop(struct rte_ring* ring, uint8_t device, uint16_t queue) { - struct rte_mbuf* bufs[batch_size]; - while (1) { - int rc = ring_dequeue(ring, reinterpret_cast(bufs), batch_size); - if (rc == 0) { - uint32_t sent = 0; - while (sent < batch_size) { - sent += rte_eth_tx_burst(device, queue, bufs + sent, batch_size - sent); - } - } - } } - - // FIXME: support packet sizes here static inline void main_loop_poisson(struct rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target, uint32_t link_speed) { uint64_t tsc_hz = rte_get_tsc_hz(); // control IPGs instead of IDT as IDTs < packet_time are physically impossible @@ -72,7 +61,7 @@ namespace rate_limiter { uint64_t id_cycles = (uint64_t) (target / (1000000000.0 / ((double) tsc_hz))); uint64_t next_send = 0; struct rte_mbuf* bufs[batch_size]; - while (1) { + while (libmoon::is_running(0)) { int rc = ring_dequeue(ring, reinterpret_cast(bufs), batch_size); uint64_t cur = rte_get_tsc_cycles(); // nothing sent for 10 ms, restart rate control @@ -92,16 +81,17 @@ namespace rate_limiter { } extern "C" { - void rate_limiter_cbr_main_loop(rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target) { + void mg_rate_limiter_cbr_main_loop(rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target) { rate_limiter::main_loop_cbr(ring, device, queue, target); } - void rate_limiter_poisson_main_loop(rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target, uint32_t link_speed) { + void mg_rate_limiter_poisson_main_loop(rte_ring* ring, uint8_t device, uint16_t queue, uint32_t target, uint32_t link_speed) { rate_limiter::main_loop_poisson(ring, device, queue, target, link_speed); } - void rate_limiter_main_loop(rte_ring* ring, uint8_t device, uint16_t queue) { - rate_limiter::main_loop(ring, device, queue); + void mg_rate_limiter_main_loop(rte_ring* ring, uint8_t device, uint16_t queue) { + // NYI + //rate_limiter::main_loop(ring, device, queue); } } diff --git a/src/software-timestamping.c b/src/software-timestamping.c index dec89a550..1d93db8f5 100644 --- a/src/software-timestamping.c +++ b/src/software-timestamping.c @@ -11,7 +11,7 @@ // software timestamping void moongen_send_packet_with_timestamp(uint8_t port_id, uint16_t queue_id, struct rte_mbuf* pkt, uint16_t offs) { - while (is_running()) { + while (is_running(0)) { rte_pktmbuf_mtod_offset(pkt, uint64_t*, 0)[offs] = read_rdtsc(); if (rte_eth_tx_burst(port_id, queue_id, &pkt, 1) == 1) { return; From b89a849f47a0327cc406f17c65d89ec94d9a18ca Mon Sep 17 00:00:00 2001 From: Netronome-moongen Date: Mon, 14 Nov 2016 12:03:00 +0200 Subject: [PATCH 04/15] Add files via upload --- examples/netronome-packetgen/packetgen.lua | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua index d4947ba16..7bf1679a2 100644 --- a/examples/netronome-packetgen/packetgen.lua +++ b/examples/netronome-packetgen/packetgen.lua @@ -31,6 +31,8 @@ packet sizes 1514, 570, and 64, respectively. --]] +local libmoon = require "libmoon" +local mg = require "moongen" local moongen = require "dpdk" local dpdkc = require "dpdkc" local memory = require "memory" @@ -199,7 +201,7 @@ constants = { -- Start time of the appliction. This is used to sync -- the printing and logging accross the slaves. -local globalStartTime = moongen.getTime() +local globalStartTime = mg.getTime() ------------------------------------------------------------------------------- -- Master function to do the slave setup and invoke the slave instances. @@ -261,7 +263,7 @@ function master(...) -- Display the parameters: clParams:print() - moongen.sleepMillis(clParams.paramDisplay) + mg.sleepMillis(clParams.paramDisplay) local slaveId = 0 -- Launch the slaves: @@ -269,8 +271,7 @@ function master(...) -- Check if the port must be used as a TX slave: for _, txPortId in ipairs(clParams.txSlavePorts) do if txPortId == portId then - moongen.startTask( - "txSlave", devices[i], portId, slaveId, clParams) + libmoon.startTask("txSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end @@ -278,15 +279,14 @@ function master(...) -- Check if the port must be used as a RX slave: for _, rxPortId in ipairs(clParams.rxSlavePorts) do if rxPortId == portId then - moongen.startTask( - "rxSlave", devices[i], portId, slaveId, clParams) + libmoon.startTask("rxSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end end end - moongen.waitForSlaves() + mg.waitForTasks() end ---- RX Functionality --------------------------------------------------------- @@ -299,8 +299,7 @@ end -- clParams : The command line parameters. ------------------------------------------------------------------------------- function rxSlave(device, portId, slaveId, clParams) - print(string.format("Launching RX slave: %u, Core: %u, Port: %u", - slaveId, moongen:getCore(), portId)) + print(string.format("Launching RX slave: %u, Core: %u, Port: %u", slaveId, mg:getCore(), portId)) -- Variables for receiving: local rxPackets = 0 @@ -312,7 +311,7 @@ function rxSlave(device, portId, slaveId, clParams) -- Variables for logging, printing, stopping: local state = "canrun" local stats = deepCopy(statsRx) - local startTime = moongen.getTime() + local startTime = mg.getTime() local lastPrintTime = 0 local iteration = 0 @@ -322,12 +321,12 @@ function rxSlave(device, portId, slaveId, clParams) elseif clParams.writemode == 3 then -- Prer core mode - create file and write header: outFile = clParams.fileprefix .. - "-c" .. tostring(moongen:getCore()) .. + "-c" .. tostring(mg:getCore()) .. "-p" .. tostring(portId) .. ".txt"; writeStatsHeader(outFile) end - while state == "canrun" and moongen.running() do + while state == "canrun" and mg.running() do rxPackets = rxQueue:tryRecv(rxBurst, constants.receiveTimeout) stats.packets = stats.packets + rxPackets stats.dropped = stats.dropped + rxPackets @@ -347,8 +346,8 @@ function rxSlave(device, portId, slaveId, clParams) -- Update termination params: iteration = iteration + 1 - stats.deltaTime = (moongen.getTime() - startTime) - stats.elapsedTime - stats.elapsedTime = moongen.getTime() - startTime + stats.deltaTime = (mg.getTime() - startTime) - stats.elapsedTime + stats.elapsedTime = mg.getTime() - startTime -- If printing or logging must be done: if clParams.writemode > 0 then @@ -360,7 +359,7 @@ function rxSlave(device, portId, slaveId, clParams) -- Printing and logging: if canPrint(slaveId, clParams) and sufficientTimeSincePrint then - lastPrintTime = moongen.getTime() - startTime + lastPrintTime = mg.getTime() - startTime if clParams.writemode == 1 then os.execute("clear") stats:print(portId) @@ -402,13 +401,13 @@ end ------------------------------------------------------------------------------- function calculateLatency(buf) local pkt = buf:getUdpPacket() - local cycles = tonumber(moongen:getCycles()) + local cycles = tonumber(mg:getCycles()) local timestamp = tonumber(pkt.payload.uint64[0]) local latency = 0 if timestamp ~= 0 then latency = tonumber(cycles - timestamp) - / tonumber(moongen:getCyclesFrequency()) + / tonumber(mg:getCyclesFrequency()) end return latency end @@ -429,7 +428,7 @@ function statsRx:print(portId) "\n| Packets dropped on receive : %32u |" .. "\n| RX mean latency : %32.10f |" .. "\n+---------------------------------------------------------------+" , - moongen:getCore() , + mg:getCore() , portId , self.packets , (self.packets - self.prevPackets) / self.deltaTime , @@ -456,7 +455,7 @@ end function statsRx:write(filename, portId) file = io.open(filename, "a") - local time = moongen.getTime() - globalStartTime + local time = mg.getTime() - globalStartTime local statsString = string.format( "%6.3f,%13u,%18.2f,%18.2f,%13u,%18.2f,%18.2f,%5u,%5u\n", @@ -467,7 +466,7 @@ function statsRx:write(filename, portId) self.packets , (self.packets - self.prevPackets) / self.deltaTime , self.packets / self.elapsedTime , - moongen:getCore() , + mg:getCore() , portId ) @@ -486,7 +485,7 @@ end ------------------------------------------------------------------------------- function txSlave(device, portId, slaveId, clParams) print(string.format("Launching TX slave: %u, Core: %u, Port: %u", - slaveId, moongen:getCore(), portId)) + slaveId, mg:getCore(), portId)) local state = "canrun" local stats = deepCopy(statsTx) @@ -500,7 +499,7 @@ function txSlave(device, portId, slaveId, clParams) elseif clParams.writemode == 3 then -- Per core mode: write header outFile = clParams.fileprefix .. - "-c" .. tostring(moongen:getCore()) .. + "-c" .. tostring(mg:getCore()) .. "-p" .. tostring(portId) .. ".txt"; writeStatsHeader(outFile) end @@ -559,10 +558,11 @@ function txSlave(device, portId, slaveId, clParams) -- Do sending: local iteration = 0 local lastPrintTime = 0 - local startTime = moongen.getTime() - while state == "canrun" and moongen.running() do + local startTime = mg.getTime() + + while state == "canrun" and mg.running() do for _, stream in ipairs(streams) do - timerParams.currtsc = tonumber(moongen:getCycles()) + timerParams.currtsc = tonumber(mg:getCycles()) timerParams.difftsc = timerParams.currtsc - timerParams.prevtsc sendBursts(txQueue, stats, timerParams, clParams, stream) @@ -570,8 +570,8 @@ function txSlave(device, portId, slaveId, clParams) -- Update the iteration and timeout params: iteration = iteration + 1 - stats.deltaTime = (moongen.getTime() - startTime) - stats.elapsedTime - stats.elapsedTime = moongen.getTime() - startTime + stats.deltaTime = (mg.getTime() - startTime) - stats.elapsedTime + stats.elapsedTime = mg.getTime() - startTime -- Printing and writing: if clParams.writemode > 0 then @@ -583,7 +583,7 @@ function txSlave(device, portId, slaveId, clParams) -- Printing and logging: if canPrint(slaveId, clParams) and sufficientTimeSincePrint then - lastPrintTime = moongen.getTime() - startTime + lastPrintTime = mg.getTime() - startTime if clParams.writemode == 1 then os.execute("clear") stats:print(portId) @@ -735,7 +735,7 @@ end ------------------------------------------------------------------------------- function updateTimestamp(buf) local pkt = buf:getUdpPacket() - local cycles = moongen:getCycles() + local cycles = mg:getCycles() pkt.payload.uint64[0] = cycles end @@ -755,7 +755,7 @@ function statsTx:print(portId) "\n| Packets short : %32u |" .. "\n| Bursts : %32u |" .. "\n+---------------------------------------------------------------+" , - moongen:getCore() , + mg:getCore() , portId , self.packets , (self.packets - self.prevPackets) / self.deltaTime , @@ -782,7 +782,7 @@ end function statsTx:write(filename, portId) file = io.open(filename, "a") - local time = moongen.getTime() - globalStartTime + local time = mg.getTime() - globalStartTime local statsString = string.format( "%6.3f,%13u,%18.2f,%18.2f,%13u,%18.2f,%18.2f,%5u,%5u\n", @@ -793,7 +793,7 @@ function statsTx:write(filename, portId) 0 , 0 , 0 , - moongen:getCore() , + mg:getCore() , portId ) @@ -833,7 +833,7 @@ end -- clParams : The command line parameters ------------------------------------------------------------------------------- function canPrint(slaveId, clParams) - local elapsedTime = moongen.getTime() - globalStartTime + local elapsedTime = mg.getTime() - globalStartTime local timePerCore = clParams.statsDisplay / (#clParams.rxSlavePorts + #clParams.txSlavePorts) @@ -1104,7 +1104,7 @@ function parseArgs(params, ...) end params.txDelta = - math.floor(moongen:getCyclesFrequency() / txPps) * + math.floor(mg:getCyclesFrequency() / txPps) * params.flowsPerStream * params.burstsPerStream elseif v == "--file-prefix" or v == "-fp" then params.fileprefix = args[i + 1] From 74459debe993984bbd6e16b00237746194e96248 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Wed, 16 Nov 2016 10:28:08 +0200 Subject: [PATCH 05/15] Moved files and folders to temporary client dir --- .gitmodules | 2 +- CMakeLists.txt => client/CMakeLists.txt | 0 Doxyfile => client/Doxyfile | 0 LICENSE => client/LICENSE | 0 README.md => client/README.md | 0 bind-interfaces.sh => client/bind-interfaces.sh | 0 build.sh => client/build.sh | 0 {build => client/build}/.gitignore | 0 {doc => client/doc}/DoxygenLayout.xml | 0 {doc => client/doc}/Slides.pdf | Bin {doc => client/doc}/architecture.md | 0 {doc => client/doc}/documentation.md | 0 {doc => client/doc}/download.md | 0 {doc => client/doc}/examples.md | 0 {doc => client/doc}/faq.md | 0 {doc => client/doc}/img/moongen-architecture.png | Bin {doc => client/doc}/img/moongen-architecture@2x.png | Bin .../doc}/img/ratecontrol-moongen-hardware.png | Bin .../doc}/img/ratecontrol-moongen-hardware@2x.png | Bin .../doc}/img/ratecontrol-moongen-software.png | Bin .../doc}/img/ratecontrol-moongen-software@2x.png | Bin .../doc}/img/ratecontrol-traditional-software.png | Bin .../img/ratecontrol-traditional-software@2x.png | Bin {doc => client/doc}/index.md | 0 {doc => client/doc}/install.md | 0 {doc => client/doc}/packet_api.md | 0 {doc => client/doc}/rate_control.md | 0 {doc => client/doc}/timestamping.md | 0 {examples => client/examples}/benchmark/README.md | 0 .../benchmark/compare-rate-control-mechanisms.lua | 0 .../examples}/benchmark/cycles-per-pkt.lua | 0 .../examples}/benchmark/heavy-workload.lua | 0 .../examples}/benchmark/packet-sizes-rx.lua | 0 .../examples}/benchmark/packet-sizes.lua | 0 .../examples}/benchmark/udp-throughput.lua | 0 {examples => client/examples}/dump.lua | 0 .../examples}/icmp-arp-responder.lua | 0 .../examples}/inter-arrival-times.lua | 0 {examples => client/examples}/ipfix-generation.lua | 0 {examples => client/examples}/l2-bursts.lua | 0 {examples => client/examples}/l2-load-latency.lua | 0 .../examples}/l2-poisson-load-latency.lua | 0 {examples => client/examples}/l3-load-latency.lua | 0 {examples => client/examples}/l3-tcp-syn-flood.lua | 0 {examples => client/examples}/lacp.lua | 0 .../examples}/netronome-packetgen/Readme.txt | 0 .../examples}/netronome-packetgen/packetgen.lua | 0 {examples => client/examples}/pcap/dump-pkts.lua | 0 {examples => client/examples}/pcap/replay-pcap.lua | 0 .../examples}/quality-of-service-test.lua | 0 .../examples}/rate-control-methods.lua | 0 {examples => client/examples}/rss.lua | 0 .../examples}/rx-pkts-distribution.lua | 0 .../examples}/timestamping-tests/README.md | 0 .../examples}/timestamping-tests/drift.lua | 0 .../test-timestamping-capabilities.lua | 0 .../timestamping-tests/timestamps-software.lua | 0 {examples => client/examples}/vxlan-example.lua | 0 libmoon => client/libmoon | 0 {log => client/log}/.gitignore | 0 {lua => client/lua}/crc-ratecontrol.lua | 0 {lua => client/lua}/moongen-compat.lua | 0 {lua => client/lua}/moongen-main.lua | 0 {lua => client/lua}/moongen.lua | 0 {lua => client/lua}/software-ratecontrol.lua | 0 {lua => client/lua}/software-timestamps.lua | 0 {rfc2544 => client/rfc2544}/Makefile | 0 .../rfc2544}/benchmarks/backtoback.lua | 0 .../rfc2544}/benchmarks/frameloss.lua | 0 {rfc2544 => client/rfc2544}/benchmarks/latency.lua | 0 .../rfc2544}/benchmarks/throughput.lua | 0 {rfc2544 => client/rfc2544}/config.lua | 0 {rfc2544 => client/rfc2544}/master.lua | 0 {rfc2544 => client/rfc2544}/utils/Makefile | 0 {rfc2544 => client/rfc2544}/utils/ffi/ssh.lua | 0 {rfc2544 => client/rfc2544}/utils/manual.lua | 0 {rfc2544 => client/rfc2544}/utils/snmp.lua | 0 {rfc2544 => client/rfc2544}/utils/snmpc.c | 0 {rfc2544 => client/rfc2544}/utils/ssh-freebsd.lua | 0 {rfc2544 => client/rfc2544}/utils/ssh-mikrotik.lua | 0 {rfc2544 => client/rfc2544}/utils/ssh.lua | 0 {rfc2544 => client/rfc2544}/utils/testreport.lua | 0 {rfc2544 => client/rfc2544}/utils/tikz.lua | 0 {rfc2544 => client/rfc2544}/utils/utils.lua | 0 setup-hugetlbfs.sh => client/setup-hugetlbfs.sh | 0 {src => client/src}/crc-rate-limiter.c | 0 {src => client/src}/moongen-main.cpp | 0 {src => client/src}/software-rate-limiter.cpp | 0 {src => client/src}/software-timestamping.c | 0 {test => client/test}/.gitignore | 0 {test => client/test}/config/.gitignore | 0 {test => client/test}/config/autoconfig.sh | 0 {test => client/test}/config/devices.lua | 0 {test => client/test}/config/pairs.lua | 0 {test => client/test}/config/speed.lua | 0 {test => client/test}/exec.sh | 0 {test => client/test}/testlib.lua | 0 {test => client/test}/testlog.lua | 0 {test => client/test}/tests/00-basics.lua | 0 {test => client/test}/tests/01-send.lua | 0 {test => client/test}/tests/02-receive.lua | 0 {test => client/test}/tests/03-timestamping.lua | 0 {test => client/test}/tests/04-flowratecontrol.lua | 0 103 files changed, 1 insertion(+), 1 deletion(-) rename CMakeLists.txt => client/CMakeLists.txt (100%) rename Doxyfile => client/Doxyfile (100%) rename LICENSE => client/LICENSE (100%) rename README.md => client/README.md (100%) rename bind-interfaces.sh => client/bind-interfaces.sh (100%) rename build.sh => client/build.sh (100%) rename {build => client/build}/.gitignore (100%) rename {doc => client/doc}/DoxygenLayout.xml (100%) rename {doc => client/doc}/Slides.pdf (100%) rename {doc => client/doc}/architecture.md (100%) rename {doc => client/doc}/documentation.md (100%) rename {doc => client/doc}/download.md (100%) rename {doc => client/doc}/examples.md (100%) rename {doc => client/doc}/faq.md (100%) rename {doc => client/doc}/img/moongen-architecture.png (100%) rename {doc => client/doc}/img/moongen-architecture@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-hardware.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-hardware@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-software.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-software@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-traditional-software.png (100%) rename {doc => client/doc}/img/ratecontrol-traditional-software@2x.png (100%) rename {doc => client/doc}/index.md (100%) rename {doc => client/doc}/install.md (100%) rename {doc => client/doc}/packet_api.md (100%) rename {doc => client/doc}/rate_control.md (100%) rename {doc => client/doc}/timestamping.md (100%) rename {examples => client/examples}/benchmark/README.md (100%) rename {examples => client/examples}/benchmark/compare-rate-control-mechanisms.lua (100%) rename {examples => client/examples}/benchmark/cycles-per-pkt.lua (100%) rename {examples => client/examples}/benchmark/heavy-workload.lua (100%) rename {examples => client/examples}/benchmark/packet-sizes-rx.lua (100%) rename {examples => client/examples}/benchmark/packet-sizes.lua (100%) rename {examples => client/examples}/benchmark/udp-throughput.lua (100%) rename {examples => client/examples}/dump.lua (100%) rename {examples => client/examples}/icmp-arp-responder.lua (100%) rename {examples => client/examples}/inter-arrival-times.lua (100%) rename {examples => client/examples}/ipfix-generation.lua (100%) rename {examples => client/examples}/l2-bursts.lua (100%) rename {examples => client/examples}/l2-load-latency.lua (100%) rename {examples => client/examples}/l2-poisson-load-latency.lua (100%) rename {examples => client/examples}/l3-load-latency.lua (100%) rename {examples => client/examples}/l3-tcp-syn-flood.lua (100%) rename {examples => client/examples}/lacp.lua (100%) rename {examples => client/examples}/netronome-packetgen/Readme.txt (100%) rename {examples => client/examples}/netronome-packetgen/packetgen.lua (100%) rename {examples => client/examples}/pcap/dump-pkts.lua (100%) rename {examples => client/examples}/pcap/replay-pcap.lua (100%) rename {examples => client/examples}/quality-of-service-test.lua (100%) rename {examples => client/examples}/rate-control-methods.lua (100%) rename {examples => client/examples}/rss.lua (100%) rename {examples => client/examples}/rx-pkts-distribution.lua (100%) rename {examples => client/examples}/timestamping-tests/README.md (100%) rename {examples => client/examples}/timestamping-tests/drift.lua (100%) rename {examples => client/examples}/timestamping-tests/test-timestamping-capabilities.lua (100%) rename {examples => client/examples}/timestamping-tests/timestamps-software.lua (100%) rename {examples => client/examples}/vxlan-example.lua (100%) rename libmoon => client/libmoon (100%) rename {log => client/log}/.gitignore (100%) rename {lua => client/lua}/crc-ratecontrol.lua (100%) rename {lua => client/lua}/moongen-compat.lua (100%) rename {lua => client/lua}/moongen-main.lua (100%) rename {lua => client/lua}/moongen.lua (100%) rename {lua => client/lua}/software-ratecontrol.lua (100%) rename {lua => client/lua}/software-timestamps.lua (100%) rename {rfc2544 => client/rfc2544}/Makefile (100%) rename {rfc2544 => client/rfc2544}/benchmarks/backtoback.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/frameloss.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/latency.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/throughput.lua (100%) rename {rfc2544 => client/rfc2544}/config.lua (100%) rename {rfc2544 => client/rfc2544}/master.lua (100%) rename {rfc2544 => client/rfc2544}/utils/Makefile (100%) rename {rfc2544 => client/rfc2544}/utils/ffi/ssh.lua (100%) rename {rfc2544 => client/rfc2544}/utils/manual.lua (100%) rename {rfc2544 => client/rfc2544}/utils/snmp.lua (100%) rename {rfc2544 => client/rfc2544}/utils/snmpc.c (100%) rename {rfc2544 => client/rfc2544}/utils/ssh-freebsd.lua (100%) rename {rfc2544 => client/rfc2544}/utils/ssh-mikrotik.lua (100%) rename {rfc2544 => client/rfc2544}/utils/ssh.lua (100%) rename {rfc2544 => client/rfc2544}/utils/testreport.lua (100%) rename {rfc2544 => client/rfc2544}/utils/tikz.lua (100%) rename {rfc2544 => client/rfc2544}/utils/utils.lua (100%) rename setup-hugetlbfs.sh => client/setup-hugetlbfs.sh (100%) rename {src => client/src}/crc-rate-limiter.c (100%) rename {src => client/src}/moongen-main.cpp (100%) rename {src => client/src}/software-rate-limiter.cpp (100%) rename {src => client/src}/software-timestamping.c (100%) rename {test => client/test}/.gitignore (100%) rename {test => client/test}/config/.gitignore (100%) rename {test => client/test}/config/autoconfig.sh (100%) rename {test => client/test}/config/devices.lua (100%) rename {test => client/test}/config/pairs.lua (100%) rename {test => client/test}/config/speed.lua (100%) rename {test => client/test}/exec.sh (100%) rename {test => client/test}/testlib.lua (100%) rename {test => client/test}/testlog.lua (100%) rename {test => client/test}/tests/00-basics.lua (100%) rename {test => client/test}/tests/01-send.lua (100%) rename {test => client/test}/tests/02-receive.lua (100%) rename {test => client/test}/tests/03-timestamping.lua (100%) rename {test => client/test}/tests/04-flowratecontrol.lua (100%) diff --git a/.gitmodules b/.gitmodules index bcef25b35..4e2330fa1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libmoon"] - path = libmoon + path = client/libmoon url = https://github.com/libmoon/libmoon diff --git a/CMakeLists.txt b/client/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to client/CMakeLists.txt diff --git a/Doxyfile b/client/Doxyfile similarity index 100% rename from Doxyfile rename to client/Doxyfile diff --git a/LICENSE b/client/LICENSE similarity index 100% rename from LICENSE rename to client/LICENSE diff --git a/README.md b/client/README.md similarity index 100% rename from README.md rename to client/README.md diff --git a/bind-interfaces.sh b/client/bind-interfaces.sh similarity index 100% rename from bind-interfaces.sh rename to client/bind-interfaces.sh diff --git a/build.sh b/client/build.sh similarity index 100% rename from build.sh rename to client/build.sh diff --git a/build/.gitignore b/client/build/.gitignore similarity index 100% rename from build/.gitignore rename to client/build/.gitignore diff --git a/doc/DoxygenLayout.xml b/client/doc/DoxygenLayout.xml similarity index 100% rename from doc/DoxygenLayout.xml rename to client/doc/DoxygenLayout.xml diff --git a/doc/Slides.pdf b/client/doc/Slides.pdf similarity index 100% rename from doc/Slides.pdf rename to client/doc/Slides.pdf diff --git a/doc/architecture.md b/client/doc/architecture.md similarity index 100% rename from doc/architecture.md rename to client/doc/architecture.md diff --git a/doc/documentation.md b/client/doc/documentation.md similarity index 100% rename from doc/documentation.md rename to client/doc/documentation.md diff --git a/doc/download.md b/client/doc/download.md similarity index 100% rename from doc/download.md rename to client/doc/download.md diff --git a/doc/examples.md b/client/doc/examples.md similarity index 100% rename from doc/examples.md rename to client/doc/examples.md diff --git a/doc/faq.md b/client/doc/faq.md similarity index 100% rename from doc/faq.md rename to client/doc/faq.md diff --git a/doc/img/moongen-architecture.png b/client/doc/img/moongen-architecture.png similarity index 100% rename from doc/img/moongen-architecture.png rename to client/doc/img/moongen-architecture.png diff --git a/doc/img/moongen-architecture@2x.png b/client/doc/img/moongen-architecture@2x.png similarity index 100% rename from doc/img/moongen-architecture@2x.png rename to client/doc/img/moongen-architecture@2x.png diff --git a/doc/img/ratecontrol-moongen-hardware.png b/client/doc/img/ratecontrol-moongen-hardware.png similarity index 100% rename from doc/img/ratecontrol-moongen-hardware.png rename to client/doc/img/ratecontrol-moongen-hardware.png diff --git a/doc/img/ratecontrol-moongen-hardware@2x.png b/client/doc/img/ratecontrol-moongen-hardware@2x.png similarity index 100% rename from doc/img/ratecontrol-moongen-hardware@2x.png rename to client/doc/img/ratecontrol-moongen-hardware@2x.png diff --git a/doc/img/ratecontrol-moongen-software.png b/client/doc/img/ratecontrol-moongen-software.png similarity index 100% rename from doc/img/ratecontrol-moongen-software.png rename to client/doc/img/ratecontrol-moongen-software.png diff --git a/doc/img/ratecontrol-moongen-software@2x.png b/client/doc/img/ratecontrol-moongen-software@2x.png similarity index 100% rename from doc/img/ratecontrol-moongen-software@2x.png rename to client/doc/img/ratecontrol-moongen-software@2x.png diff --git a/doc/img/ratecontrol-traditional-software.png b/client/doc/img/ratecontrol-traditional-software.png similarity index 100% rename from doc/img/ratecontrol-traditional-software.png rename to client/doc/img/ratecontrol-traditional-software.png diff --git a/doc/img/ratecontrol-traditional-software@2x.png b/client/doc/img/ratecontrol-traditional-software@2x.png similarity index 100% rename from doc/img/ratecontrol-traditional-software@2x.png rename to client/doc/img/ratecontrol-traditional-software@2x.png diff --git a/doc/index.md b/client/doc/index.md similarity index 100% rename from doc/index.md rename to client/doc/index.md diff --git a/doc/install.md b/client/doc/install.md similarity index 100% rename from doc/install.md rename to client/doc/install.md diff --git a/doc/packet_api.md b/client/doc/packet_api.md similarity index 100% rename from doc/packet_api.md rename to client/doc/packet_api.md diff --git a/doc/rate_control.md b/client/doc/rate_control.md similarity index 100% rename from doc/rate_control.md rename to client/doc/rate_control.md diff --git a/doc/timestamping.md b/client/doc/timestamping.md similarity index 100% rename from doc/timestamping.md rename to client/doc/timestamping.md diff --git a/examples/benchmark/README.md b/client/examples/benchmark/README.md similarity index 100% rename from examples/benchmark/README.md rename to client/examples/benchmark/README.md diff --git a/examples/benchmark/compare-rate-control-mechanisms.lua b/client/examples/benchmark/compare-rate-control-mechanisms.lua similarity index 100% rename from examples/benchmark/compare-rate-control-mechanisms.lua rename to client/examples/benchmark/compare-rate-control-mechanisms.lua diff --git a/examples/benchmark/cycles-per-pkt.lua b/client/examples/benchmark/cycles-per-pkt.lua similarity index 100% rename from examples/benchmark/cycles-per-pkt.lua rename to client/examples/benchmark/cycles-per-pkt.lua diff --git a/examples/benchmark/heavy-workload.lua b/client/examples/benchmark/heavy-workload.lua similarity index 100% rename from examples/benchmark/heavy-workload.lua rename to client/examples/benchmark/heavy-workload.lua diff --git a/examples/benchmark/packet-sizes-rx.lua b/client/examples/benchmark/packet-sizes-rx.lua similarity index 100% rename from examples/benchmark/packet-sizes-rx.lua rename to client/examples/benchmark/packet-sizes-rx.lua diff --git a/examples/benchmark/packet-sizes.lua b/client/examples/benchmark/packet-sizes.lua similarity index 100% rename from examples/benchmark/packet-sizes.lua rename to client/examples/benchmark/packet-sizes.lua diff --git a/examples/benchmark/udp-throughput.lua b/client/examples/benchmark/udp-throughput.lua similarity index 100% rename from examples/benchmark/udp-throughput.lua rename to client/examples/benchmark/udp-throughput.lua diff --git a/examples/dump.lua b/client/examples/dump.lua similarity index 100% rename from examples/dump.lua rename to client/examples/dump.lua diff --git a/examples/icmp-arp-responder.lua b/client/examples/icmp-arp-responder.lua similarity index 100% rename from examples/icmp-arp-responder.lua rename to client/examples/icmp-arp-responder.lua diff --git a/examples/inter-arrival-times.lua b/client/examples/inter-arrival-times.lua similarity index 100% rename from examples/inter-arrival-times.lua rename to client/examples/inter-arrival-times.lua diff --git a/examples/ipfix-generation.lua b/client/examples/ipfix-generation.lua similarity index 100% rename from examples/ipfix-generation.lua rename to client/examples/ipfix-generation.lua diff --git a/examples/l2-bursts.lua b/client/examples/l2-bursts.lua similarity index 100% rename from examples/l2-bursts.lua rename to client/examples/l2-bursts.lua diff --git a/examples/l2-load-latency.lua b/client/examples/l2-load-latency.lua similarity index 100% rename from examples/l2-load-latency.lua rename to client/examples/l2-load-latency.lua diff --git a/examples/l2-poisson-load-latency.lua b/client/examples/l2-poisson-load-latency.lua similarity index 100% rename from examples/l2-poisson-load-latency.lua rename to client/examples/l2-poisson-load-latency.lua diff --git a/examples/l3-load-latency.lua b/client/examples/l3-load-latency.lua similarity index 100% rename from examples/l3-load-latency.lua rename to client/examples/l3-load-latency.lua diff --git a/examples/l3-tcp-syn-flood.lua b/client/examples/l3-tcp-syn-flood.lua similarity index 100% rename from examples/l3-tcp-syn-flood.lua rename to client/examples/l3-tcp-syn-flood.lua diff --git a/examples/lacp.lua b/client/examples/lacp.lua similarity index 100% rename from examples/lacp.lua rename to client/examples/lacp.lua diff --git a/examples/netronome-packetgen/Readme.txt b/client/examples/netronome-packetgen/Readme.txt similarity index 100% rename from examples/netronome-packetgen/Readme.txt rename to client/examples/netronome-packetgen/Readme.txt diff --git a/examples/netronome-packetgen/packetgen.lua b/client/examples/netronome-packetgen/packetgen.lua similarity index 100% rename from examples/netronome-packetgen/packetgen.lua rename to client/examples/netronome-packetgen/packetgen.lua diff --git a/examples/pcap/dump-pkts.lua b/client/examples/pcap/dump-pkts.lua similarity index 100% rename from examples/pcap/dump-pkts.lua rename to client/examples/pcap/dump-pkts.lua diff --git a/examples/pcap/replay-pcap.lua b/client/examples/pcap/replay-pcap.lua similarity index 100% rename from examples/pcap/replay-pcap.lua rename to client/examples/pcap/replay-pcap.lua diff --git a/examples/quality-of-service-test.lua b/client/examples/quality-of-service-test.lua similarity index 100% rename from examples/quality-of-service-test.lua rename to client/examples/quality-of-service-test.lua diff --git a/examples/rate-control-methods.lua b/client/examples/rate-control-methods.lua similarity index 100% rename from examples/rate-control-methods.lua rename to client/examples/rate-control-methods.lua diff --git a/examples/rss.lua b/client/examples/rss.lua similarity index 100% rename from examples/rss.lua rename to client/examples/rss.lua diff --git a/examples/rx-pkts-distribution.lua b/client/examples/rx-pkts-distribution.lua similarity index 100% rename from examples/rx-pkts-distribution.lua rename to client/examples/rx-pkts-distribution.lua diff --git a/examples/timestamping-tests/README.md b/client/examples/timestamping-tests/README.md similarity index 100% rename from examples/timestamping-tests/README.md rename to client/examples/timestamping-tests/README.md diff --git a/examples/timestamping-tests/drift.lua b/client/examples/timestamping-tests/drift.lua similarity index 100% rename from examples/timestamping-tests/drift.lua rename to client/examples/timestamping-tests/drift.lua diff --git a/examples/timestamping-tests/test-timestamping-capabilities.lua b/client/examples/timestamping-tests/test-timestamping-capabilities.lua similarity index 100% rename from examples/timestamping-tests/test-timestamping-capabilities.lua rename to client/examples/timestamping-tests/test-timestamping-capabilities.lua diff --git a/examples/timestamping-tests/timestamps-software.lua b/client/examples/timestamping-tests/timestamps-software.lua similarity index 100% rename from examples/timestamping-tests/timestamps-software.lua rename to client/examples/timestamping-tests/timestamps-software.lua diff --git a/examples/vxlan-example.lua b/client/examples/vxlan-example.lua similarity index 100% rename from examples/vxlan-example.lua rename to client/examples/vxlan-example.lua diff --git a/libmoon b/client/libmoon similarity index 100% rename from libmoon rename to client/libmoon diff --git a/log/.gitignore b/client/log/.gitignore similarity index 100% rename from log/.gitignore rename to client/log/.gitignore diff --git a/lua/crc-ratecontrol.lua b/client/lua/crc-ratecontrol.lua similarity index 100% rename from lua/crc-ratecontrol.lua rename to client/lua/crc-ratecontrol.lua diff --git a/lua/moongen-compat.lua b/client/lua/moongen-compat.lua similarity index 100% rename from lua/moongen-compat.lua rename to client/lua/moongen-compat.lua diff --git a/lua/moongen-main.lua b/client/lua/moongen-main.lua similarity index 100% rename from lua/moongen-main.lua rename to client/lua/moongen-main.lua diff --git a/lua/moongen.lua b/client/lua/moongen.lua similarity index 100% rename from lua/moongen.lua rename to client/lua/moongen.lua diff --git a/lua/software-ratecontrol.lua b/client/lua/software-ratecontrol.lua similarity index 100% rename from lua/software-ratecontrol.lua rename to client/lua/software-ratecontrol.lua diff --git a/lua/software-timestamps.lua b/client/lua/software-timestamps.lua similarity index 100% rename from lua/software-timestamps.lua rename to client/lua/software-timestamps.lua diff --git a/rfc2544/Makefile b/client/rfc2544/Makefile similarity index 100% rename from rfc2544/Makefile rename to client/rfc2544/Makefile diff --git a/rfc2544/benchmarks/backtoback.lua b/client/rfc2544/benchmarks/backtoback.lua similarity index 100% rename from rfc2544/benchmarks/backtoback.lua rename to client/rfc2544/benchmarks/backtoback.lua diff --git a/rfc2544/benchmarks/frameloss.lua b/client/rfc2544/benchmarks/frameloss.lua similarity index 100% rename from rfc2544/benchmarks/frameloss.lua rename to client/rfc2544/benchmarks/frameloss.lua diff --git a/rfc2544/benchmarks/latency.lua b/client/rfc2544/benchmarks/latency.lua similarity index 100% rename from rfc2544/benchmarks/latency.lua rename to client/rfc2544/benchmarks/latency.lua diff --git a/rfc2544/benchmarks/throughput.lua b/client/rfc2544/benchmarks/throughput.lua similarity index 100% rename from rfc2544/benchmarks/throughput.lua rename to client/rfc2544/benchmarks/throughput.lua diff --git a/rfc2544/config.lua b/client/rfc2544/config.lua similarity index 100% rename from rfc2544/config.lua rename to client/rfc2544/config.lua diff --git a/rfc2544/master.lua b/client/rfc2544/master.lua similarity index 100% rename from rfc2544/master.lua rename to client/rfc2544/master.lua diff --git a/rfc2544/utils/Makefile b/client/rfc2544/utils/Makefile similarity index 100% rename from rfc2544/utils/Makefile rename to client/rfc2544/utils/Makefile diff --git a/rfc2544/utils/ffi/ssh.lua b/client/rfc2544/utils/ffi/ssh.lua similarity index 100% rename from rfc2544/utils/ffi/ssh.lua rename to client/rfc2544/utils/ffi/ssh.lua diff --git a/rfc2544/utils/manual.lua b/client/rfc2544/utils/manual.lua similarity index 100% rename from rfc2544/utils/manual.lua rename to client/rfc2544/utils/manual.lua diff --git a/rfc2544/utils/snmp.lua b/client/rfc2544/utils/snmp.lua similarity index 100% rename from rfc2544/utils/snmp.lua rename to client/rfc2544/utils/snmp.lua diff --git a/rfc2544/utils/snmpc.c b/client/rfc2544/utils/snmpc.c similarity index 100% rename from rfc2544/utils/snmpc.c rename to client/rfc2544/utils/snmpc.c diff --git a/rfc2544/utils/ssh-freebsd.lua b/client/rfc2544/utils/ssh-freebsd.lua similarity index 100% rename from rfc2544/utils/ssh-freebsd.lua rename to client/rfc2544/utils/ssh-freebsd.lua diff --git a/rfc2544/utils/ssh-mikrotik.lua b/client/rfc2544/utils/ssh-mikrotik.lua similarity index 100% rename from rfc2544/utils/ssh-mikrotik.lua rename to client/rfc2544/utils/ssh-mikrotik.lua diff --git a/rfc2544/utils/ssh.lua b/client/rfc2544/utils/ssh.lua similarity index 100% rename from rfc2544/utils/ssh.lua rename to client/rfc2544/utils/ssh.lua diff --git a/rfc2544/utils/testreport.lua b/client/rfc2544/utils/testreport.lua similarity index 100% rename from rfc2544/utils/testreport.lua rename to client/rfc2544/utils/testreport.lua diff --git a/rfc2544/utils/tikz.lua b/client/rfc2544/utils/tikz.lua similarity index 100% rename from rfc2544/utils/tikz.lua rename to client/rfc2544/utils/tikz.lua diff --git a/rfc2544/utils/utils.lua b/client/rfc2544/utils/utils.lua similarity index 100% rename from rfc2544/utils/utils.lua rename to client/rfc2544/utils/utils.lua diff --git a/setup-hugetlbfs.sh b/client/setup-hugetlbfs.sh similarity index 100% rename from setup-hugetlbfs.sh rename to client/setup-hugetlbfs.sh diff --git a/src/crc-rate-limiter.c b/client/src/crc-rate-limiter.c similarity index 100% rename from src/crc-rate-limiter.c rename to client/src/crc-rate-limiter.c diff --git a/src/moongen-main.cpp b/client/src/moongen-main.cpp similarity index 100% rename from src/moongen-main.cpp rename to client/src/moongen-main.cpp diff --git a/src/software-rate-limiter.cpp b/client/src/software-rate-limiter.cpp similarity index 100% rename from src/software-rate-limiter.cpp rename to client/src/software-rate-limiter.cpp diff --git a/src/software-timestamping.c b/client/src/software-timestamping.c similarity index 100% rename from src/software-timestamping.c rename to client/src/software-timestamping.c diff --git a/test/.gitignore b/client/test/.gitignore similarity index 100% rename from test/.gitignore rename to client/test/.gitignore diff --git a/test/config/.gitignore b/client/test/config/.gitignore similarity index 100% rename from test/config/.gitignore rename to client/test/config/.gitignore diff --git a/test/config/autoconfig.sh b/client/test/config/autoconfig.sh similarity index 100% rename from test/config/autoconfig.sh rename to client/test/config/autoconfig.sh diff --git a/test/config/devices.lua b/client/test/config/devices.lua similarity index 100% rename from test/config/devices.lua rename to client/test/config/devices.lua diff --git a/test/config/pairs.lua b/client/test/config/pairs.lua similarity index 100% rename from test/config/pairs.lua rename to client/test/config/pairs.lua diff --git a/test/config/speed.lua b/client/test/config/speed.lua similarity index 100% rename from test/config/speed.lua rename to client/test/config/speed.lua diff --git a/test/exec.sh b/client/test/exec.sh similarity index 100% rename from test/exec.sh rename to client/test/exec.sh diff --git a/test/testlib.lua b/client/test/testlib.lua similarity index 100% rename from test/testlib.lua rename to client/test/testlib.lua diff --git a/test/testlog.lua b/client/test/testlog.lua similarity index 100% rename from test/testlog.lua rename to client/test/testlog.lua diff --git a/test/tests/00-basics.lua b/client/test/tests/00-basics.lua similarity index 100% rename from test/tests/00-basics.lua rename to client/test/tests/00-basics.lua diff --git a/test/tests/01-send.lua b/client/test/tests/01-send.lua similarity index 100% rename from test/tests/01-send.lua rename to client/test/tests/01-send.lua diff --git a/test/tests/02-receive.lua b/client/test/tests/02-receive.lua similarity index 100% rename from test/tests/02-receive.lua rename to client/test/tests/02-receive.lua diff --git a/test/tests/03-timestamping.lua b/client/test/tests/03-timestamping.lua similarity index 100% rename from test/tests/03-timestamping.lua rename to client/test/tests/03-timestamping.lua diff --git a/test/tests/04-flowratecontrol.lua b/client/test/tests/04-flowratecontrol.lua similarity index 100% rename from test/tests/04-flowratecontrol.lua rename to client/test/tests/04-flowratecontrol.lua From 9f5b8fbe220ebaaf7d29c11c85f4bf9fe3410569 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Wed, 16 Nov 2016 10:34:58 +0200 Subject: [PATCH 06/15] Removed submodule --- .gitmodules | 3 --- client/libmoon | 1 - 2 files changed, 4 deletions(-) delete mode 100644 .gitmodules delete mode 160000 client/libmoon diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4e2330fa1..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libmoon"] - path = client/libmoon - url = https://github.com/libmoon/libmoon diff --git a/client/libmoon b/client/libmoon deleted file mode 160000 index e436c36a6..000000000 --- a/client/libmoon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e436c36a6026a14fe90218c3a3506e00264aaa01 From 521c567c6a1bd219a85f05e5bee12751d99bf5c8 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Wed, 16 Nov 2016 11:09:16 +0200 Subject: [PATCH 07/15] Moved files and folders from temporary client directory to their proper place --- .gitmodules | 3 +++ client/CMakeLists.txt => CMakeLists.txt | 0 client/Doxyfile => Doxyfile | 0 client/LICENSE => LICENSE | 0 client/README.md => README.md | 0 client/bind-interfaces.sh => bind-interfaces.sh | 0 client/build.sh => build.sh | 0 {client/build => build}/.gitignore | 0 {client/doc => doc}/DoxygenLayout.xml | 0 {client/doc => doc}/Slides.pdf | Bin {client/doc => doc}/architecture.md | 0 {client/doc => doc}/documentation.md | 0 {client/doc => doc}/download.md | 0 {client/doc => doc}/examples.md | 0 {client/doc => doc}/faq.md | 0 {client/doc => doc}/img/moongen-architecture.png | Bin {client/doc => doc}/img/moongen-architecture@2x.png | Bin .../img/ratecontrol-moongen-hardware.png | Bin .../img/ratecontrol-moongen-hardware@2x.png | Bin .../img/ratecontrol-moongen-software.png | Bin .../img/ratecontrol-moongen-software@2x.png | Bin .../img/ratecontrol-traditional-software.png | Bin .../img/ratecontrol-traditional-software@2x.png | Bin {client/doc => doc}/index.md | 0 {client/doc => doc}/install.md | 0 {client/doc => doc}/packet_api.md | 0 {client/doc => doc}/rate_control.md | 0 {client/doc => doc}/timestamping.md | 0 {client/examples => examples}/benchmark/README.md | 0 .../benchmark/compare-rate-control-mechanisms.lua | 0 .../benchmark/cycles-per-pkt.lua | 0 .../benchmark/heavy-workload.lua | 0 .../benchmark/packet-sizes-rx.lua | 0 .../benchmark/packet-sizes.lua | 0 .../benchmark/udp-throughput.lua | 0 {client/examples => examples}/dump.lua | 0 .../examples => examples}/icmp-arp-responder.lua | 0 .../examples => examples}/inter-arrival-times.lua | 0 {client/examples => examples}/ipfix-generation.lua | 0 {client/examples => examples}/l2-bursts.lua | 0 {client/examples => examples}/l2-load-latency.lua | 0 .../l2-poisson-load-latency.lua | 0 {client/examples => examples}/l3-load-latency.lua | 0 {client/examples => examples}/l3-tcp-syn-flood.lua | 0 {client/examples => examples}/lacp.lua | 0 .../netronome-packetgen/Readme.txt | 0 .../netronome-packetgen/packetgen.lua | 0 {client/examples => examples}/pcap/dump-pkts.lua | 0 {client/examples => examples}/pcap/replay-pcap.lua | 0 .../quality-of-service-test.lua | 0 .../examples => examples}/rate-control-methods.lua | 0 {client/examples => examples}/rss.lua | 0 .../examples => examples}/rx-pkts-distribution.lua | 0 .../timestamping-tests/README.md | 0 .../timestamping-tests/drift.lua | 0 .../test-timestamping-capabilities.lua | 0 .../timestamping-tests/timestamps-software.lua | 0 {client/examples => examples}/vxlan-example.lua | 0 {client/log => log}/.gitignore | 0 {client/lua => lua}/crc-ratecontrol.lua | 0 {client/lua => lua}/moongen-compat.lua | 0 {client/lua => lua}/moongen-main.lua | 0 {client/lua => lua}/moongen.lua | 0 {client/lua => lua}/software-ratecontrol.lua | 0 {client/lua => lua}/software-timestamps.lua | 0 {client/rfc2544 => rfc2544}/Makefile | 0 .../rfc2544 => rfc2544}/benchmarks/backtoback.lua | 0 .../rfc2544 => rfc2544}/benchmarks/frameloss.lua | 0 {client/rfc2544 => rfc2544}/benchmarks/latency.lua | 0 .../rfc2544 => rfc2544}/benchmarks/throughput.lua | 0 {client/rfc2544 => rfc2544}/config.lua | 0 {client/rfc2544 => rfc2544}/master.lua | 0 {client/rfc2544 => rfc2544}/utils/Makefile | 0 {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua | 0 {client/rfc2544 => rfc2544}/utils/manual.lua | 0 {client/rfc2544 => rfc2544}/utils/snmp.lua | 0 {client/rfc2544 => rfc2544}/utils/snmpc.c | 0 {client/rfc2544 => rfc2544}/utils/ssh-freebsd.lua | 0 {client/rfc2544 => rfc2544}/utils/ssh-mikrotik.lua | 0 {client/rfc2544 => rfc2544}/utils/ssh.lua | 0 {client/rfc2544 => rfc2544}/utils/testreport.lua | 0 {client/rfc2544 => rfc2544}/utils/tikz.lua | 0 {client/rfc2544 => rfc2544}/utils/utils.lua | 0 client/setup-hugetlbfs.sh => setup-hugetlbfs.sh | 0 {client/src => src}/crc-rate-limiter.c | 0 {client/src => src}/moongen-main.cpp | 0 {client/src => src}/software-rate-limiter.cpp | 0 {client/src => src}/software-timestamping.c | 0 {client/test => test}/.gitignore | 0 {client/test => test}/config/.gitignore | 0 {client/test => test}/config/autoconfig.sh | 0 {client/test => test}/config/devices.lua | 0 {client/test => test}/config/pairs.lua | 0 {client/test => test}/config/speed.lua | 0 {client/test => test}/exec.sh | 0 {client/test => test}/testlib.lua | 0 {client/test => test}/testlog.lua | 0 {client/test => test}/tests/00-basics.lua | 0 {client/test => test}/tests/01-send.lua | 0 {client/test => test}/tests/02-receive.lua | 0 {client/test => test}/tests/03-timestamping.lua | 0 {client/test => test}/tests/04-flowratecontrol.lua | 0 102 files changed, 3 insertions(+) create mode 100644 .gitmodules rename client/CMakeLists.txt => CMakeLists.txt (100%) rename client/Doxyfile => Doxyfile (100%) rename client/LICENSE => LICENSE (100%) rename client/README.md => README.md (100%) rename client/bind-interfaces.sh => bind-interfaces.sh (100%) rename client/build.sh => build.sh (100%) rename {client/build => build}/.gitignore (100%) rename {client/doc => doc}/DoxygenLayout.xml (100%) rename {client/doc => doc}/Slides.pdf (100%) rename {client/doc => doc}/architecture.md (100%) rename {client/doc => doc}/documentation.md (100%) rename {client/doc => doc}/download.md (100%) rename {client/doc => doc}/examples.md (100%) rename {client/doc => doc}/faq.md (100%) rename {client/doc => doc}/img/moongen-architecture.png (100%) rename {client/doc => doc}/img/moongen-architecture@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software@2x.png (100%) rename {client/doc => doc}/index.md (100%) rename {client/doc => doc}/install.md (100%) rename {client/doc => doc}/packet_api.md (100%) rename {client/doc => doc}/rate_control.md (100%) rename {client/doc => doc}/timestamping.md (100%) rename {client/examples => examples}/benchmark/README.md (100%) rename {client/examples => examples}/benchmark/compare-rate-control-mechanisms.lua (100%) rename {client/examples => examples}/benchmark/cycles-per-pkt.lua (100%) rename {client/examples => examples}/benchmark/heavy-workload.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes-rx.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes.lua (100%) rename {client/examples => examples}/benchmark/udp-throughput.lua (100%) rename {client/examples => examples}/dump.lua (100%) rename {client/examples => examples}/icmp-arp-responder.lua (100%) rename {client/examples => examples}/inter-arrival-times.lua (100%) rename {client/examples => examples}/ipfix-generation.lua (100%) rename {client/examples => examples}/l2-bursts.lua (100%) rename {client/examples => examples}/l2-load-latency.lua (100%) rename {client/examples => examples}/l2-poisson-load-latency.lua (100%) rename {client/examples => examples}/l3-load-latency.lua (100%) rename {client/examples => examples}/l3-tcp-syn-flood.lua (100%) rename {client/examples => examples}/lacp.lua (100%) rename {client/examples => examples}/netronome-packetgen/Readme.txt (100%) rename {client/examples => examples}/netronome-packetgen/packetgen.lua (100%) rename {client/examples => examples}/pcap/dump-pkts.lua (100%) rename {client/examples => examples}/pcap/replay-pcap.lua (100%) rename {client/examples => examples}/quality-of-service-test.lua (100%) rename {client/examples => examples}/rate-control-methods.lua (100%) rename {client/examples => examples}/rss.lua (100%) rename {client/examples => examples}/rx-pkts-distribution.lua (100%) rename {client/examples => examples}/timestamping-tests/README.md (100%) rename {client/examples => examples}/timestamping-tests/drift.lua (100%) rename {client/examples => examples}/timestamping-tests/test-timestamping-capabilities.lua (100%) rename {client/examples => examples}/timestamping-tests/timestamps-software.lua (100%) rename {client/examples => examples}/vxlan-example.lua (100%) rename {client/log => log}/.gitignore (100%) rename {client/lua => lua}/crc-ratecontrol.lua (100%) rename {client/lua => lua}/moongen-compat.lua (100%) rename {client/lua => lua}/moongen-main.lua (100%) rename {client/lua => lua}/moongen.lua (100%) rename {client/lua => lua}/software-ratecontrol.lua (100%) rename {client/lua => lua}/software-timestamps.lua (100%) rename {client/rfc2544 => rfc2544}/Makefile (100%) rename {client/rfc2544 => rfc2544}/benchmarks/backtoback.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/frameloss.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/latency.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/throughput.lua (100%) rename {client/rfc2544 => rfc2544}/config.lua (100%) rename {client/rfc2544 => rfc2544}/master.lua (100%) rename {client/rfc2544 => rfc2544}/utils/Makefile (100%) rename {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/manual.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmp.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmpc.c (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-freebsd.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-mikrotik.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/testreport.lua (100%) rename {client/rfc2544 => rfc2544}/utils/tikz.lua (100%) rename {client/rfc2544 => rfc2544}/utils/utils.lua (100%) rename client/setup-hugetlbfs.sh => setup-hugetlbfs.sh (100%) rename {client/src => src}/crc-rate-limiter.c (100%) rename {client/src => src}/moongen-main.cpp (100%) rename {client/src => src}/software-rate-limiter.cpp (100%) rename {client/src => src}/software-timestamping.c (100%) rename {client/test => test}/.gitignore (100%) rename {client/test => test}/config/.gitignore (100%) rename {client/test => test}/config/autoconfig.sh (100%) rename {client/test => test}/config/devices.lua (100%) rename {client/test => test}/config/pairs.lua (100%) rename {client/test => test}/config/speed.lua (100%) rename {client/test => test}/exec.sh (100%) rename {client/test => test}/testlib.lua (100%) rename {client/test => test}/testlog.lua (100%) rename {client/test => test}/tests/00-basics.lua (100%) rename {client/test => test}/tests/01-send.lua (100%) rename {client/test => test}/tests/02-receive.lua (100%) rename {client/test => test}/tests/03-timestamping.lua (100%) rename {client/test => test}/tests/04-flowratecontrol.lua (100%) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..bcef25b35 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libmoon"] + path = libmoon + url = https://github.com/libmoon/libmoon diff --git a/client/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from client/CMakeLists.txt rename to CMakeLists.txt diff --git a/client/Doxyfile b/Doxyfile similarity index 100% rename from client/Doxyfile rename to Doxyfile diff --git a/client/LICENSE b/LICENSE similarity index 100% rename from client/LICENSE rename to LICENSE diff --git a/client/README.md b/README.md similarity index 100% rename from client/README.md rename to README.md diff --git a/client/bind-interfaces.sh b/bind-interfaces.sh similarity index 100% rename from client/bind-interfaces.sh rename to bind-interfaces.sh diff --git a/client/build.sh b/build.sh similarity index 100% rename from client/build.sh rename to build.sh diff --git a/client/build/.gitignore b/build/.gitignore similarity index 100% rename from client/build/.gitignore rename to build/.gitignore diff --git a/client/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml similarity index 100% rename from client/doc/DoxygenLayout.xml rename to doc/DoxygenLayout.xml diff --git a/client/doc/Slides.pdf b/doc/Slides.pdf similarity index 100% rename from client/doc/Slides.pdf rename to doc/Slides.pdf diff --git a/client/doc/architecture.md b/doc/architecture.md similarity index 100% rename from client/doc/architecture.md rename to doc/architecture.md diff --git a/client/doc/documentation.md b/doc/documentation.md similarity index 100% rename from client/doc/documentation.md rename to doc/documentation.md diff --git a/client/doc/download.md b/doc/download.md similarity index 100% rename from client/doc/download.md rename to doc/download.md diff --git a/client/doc/examples.md b/doc/examples.md similarity index 100% rename from client/doc/examples.md rename to doc/examples.md diff --git a/client/doc/faq.md b/doc/faq.md similarity index 100% rename from client/doc/faq.md rename to doc/faq.md diff --git a/client/doc/img/moongen-architecture.png b/doc/img/moongen-architecture.png similarity index 100% rename from client/doc/img/moongen-architecture.png rename to doc/img/moongen-architecture.png diff --git a/client/doc/img/moongen-architecture@2x.png b/doc/img/moongen-architecture@2x.png similarity index 100% rename from client/doc/img/moongen-architecture@2x.png rename to doc/img/moongen-architecture@2x.png diff --git a/client/doc/img/ratecontrol-moongen-hardware.png b/doc/img/ratecontrol-moongen-hardware.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware.png rename to doc/img/ratecontrol-moongen-hardware.png diff --git a/client/doc/img/ratecontrol-moongen-hardware@2x.png b/doc/img/ratecontrol-moongen-hardware@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware@2x.png rename to doc/img/ratecontrol-moongen-hardware@2x.png diff --git a/client/doc/img/ratecontrol-moongen-software.png b/doc/img/ratecontrol-moongen-software.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software.png rename to doc/img/ratecontrol-moongen-software.png diff --git a/client/doc/img/ratecontrol-moongen-software@2x.png b/doc/img/ratecontrol-moongen-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software@2x.png rename to doc/img/ratecontrol-moongen-software@2x.png diff --git a/client/doc/img/ratecontrol-traditional-software.png b/doc/img/ratecontrol-traditional-software.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software.png rename to doc/img/ratecontrol-traditional-software.png diff --git a/client/doc/img/ratecontrol-traditional-software@2x.png b/doc/img/ratecontrol-traditional-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software@2x.png rename to doc/img/ratecontrol-traditional-software@2x.png diff --git a/client/doc/index.md b/doc/index.md similarity index 100% rename from client/doc/index.md rename to doc/index.md diff --git a/client/doc/install.md b/doc/install.md similarity index 100% rename from client/doc/install.md rename to doc/install.md diff --git a/client/doc/packet_api.md b/doc/packet_api.md similarity index 100% rename from client/doc/packet_api.md rename to doc/packet_api.md diff --git a/client/doc/rate_control.md b/doc/rate_control.md similarity index 100% rename from client/doc/rate_control.md rename to doc/rate_control.md diff --git a/client/doc/timestamping.md b/doc/timestamping.md similarity index 100% rename from client/doc/timestamping.md rename to doc/timestamping.md diff --git a/client/examples/benchmark/README.md b/examples/benchmark/README.md similarity index 100% rename from client/examples/benchmark/README.md rename to examples/benchmark/README.md diff --git a/client/examples/benchmark/compare-rate-control-mechanisms.lua b/examples/benchmark/compare-rate-control-mechanisms.lua similarity index 100% rename from client/examples/benchmark/compare-rate-control-mechanisms.lua rename to examples/benchmark/compare-rate-control-mechanisms.lua diff --git a/client/examples/benchmark/cycles-per-pkt.lua b/examples/benchmark/cycles-per-pkt.lua similarity index 100% rename from client/examples/benchmark/cycles-per-pkt.lua rename to examples/benchmark/cycles-per-pkt.lua diff --git a/client/examples/benchmark/heavy-workload.lua b/examples/benchmark/heavy-workload.lua similarity index 100% rename from client/examples/benchmark/heavy-workload.lua rename to examples/benchmark/heavy-workload.lua diff --git a/client/examples/benchmark/packet-sizes-rx.lua b/examples/benchmark/packet-sizes-rx.lua similarity index 100% rename from client/examples/benchmark/packet-sizes-rx.lua rename to examples/benchmark/packet-sizes-rx.lua diff --git a/client/examples/benchmark/packet-sizes.lua b/examples/benchmark/packet-sizes.lua similarity index 100% rename from client/examples/benchmark/packet-sizes.lua rename to examples/benchmark/packet-sizes.lua diff --git a/client/examples/benchmark/udp-throughput.lua b/examples/benchmark/udp-throughput.lua similarity index 100% rename from client/examples/benchmark/udp-throughput.lua rename to examples/benchmark/udp-throughput.lua diff --git a/client/examples/dump.lua b/examples/dump.lua similarity index 100% rename from client/examples/dump.lua rename to examples/dump.lua diff --git a/client/examples/icmp-arp-responder.lua b/examples/icmp-arp-responder.lua similarity index 100% rename from client/examples/icmp-arp-responder.lua rename to examples/icmp-arp-responder.lua diff --git a/client/examples/inter-arrival-times.lua b/examples/inter-arrival-times.lua similarity index 100% rename from client/examples/inter-arrival-times.lua rename to examples/inter-arrival-times.lua diff --git a/client/examples/ipfix-generation.lua b/examples/ipfix-generation.lua similarity index 100% rename from client/examples/ipfix-generation.lua rename to examples/ipfix-generation.lua diff --git a/client/examples/l2-bursts.lua b/examples/l2-bursts.lua similarity index 100% rename from client/examples/l2-bursts.lua rename to examples/l2-bursts.lua diff --git a/client/examples/l2-load-latency.lua b/examples/l2-load-latency.lua similarity index 100% rename from client/examples/l2-load-latency.lua rename to examples/l2-load-latency.lua diff --git a/client/examples/l2-poisson-load-latency.lua b/examples/l2-poisson-load-latency.lua similarity index 100% rename from client/examples/l2-poisson-load-latency.lua rename to examples/l2-poisson-load-latency.lua diff --git a/client/examples/l3-load-latency.lua b/examples/l3-load-latency.lua similarity index 100% rename from client/examples/l3-load-latency.lua rename to examples/l3-load-latency.lua diff --git a/client/examples/l3-tcp-syn-flood.lua b/examples/l3-tcp-syn-flood.lua similarity index 100% rename from client/examples/l3-tcp-syn-flood.lua rename to examples/l3-tcp-syn-flood.lua diff --git a/client/examples/lacp.lua b/examples/lacp.lua similarity index 100% rename from client/examples/lacp.lua rename to examples/lacp.lua diff --git a/client/examples/netronome-packetgen/Readme.txt b/examples/netronome-packetgen/Readme.txt similarity index 100% rename from client/examples/netronome-packetgen/Readme.txt rename to examples/netronome-packetgen/Readme.txt diff --git a/client/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua similarity index 100% rename from client/examples/netronome-packetgen/packetgen.lua rename to examples/netronome-packetgen/packetgen.lua diff --git a/client/examples/pcap/dump-pkts.lua b/examples/pcap/dump-pkts.lua similarity index 100% rename from client/examples/pcap/dump-pkts.lua rename to examples/pcap/dump-pkts.lua diff --git a/client/examples/pcap/replay-pcap.lua b/examples/pcap/replay-pcap.lua similarity index 100% rename from client/examples/pcap/replay-pcap.lua rename to examples/pcap/replay-pcap.lua diff --git a/client/examples/quality-of-service-test.lua b/examples/quality-of-service-test.lua similarity index 100% rename from client/examples/quality-of-service-test.lua rename to examples/quality-of-service-test.lua diff --git a/client/examples/rate-control-methods.lua b/examples/rate-control-methods.lua similarity index 100% rename from client/examples/rate-control-methods.lua rename to examples/rate-control-methods.lua diff --git a/client/examples/rss.lua b/examples/rss.lua similarity index 100% rename from client/examples/rss.lua rename to examples/rss.lua diff --git a/client/examples/rx-pkts-distribution.lua b/examples/rx-pkts-distribution.lua similarity index 100% rename from client/examples/rx-pkts-distribution.lua rename to examples/rx-pkts-distribution.lua diff --git a/client/examples/timestamping-tests/README.md b/examples/timestamping-tests/README.md similarity index 100% rename from client/examples/timestamping-tests/README.md rename to examples/timestamping-tests/README.md diff --git a/client/examples/timestamping-tests/drift.lua b/examples/timestamping-tests/drift.lua similarity index 100% rename from client/examples/timestamping-tests/drift.lua rename to examples/timestamping-tests/drift.lua diff --git a/client/examples/timestamping-tests/test-timestamping-capabilities.lua b/examples/timestamping-tests/test-timestamping-capabilities.lua similarity index 100% rename from client/examples/timestamping-tests/test-timestamping-capabilities.lua rename to examples/timestamping-tests/test-timestamping-capabilities.lua diff --git a/client/examples/timestamping-tests/timestamps-software.lua b/examples/timestamping-tests/timestamps-software.lua similarity index 100% rename from client/examples/timestamping-tests/timestamps-software.lua rename to examples/timestamping-tests/timestamps-software.lua diff --git a/client/examples/vxlan-example.lua b/examples/vxlan-example.lua similarity index 100% rename from client/examples/vxlan-example.lua rename to examples/vxlan-example.lua diff --git a/client/log/.gitignore b/log/.gitignore similarity index 100% rename from client/log/.gitignore rename to log/.gitignore diff --git a/client/lua/crc-ratecontrol.lua b/lua/crc-ratecontrol.lua similarity index 100% rename from client/lua/crc-ratecontrol.lua rename to lua/crc-ratecontrol.lua diff --git a/client/lua/moongen-compat.lua b/lua/moongen-compat.lua similarity index 100% rename from client/lua/moongen-compat.lua rename to lua/moongen-compat.lua diff --git a/client/lua/moongen-main.lua b/lua/moongen-main.lua similarity index 100% rename from client/lua/moongen-main.lua rename to lua/moongen-main.lua diff --git a/client/lua/moongen.lua b/lua/moongen.lua similarity index 100% rename from client/lua/moongen.lua rename to lua/moongen.lua diff --git a/client/lua/software-ratecontrol.lua b/lua/software-ratecontrol.lua similarity index 100% rename from client/lua/software-ratecontrol.lua rename to lua/software-ratecontrol.lua diff --git a/client/lua/software-timestamps.lua b/lua/software-timestamps.lua similarity index 100% rename from client/lua/software-timestamps.lua rename to lua/software-timestamps.lua diff --git a/client/rfc2544/Makefile b/rfc2544/Makefile similarity index 100% rename from client/rfc2544/Makefile rename to rfc2544/Makefile diff --git a/client/rfc2544/benchmarks/backtoback.lua b/rfc2544/benchmarks/backtoback.lua similarity index 100% rename from client/rfc2544/benchmarks/backtoback.lua rename to rfc2544/benchmarks/backtoback.lua diff --git a/client/rfc2544/benchmarks/frameloss.lua b/rfc2544/benchmarks/frameloss.lua similarity index 100% rename from client/rfc2544/benchmarks/frameloss.lua rename to rfc2544/benchmarks/frameloss.lua diff --git a/client/rfc2544/benchmarks/latency.lua b/rfc2544/benchmarks/latency.lua similarity index 100% rename from client/rfc2544/benchmarks/latency.lua rename to rfc2544/benchmarks/latency.lua diff --git a/client/rfc2544/benchmarks/throughput.lua b/rfc2544/benchmarks/throughput.lua similarity index 100% rename from client/rfc2544/benchmarks/throughput.lua rename to rfc2544/benchmarks/throughput.lua diff --git a/client/rfc2544/config.lua b/rfc2544/config.lua similarity index 100% rename from client/rfc2544/config.lua rename to rfc2544/config.lua diff --git a/client/rfc2544/master.lua b/rfc2544/master.lua similarity index 100% rename from client/rfc2544/master.lua rename to rfc2544/master.lua diff --git a/client/rfc2544/utils/Makefile b/rfc2544/utils/Makefile similarity index 100% rename from client/rfc2544/utils/Makefile rename to rfc2544/utils/Makefile diff --git a/client/rfc2544/utils/ffi/ssh.lua b/rfc2544/utils/ffi/ssh.lua similarity index 100% rename from client/rfc2544/utils/ffi/ssh.lua rename to rfc2544/utils/ffi/ssh.lua diff --git a/client/rfc2544/utils/manual.lua b/rfc2544/utils/manual.lua similarity index 100% rename from client/rfc2544/utils/manual.lua rename to rfc2544/utils/manual.lua diff --git a/client/rfc2544/utils/snmp.lua b/rfc2544/utils/snmp.lua similarity index 100% rename from client/rfc2544/utils/snmp.lua rename to rfc2544/utils/snmp.lua diff --git a/client/rfc2544/utils/snmpc.c b/rfc2544/utils/snmpc.c similarity index 100% rename from client/rfc2544/utils/snmpc.c rename to rfc2544/utils/snmpc.c diff --git a/client/rfc2544/utils/ssh-freebsd.lua b/rfc2544/utils/ssh-freebsd.lua similarity index 100% rename from client/rfc2544/utils/ssh-freebsd.lua rename to rfc2544/utils/ssh-freebsd.lua diff --git a/client/rfc2544/utils/ssh-mikrotik.lua b/rfc2544/utils/ssh-mikrotik.lua similarity index 100% rename from client/rfc2544/utils/ssh-mikrotik.lua rename to rfc2544/utils/ssh-mikrotik.lua diff --git a/client/rfc2544/utils/ssh.lua b/rfc2544/utils/ssh.lua similarity index 100% rename from client/rfc2544/utils/ssh.lua rename to rfc2544/utils/ssh.lua diff --git a/client/rfc2544/utils/testreport.lua b/rfc2544/utils/testreport.lua similarity index 100% rename from client/rfc2544/utils/testreport.lua rename to rfc2544/utils/testreport.lua diff --git a/client/rfc2544/utils/tikz.lua b/rfc2544/utils/tikz.lua similarity index 100% rename from client/rfc2544/utils/tikz.lua rename to rfc2544/utils/tikz.lua diff --git a/client/rfc2544/utils/utils.lua b/rfc2544/utils/utils.lua similarity index 100% rename from client/rfc2544/utils/utils.lua rename to rfc2544/utils/utils.lua diff --git a/client/setup-hugetlbfs.sh b/setup-hugetlbfs.sh similarity index 100% rename from client/setup-hugetlbfs.sh rename to setup-hugetlbfs.sh diff --git a/client/src/crc-rate-limiter.c b/src/crc-rate-limiter.c similarity index 100% rename from client/src/crc-rate-limiter.c rename to src/crc-rate-limiter.c diff --git a/client/src/moongen-main.cpp b/src/moongen-main.cpp similarity index 100% rename from client/src/moongen-main.cpp rename to src/moongen-main.cpp diff --git a/client/src/software-rate-limiter.cpp b/src/software-rate-limiter.cpp similarity index 100% rename from client/src/software-rate-limiter.cpp rename to src/software-rate-limiter.cpp diff --git a/client/src/software-timestamping.c b/src/software-timestamping.c similarity index 100% rename from client/src/software-timestamping.c rename to src/software-timestamping.c diff --git a/client/test/.gitignore b/test/.gitignore similarity index 100% rename from client/test/.gitignore rename to test/.gitignore diff --git a/client/test/config/.gitignore b/test/config/.gitignore similarity index 100% rename from client/test/config/.gitignore rename to test/config/.gitignore diff --git a/client/test/config/autoconfig.sh b/test/config/autoconfig.sh similarity index 100% rename from client/test/config/autoconfig.sh rename to test/config/autoconfig.sh diff --git a/client/test/config/devices.lua b/test/config/devices.lua similarity index 100% rename from client/test/config/devices.lua rename to test/config/devices.lua diff --git a/client/test/config/pairs.lua b/test/config/pairs.lua similarity index 100% rename from client/test/config/pairs.lua rename to test/config/pairs.lua diff --git a/client/test/config/speed.lua b/test/config/speed.lua similarity index 100% rename from client/test/config/speed.lua rename to test/config/speed.lua diff --git a/client/test/exec.sh b/test/exec.sh similarity index 100% rename from client/test/exec.sh rename to test/exec.sh diff --git a/client/test/testlib.lua b/test/testlib.lua similarity index 100% rename from client/test/testlib.lua rename to test/testlib.lua diff --git a/client/test/testlog.lua b/test/testlog.lua similarity index 100% rename from client/test/testlog.lua rename to test/testlog.lua diff --git a/client/test/tests/00-basics.lua b/test/tests/00-basics.lua similarity index 100% rename from client/test/tests/00-basics.lua rename to test/tests/00-basics.lua diff --git a/client/test/tests/01-send.lua b/test/tests/01-send.lua similarity index 100% rename from client/test/tests/01-send.lua rename to test/tests/01-send.lua diff --git a/client/test/tests/02-receive.lua b/test/tests/02-receive.lua similarity index 100% rename from client/test/tests/02-receive.lua rename to test/tests/02-receive.lua diff --git a/client/test/tests/03-timestamping.lua b/test/tests/03-timestamping.lua similarity index 100% rename from client/test/tests/03-timestamping.lua rename to test/tests/03-timestamping.lua diff --git a/client/test/tests/04-flowratecontrol.lua b/test/tests/04-flowratecontrol.lua similarity index 100% rename from client/test/tests/04-flowratecontrol.lua rename to test/tests/04-flowratecontrol.lua From aff3baa2a26cbb5d2b59cd0a6ccc8ad4d0c95d22 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Wed, 16 Nov 2016 11:13:59 +0200 Subject: [PATCH 08/15] Updated packetgen to accomodate changes to MoonGen --- examples/netronome-packetgen/packetgen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua index 7bf1679a2..42cd99c93 100644 --- a/examples/netronome-packetgen/packetgen.lua +++ b/examples/netronome-packetgen/packetgen.lua @@ -1,4 +1,4 @@ ---[[ +--[[ Copyright (C) 2016 Netronome Systems, Inc. All rights reserved. From 9f2ee090238987a66cffd6318366f3d6494c381c Mon Sep 17 00:00:00 2001 From: Netronome-moongen Date: Mon, 14 Nov 2016 12:03:00 +0200 Subject: [PATCH 09/15] Updated to match vanilla MoonGen Add files via upload Removed submodule Moved files and folders from temporary client directory to their proper place Updated packetgen to accomodate changes to MoonGen --- .gitmodules | 2 +- client/CMakeLists.txt => CMakeLists.txt | 0 client/Doxyfile => Doxyfile | 0 client/LICENSE => LICENSE | 0 client/README.md => README.md | 0 .../bind-interfaces.sh => bind-interfaces.sh | 0 client/build.sh => build.sh | 0 {client/build => build}/.gitignore | 0 client/libmoon | 1 - {client/doc => doc}/DoxygenLayout.xml | 0 {client/doc => doc}/Slides.pdf | Bin {client/doc => doc}/architecture.md | 0 {client/doc => doc}/documentation.md | 0 {client/doc => doc}/download.md | 0 {client/doc => doc}/examples.md | 0 {client/doc => doc}/faq.md | 0 .../doc => doc}/img/moongen-architecture.png | Bin .../img/moongen-architecture@2x.png | Bin .../img/ratecontrol-moongen-hardware.png | Bin .../img/ratecontrol-moongen-hardware@2x.png | Bin .../img/ratecontrol-moongen-software.png | Bin .../img/ratecontrol-moongen-software@2x.png | Bin .../img/ratecontrol-traditional-software.png | Bin .../ratecontrol-traditional-software@2x.png | Bin {client/doc => doc}/index.md | 0 {client/doc => doc}/install.md | 0 {client/doc => doc}/packet_api.md | 0 {client/doc => doc}/rate_control.md | 0 {client/doc => doc}/timestamping.md | 0 .../examples => examples}/benchmark/README.md | 0 .../compare-rate-control-mechanisms.lua | 0 .../benchmark/cycles-per-pkt.lua | 0 .../benchmark/heavy-workload.lua | 0 .../benchmark/packet-sizes-rx.lua | 0 .../benchmark/packet-sizes.lua | 0 .../benchmark/udp-throughput.lua | 0 {client/examples => examples}/dump.lua | 0 .../icmp-arp-responder.lua | 0 .../inter-arrival-times.lua | 0 .../ipfix-generation.lua | 0 {client/examples => examples}/l2-bursts.lua | 0 .../examples => examples}/l2-load-latency.lua | 0 .../l2-poisson-load-latency.lua | 0 .../examples => examples}/l3-load-latency.lua | 0 .../l3-tcp-syn-flood.lua | 0 {client/examples => examples}/lacp.lua | 0 .../netronome-packetgen/Readme.txt | 0 .../netronome-packetgen/packetgen.lua | 70 +++++++++--------- .../examples => examples}/pcap/dump-pkts.lua | 0 .../pcap/replay-pcap.lua | 0 .../quality-of-service-test.lua | 0 .../rate-control-methods.lua | 0 {client/examples => examples}/rss.lua | 0 .../rx-pkts-distribution.lua | 0 .../timestamping-tests/README.md | 0 .../timestamping-tests/drift.lua | 0 .../test-timestamping-capabilities.lua | 0 .../timestamps-software.lua | 0 .../examples => examples}/vxlan-example.lua | 0 {client/log => log}/.gitignore | 0 {client/lua => lua}/crc-ratecontrol.lua | 0 {client/lua => lua}/moongen-compat.lua | 0 {client/lua => lua}/moongen-main.lua | 0 {client/lua => lua}/moongen.lua | 0 {client/lua => lua}/software-ratecontrol.lua | 0 {client/lua => lua}/software-timestamps.lua | 0 {client/rfc2544 => rfc2544}/Makefile | 0 .../benchmarks/backtoback.lua | 0 .../benchmarks/frameloss.lua | 0 .../benchmarks/latency.lua | 0 .../benchmarks/throughput.lua | 0 {client/rfc2544 => rfc2544}/config.lua | 0 {client/rfc2544 => rfc2544}/master.lua | 0 {client/rfc2544 => rfc2544}/utils/Makefile | 0 {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua | 0 {client/rfc2544 => rfc2544}/utils/manual.lua | 0 {client/rfc2544 => rfc2544}/utils/snmp.lua | 0 {client/rfc2544 => rfc2544}/utils/snmpc.c | 0 .../rfc2544 => rfc2544}/utils/ssh-freebsd.lua | 0 .../utils/ssh-mikrotik.lua | 0 {client/rfc2544 => rfc2544}/utils/ssh.lua | 0 .../rfc2544 => rfc2544}/utils/testreport.lua | 0 {client/rfc2544 => rfc2544}/utils/tikz.lua | 0 {client/rfc2544 => rfc2544}/utils/utils.lua | 0 .../setup-hugetlbfs.sh => setup-hugetlbfs.sh | 0 {client/src => src}/crc-rate-limiter.c | 0 {client/src => src}/moongen-main.cpp | 0 {client/src => src}/software-rate-limiter.cpp | 0 {client/src => src}/software-timestamping.c | 0 {client/test => test}/.gitignore | 0 {client/test => test}/config/.gitignore | 0 {client/test => test}/config/autoconfig.sh | 0 {client/test => test}/config/devices.lua | 0 {client/test => test}/config/pairs.lua | 0 {client/test => test}/config/speed.lua | 0 {client/test => test}/exec.sh | 0 {client/test => test}/testlib.lua | 0 {client/test => test}/testlog.lua | 0 {client/test => test}/tests/00-basics.lua | 0 {client/test => test}/tests/01-send.lua | 0 {client/test => test}/tests/02-receive.lua | 0 .../test => test}/tests/03-timestamping.lua | 0 .../tests/04-flowratecontrol.lua | 0 103 files changed, 36 insertions(+), 37 deletions(-) rename client/CMakeLists.txt => CMakeLists.txt (100%) rename client/Doxyfile => Doxyfile (100%) rename client/LICENSE => LICENSE (100%) rename client/README.md => README.md (100%) rename client/bind-interfaces.sh => bind-interfaces.sh (100%) rename client/build.sh => build.sh (100%) rename {client/build => build}/.gitignore (100%) delete mode 160000 client/libmoon rename {client/doc => doc}/DoxygenLayout.xml (100%) rename {client/doc => doc}/Slides.pdf (100%) rename {client/doc => doc}/architecture.md (100%) rename {client/doc => doc}/documentation.md (100%) rename {client/doc => doc}/download.md (100%) rename {client/doc => doc}/examples.md (100%) rename {client/doc => doc}/faq.md (100%) rename {client/doc => doc}/img/moongen-architecture.png (100%) rename {client/doc => doc}/img/moongen-architecture@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software@2x.png (100%) rename {client/doc => doc}/index.md (100%) rename {client/doc => doc}/install.md (100%) rename {client/doc => doc}/packet_api.md (100%) rename {client/doc => doc}/rate_control.md (100%) rename {client/doc => doc}/timestamping.md (100%) rename {client/examples => examples}/benchmark/README.md (100%) rename {client/examples => examples}/benchmark/compare-rate-control-mechanisms.lua (100%) rename {client/examples => examples}/benchmark/cycles-per-pkt.lua (100%) rename {client/examples => examples}/benchmark/heavy-workload.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes-rx.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes.lua (100%) rename {client/examples => examples}/benchmark/udp-throughput.lua (100%) rename {client/examples => examples}/dump.lua (100%) rename {client/examples => examples}/icmp-arp-responder.lua (100%) rename {client/examples => examples}/inter-arrival-times.lua (100%) rename {client/examples => examples}/ipfix-generation.lua (100%) rename {client/examples => examples}/l2-bursts.lua (100%) rename {client/examples => examples}/l2-load-latency.lua (100%) rename {client/examples => examples}/l2-poisson-load-latency.lua (100%) rename {client/examples => examples}/l3-load-latency.lua (100%) rename {client/examples => examples}/l3-tcp-syn-flood.lua (100%) rename {client/examples => examples}/lacp.lua (100%) rename {client/examples => examples}/netronome-packetgen/Readme.txt (100%) rename {client/examples => examples}/netronome-packetgen/packetgen.lua (96%) rename {client/examples => examples}/pcap/dump-pkts.lua (100%) rename {client/examples => examples}/pcap/replay-pcap.lua (100%) rename {client/examples => examples}/quality-of-service-test.lua (100%) rename {client/examples => examples}/rate-control-methods.lua (100%) rename {client/examples => examples}/rss.lua (100%) rename {client/examples => examples}/rx-pkts-distribution.lua (100%) rename {client/examples => examples}/timestamping-tests/README.md (100%) rename {client/examples => examples}/timestamping-tests/drift.lua (100%) rename {client/examples => examples}/timestamping-tests/test-timestamping-capabilities.lua (100%) rename {client/examples => examples}/timestamping-tests/timestamps-software.lua (100%) rename {client/examples => examples}/vxlan-example.lua (100%) rename {client/log => log}/.gitignore (100%) rename {client/lua => lua}/crc-ratecontrol.lua (100%) rename {client/lua => lua}/moongen-compat.lua (100%) rename {client/lua => lua}/moongen-main.lua (100%) rename {client/lua => lua}/moongen.lua (100%) rename {client/lua => lua}/software-ratecontrol.lua (100%) rename {client/lua => lua}/software-timestamps.lua (100%) rename {client/rfc2544 => rfc2544}/Makefile (100%) rename {client/rfc2544 => rfc2544}/benchmarks/backtoback.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/frameloss.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/latency.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/throughput.lua (100%) rename {client/rfc2544 => rfc2544}/config.lua (100%) rename {client/rfc2544 => rfc2544}/master.lua (100%) rename {client/rfc2544 => rfc2544}/utils/Makefile (100%) rename {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/manual.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmp.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmpc.c (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-freebsd.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-mikrotik.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/testreport.lua (100%) rename {client/rfc2544 => rfc2544}/utils/tikz.lua (100%) rename {client/rfc2544 => rfc2544}/utils/utils.lua (100%) rename client/setup-hugetlbfs.sh => setup-hugetlbfs.sh (100%) rename {client/src => src}/crc-rate-limiter.c (100%) rename {client/src => src}/moongen-main.cpp (100%) rename {client/src => src}/software-rate-limiter.cpp (100%) rename {client/src => src}/software-timestamping.c (100%) rename {client/test => test}/.gitignore (100%) rename {client/test => test}/config/.gitignore (100%) rename {client/test => test}/config/autoconfig.sh (100%) rename {client/test => test}/config/devices.lua (100%) rename {client/test => test}/config/pairs.lua (100%) rename {client/test => test}/config/speed.lua (100%) rename {client/test => test}/exec.sh (100%) rename {client/test => test}/testlib.lua (100%) rename {client/test => test}/testlog.lua (100%) rename {client/test => test}/tests/00-basics.lua (100%) rename {client/test => test}/tests/01-send.lua (100%) rename {client/test => test}/tests/02-receive.lua (100%) rename {client/test => test}/tests/03-timestamping.lua (100%) rename {client/test => test}/tests/04-flowratecontrol.lua (100%) diff --git a/.gitmodules b/.gitmodules index 4e2330fa1..bcef25b35 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "libmoon"] - path = client/libmoon + path = libmoon url = https://github.com/libmoon/libmoon diff --git a/client/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from client/CMakeLists.txt rename to CMakeLists.txt diff --git a/client/Doxyfile b/Doxyfile similarity index 100% rename from client/Doxyfile rename to Doxyfile diff --git a/client/LICENSE b/LICENSE similarity index 100% rename from client/LICENSE rename to LICENSE diff --git a/client/README.md b/README.md similarity index 100% rename from client/README.md rename to README.md diff --git a/client/bind-interfaces.sh b/bind-interfaces.sh similarity index 100% rename from client/bind-interfaces.sh rename to bind-interfaces.sh diff --git a/client/build.sh b/build.sh similarity index 100% rename from client/build.sh rename to build.sh diff --git a/client/build/.gitignore b/build/.gitignore similarity index 100% rename from client/build/.gitignore rename to build/.gitignore diff --git a/client/libmoon b/client/libmoon deleted file mode 160000 index e436c36a6..000000000 --- a/client/libmoon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e436c36a6026a14fe90218c3a3506e00264aaa01 diff --git a/client/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml similarity index 100% rename from client/doc/DoxygenLayout.xml rename to doc/DoxygenLayout.xml diff --git a/client/doc/Slides.pdf b/doc/Slides.pdf similarity index 100% rename from client/doc/Slides.pdf rename to doc/Slides.pdf diff --git a/client/doc/architecture.md b/doc/architecture.md similarity index 100% rename from client/doc/architecture.md rename to doc/architecture.md diff --git a/client/doc/documentation.md b/doc/documentation.md similarity index 100% rename from client/doc/documentation.md rename to doc/documentation.md diff --git a/client/doc/download.md b/doc/download.md similarity index 100% rename from client/doc/download.md rename to doc/download.md diff --git a/client/doc/examples.md b/doc/examples.md similarity index 100% rename from client/doc/examples.md rename to doc/examples.md diff --git a/client/doc/faq.md b/doc/faq.md similarity index 100% rename from client/doc/faq.md rename to doc/faq.md diff --git a/client/doc/img/moongen-architecture.png b/doc/img/moongen-architecture.png similarity index 100% rename from client/doc/img/moongen-architecture.png rename to doc/img/moongen-architecture.png diff --git a/client/doc/img/moongen-architecture@2x.png b/doc/img/moongen-architecture@2x.png similarity index 100% rename from client/doc/img/moongen-architecture@2x.png rename to doc/img/moongen-architecture@2x.png diff --git a/client/doc/img/ratecontrol-moongen-hardware.png b/doc/img/ratecontrol-moongen-hardware.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware.png rename to doc/img/ratecontrol-moongen-hardware.png diff --git a/client/doc/img/ratecontrol-moongen-hardware@2x.png b/doc/img/ratecontrol-moongen-hardware@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware@2x.png rename to doc/img/ratecontrol-moongen-hardware@2x.png diff --git a/client/doc/img/ratecontrol-moongen-software.png b/doc/img/ratecontrol-moongen-software.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software.png rename to doc/img/ratecontrol-moongen-software.png diff --git a/client/doc/img/ratecontrol-moongen-software@2x.png b/doc/img/ratecontrol-moongen-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software@2x.png rename to doc/img/ratecontrol-moongen-software@2x.png diff --git a/client/doc/img/ratecontrol-traditional-software.png b/doc/img/ratecontrol-traditional-software.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software.png rename to doc/img/ratecontrol-traditional-software.png diff --git a/client/doc/img/ratecontrol-traditional-software@2x.png b/doc/img/ratecontrol-traditional-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software@2x.png rename to doc/img/ratecontrol-traditional-software@2x.png diff --git a/client/doc/index.md b/doc/index.md similarity index 100% rename from client/doc/index.md rename to doc/index.md diff --git a/client/doc/install.md b/doc/install.md similarity index 100% rename from client/doc/install.md rename to doc/install.md diff --git a/client/doc/packet_api.md b/doc/packet_api.md similarity index 100% rename from client/doc/packet_api.md rename to doc/packet_api.md diff --git a/client/doc/rate_control.md b/doc/rate_control.md similarity index 100% rename from client/doc/rate_control.md rename to doc/rate_control.md diff --git a/client/doc/timestamping.md b/doc/timestamping.md similarity index 100% rename from client/doc/timestamping.md rename to doc/timestamping.md diff --git a/client/examples/benchmark/README.md b/examples/benchmark/README.md similarity index 100% rename from client/examples/benchmark/README.md rename to examples/benchmark/README.md diff --git a/client/examples/benchmark/compare-rate-control-mechanisms.lua b/examples/benchmark/compare-rate-control-mechanisms.lua similarity index 100% rename from client/examples/benchmark/compare-rate-control-mechanisms.lua rename to examples/benchmark/compare-rate-control-mechanisms.lua diff --git a/client/examples/benchmark/cycles-per-pkt.lua b/examples/benchmark/cycles-per-pkt.lua similarity index 100% rename from client/examples/benchmark/cycles-per-pkt.lua rename to examples/benchmark/cycles-per-pkt.lua diff --git a/client/examples/benchmark/heavy-workload.lua b/examples/benchmark/heavy-workload.lua similarity index 100% rename from client/examples/benchmark/heavy-workload.lua rename to examples/benchmark/heavy-workload.lua diff --git a/client/examples/benchmark/packet-sizes-rx.lua b/examples/benchmark/packet-sizes-rx.lua similarity index 100% rename from client/examples/benchmark/packet-sizes-rx.lua rename to examples/benchmark/packet-sizes-rx.lua diff --git a/client/examples/benchmark/packet-sizes.lua b/examples/benchmark/packet-sizes.lua similarity index 100% rename from client/examples/benchmark/packet-sizes.lua rename to examples/benchmark/packet-sizes.lua diff --git a/client/examples/benchmark/udp-throughput.lua b/examples/benchmark/udp-throughput.lua similarity index 100% rename from client/examples/benchmark/udp-throughput.lua rename to examples/benchmark/udp-throughput.lua diff --git a/client/examples/dump.lua b/examples/dump.lua similarity index 100% rename from client/examples/dump.lua rename to examples/dump.lua diff --git a/client/examples/icmp-arp-responder.lua b/examples/icmp-arp-responder.lua similarity index 100% rename from client/examples/icmp-arp-responder.lua rename to examples/icmp-arp-responder.lua diff --git a/client/examples/inter-arrival-times.lua b/examples/inter-arrival-times.lua similarity index 100% rename from client/examples/inter-arrival-times.lua rename to examples/inter-arrival-times.lua diff --git a/client/examples/ipfix-generation.lua b/examples/ipfix-generation.lua similarity index 100% rename from client/examples/ipfix-generation.lua rename to examples/ipfix-generation.lua diff --git a/client/examples/l2-bursts.lua b/examples/l2-bursts.lua similarity index 100% rename from client/examples/l2-bursts.lua rename to examples/l2-bursts.lua diff --git a/client/examples/l2-load-latency.lua b/examples/l2-load-latency.lua similarity index 100% rename from client/examples/l2-load-latency.lua rename to examples/l2-load-latency.lua diff --git a/client/examples/l2-poisson-load-latency.lua b/examples/l2-poisson-load-latency.lua similarity index 100% rename from client/examples/l2-poisson-load-latency.lua rename to examples/l2-poisson-load-latency.lua diff --git a/client/examples/l3-load-latency.lua b/examples/l3-load-latency.lua similarity index 100% rename from client/examples/l3-load-latency.lua rename to examples/l3-load-latency.lua diff --git a/client/examples/l3-tcp-syn-flood.lua b/examples/l3-tcp-syn-flood.lua similarity index 100% rename from client/examples/l3-tcp-syn-flood.lua rename to examples/l3-tcp-syn-flood.lua diff --git a/client/examples/lacp.lua b/examples/lacp.lua similarity index 100% rename from client/examples/lacp.lua rename to examples/lacp.lua diff --git a/client/examples/netronome-packetgen/Readme.txt b/examples/netronome-packetgen/Readme.txt similarity index 100% rename from client/examples/netronome-packetgen/Readme.txt rename to examples/netronome-packetgen/Readme.txt diff --git a/client/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua similarity index 96% rename from client/examples/netronome-packetgen/packetgen.lua rename to examples/netronome-packetgen/packetgen.lua index d4947ba16..42cd99c93 100644 --- a/client/examples/netronome-packetgen/packetgen.lua +++ b/examples/netronome-packetgen/packetgen.lua @@ -1,4 +1,4 @@ ---[[ +--[[ Copyright (C) 2016 Netronome Systems, Inc. All rights reserved. @@ -31,6 +31,8 @@ packet sizes 1514, 570, and 64, respectively. --]] +local libmoon = require "libmoon" +local mg = require "moongen" local moongen = require "dpdk" local dpdkc = require "dpdkc" local memory = require "memory" @@ -199,7 +201,7 @@ constants = { -- Start time of the appliction. This is used to sync -- the printing and logging accross the slaves. -local globalStartTime = moongen.getTime() +local globalStartTime = mg.getTime() ------------------------------------------------------------------------------- -- Master function to do the slave setup and invoke the slave instances. @@ -261,7 +263,7 @@ function master(...) -- Display the parameters: clParams:print() - moongen.sleepMillis(clParams.paramDisplay) + mg.sleepMillis(clParams.paramDisplay) local slaveId = 0 -- Launch the slaves: @@ -269,8 +271,7 @@ function master(...) -- Check if the port must be used as a TX slave: for _, txPortId in ipairs(clParams.txSlavePorts) do if txPortId == portId then - moongen.startTask( - "txSlave", devices[i], portId, slaveId, clParams) + libmoon.startTask("txSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end @@ -278,15 +279,14 @@ function master(...) -- Check if the port must be used as a RX slave: for _, rxPortId in ipairs(clParams.rxSlavePorts) do if rxPortId == portId then - moongen.startTask( - "rxSlave", devices[i], portId, slaveId, clParams) + libmoon.startTask("rxSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end end end - moongen.waitForSlaves() + mg.waitForTasks() end ---- RX Functionality --------------------------------------------------------- @@ -299,8 +299,7 @@ end -- clParams : The command line parameters. ------------------------------------------------------------------------------- function rxSlave(device, portId, slaveId, clParams) - print(string.format("Launching RX slave: %u, Core: %u, Port: %u", - slaveId, moongen:getCore(), portId)) + print(string.format("Launching RX slave: %u, Core: %u, Port: %u", slaveId, mg:getCore(), portId)) -- Variables for receiving: local rxPackets = 0 @@ -312,7 +311,7 @@ function rxSlave(device, portId, slaveId, clParams) -- Variables for logging, printing, stopping: local state = "canrun" local stats = deepCopy(statsRx) - local startTime = moongen.getTime() + local startTime = mg.getTime() local lastPrintTime = 0 local iteration = 0 @@ -322,12 +321,12 @@ function rxSlave(device, portId, slaveId, clParams) elseif clParams.writemode == 3 then -- Prer core mode - create file and write header: outFile = clParams.fileprefix .. - "-c" .. tostring(moongen:getCore()) .. + "-c" .. tostring(mg:getCore()) .. "-p" .. tostring(portId) .. ".txt"; writeStatsHeader(outFile) end - while state == "canrun" and moongen.running() do + while state == "canrun" and mg.running() do rxPackets = rxQueue:tryRecv(rxBurst, constants.receiveTimeout) stats.packets = stats.packets + rxPackets stats.dropped = stats.dropped + rxPackets @@ -347,8 +346,8 @@ function rxSlave(device, portId, slaveId, clParams) -- Update termination params: iteration = iteration + 1 - stats.deltaTime = (moongen.getTime() - startTime) - stats.elapsedTime - stats.elapsedTime = moongen.getTime() - startTime + stats.deltaTime = (mg.getTime() - startTime) - stats.elapsedTime + stats.elapsedTime = mg.getTime() - startTime -- If printing or logging must be done: if clParams.writemode > 0 then @@ -360,7 +359,7 @@ function rxSlave(device, portId, slaveId, clParams) -- Printing and logging: if canPrint(slaveId, clParams) and sufficientTimeSincePrint then - lastPrintTime = moongen.getTime() - startTime + lastPrintTime = mg.getTime() - startTime if clParams.writemode == 1 then os.execute("clear") stats:print(portId) @@ -402,13 +401,13 @@ end ------------------------------------------------------------------------------- function calculateLatency(buf) local pkt = buf:getUdpPacket() - local cycles = tonumber(moongen:getCycles()) + local cycles = tonumber(mg:getCycles()) local timestamp = tonumber(pkt.payload.uint64[0]) local latency = 0 if timestamp ~= 0 then latency = tonumber(cycles - timestamp) - / tonumber(moongen:getCyclesFrequency()) + / tonumber(mg:getCyclesFrequency()) end return latency end @@ -429,7 +428,7 @@ function statsRx:print(portId) "\n| Packets dropped on receive : %32u |" .. "\n| RX mean latency : %32.10f |" .. "\n+---------------------------------------------------------------+" , - moongen:getCore() , + mg:getCore() , portId , self.packets , (self.packets - self.prevPackets) / self.deltaTime , @@ -456,7 +455,7 @@ end function statsRx:write(filename, portId) file = io.open(filename, "a") - local time = moongen.getTime() - globalStartTime + local time = mg.getTime() - globalStartTime local statsString = string.format( "%6.3f,%13u,%18.2f,%18.2f,%13u,%18.2f,%18.2f,%5u,%5u\n", @@ -467,7 +466,7 @@ function statsRx:write(filename, portId) self.packets , (self.packets - self.prevPackets) / self.deltaTime , self.packets / self.elapsedTime , - moongen:getCore() , + mg:getCore() , portId ) @@ -486,7 +485,7 @@ end ------------------------------------------------------------------------------- function txSlave(device, portId, slaveId, clParams) print(string.format("Launching TX slave: %u, Core: %u, Port: %u", - slaveId, moongen:getCore(), portId)) + slaveId, mg:getCore(), portId)) local state = "canrun" local stats = deepCopy(statsTx) @@ -500,7 +499,7 @@ function txSlave(device, portId, slaveId, clParams) elseif clParams.writemode == 3 then -- Per core mode: write header outFile = clParams.fileprefix .. - "-c" .. tostring(moongen:getCore()) .. + "-c" .. tostring(mg:getCore()) .. "-p" .. tostring(portId) .. ".txt"; writeStatsHeader(outFile) end @@ -559,10 +558,11 @@ function txSlave(device, portId, slaveId, clParams) -- Do sending: local iteration = 0 local lastPrintTime = 0 - local startTime = moongen.getTime() - while state == "canrun" and moongen.running() do + local startTime = mg.getTime() + + while state == "canrun" and mg.running() do for _, stream in ipairs(streams) do - timerParams.currtsc = tonumber(moongen:getCycles()) + timerParams.currtsc = tonumber(mg:getCycles()) timerParams.difftsc = timerParams.currtsc - timerParams.prevtsc sendBursts(txQueue, stats, timerParams, clParams, stream) @@ -570,8 +570,8 @@ function txSlave(device, portId, slaveId, clParams) -- Update the iteration and timeout params: iteration = iteration + 1 - stats.deltaTime = (moongen.getTime() - startTime) - stats.elapsedTime - stats.elapsedTime = moongen.getTime() - startTime + stats.deltaTime = (mg.getTime() - startTime) - stats.elapsedTime + stats.elapsedTime = mg.getTime() - startTime -- Printing and writing: if clParams.writemode > 0 then @@ -583,7 +583,7 @@ function txSlave(device, portId, slaveId, clParams) -- Printing and logging: if canPrint(slaveId, clParams) and sufficientTimeSincePrint then - lastPrintTime = moongen.getTime() - startTime + lastPrintTime = mg.getTime() - startTime if clParams.writemode == 1 then os.execute("clear") stats:print(portId) @@ -735,7 +735,7 @@ end ------------------------------------------------------------------------------- function updateTimestamp(buf) local pkt = buf:getUdpPacket() - local cycles = moongen:getCycles() + local cycles = mg:getCycles() pkt.payload.uint64[0] = cycles end @@ -755,7 +755,7 @@ function statsTx:print(portId) "\n| Packets short : %32u |" .. "\n| Bursts : %32u |" .. "\n+---------------------------------------------------------------+" , - moongen:getCore() , + mg:getCore() , portId , self.packets , (self.packets - self.prevPackets) / self.deltaTime , @@ -782,7 +782,7 @@ end function statsTx:write(filename, portId) file = io.open(filename, "a") - local time = moongen.getTime() - globalStartTime + local time = mg.getTime() - globalStartTime local statsString = string.format( "%6.3f,%13u,%18.2f,%18.2f,%13u,%18.2f,%18.2f,%5u,%5u\n", @@ -793,7 +793,7 @@ function statsTx:write(filename, portId) 0 , 0 , 0 , - moongen:getCore() , + mg:getCore() , portId ) @@ -833,7 +833,7 @@ end -- clParams : The command line parameters ------------------------------------------------------------------------------- function canPrint(slaveId, clParams) - local elapsedTime = moongen.getTime() - globalStartTime + local elapsedTime = mg.getTime() - globalStartTime local timePerCore = clParams.statsDisplay / (#clParams.rxSlavePorts + #clParams.txSlavePorts) @@ -1104,7 +1104,7 @@ function parseArgs(params, ...) end params.txDelta = - math.floor(moongen:getCyclesFrequency() / txPps) * + math.floor(mg:getCyclesFrequency() / txPps) * params.flowsPerStream * params.burstsPerStream elseif v == "--file-prefix" or v == "-fp" then params.fileprefix = args[i + 1] diff --git a/client/examples/pcap/dump-pkts.lua b/examples/pcap/dump-pkts.lua similarity index 100% rename from client/examples/pcap/dump-pkts.lua rename to examples/pcap/dump-pkts.lua diff --git a/client/examples/pcap/replay-pcap.lua b/examples/pcap/replay-pcap.lua similarity index 100% rename from client/examples/pcap/replay-pcap.lua rename to examples/pcap/replay-pcap.lua diff --git a/client/examples/quality-of-service-test.lua b/examples/quality-of-service-test.lua similarity index 100% rename from client/examples/quality-of-service-test.lua rename to examples/quality-of-service-test.lua diff --git a/client/examples/rate-control-methods.lua b/examples/rate-control-methods.lua similarity index 100% rename from client/examples/rate-control-methods.lua rename to examples/rate-control-methods.lua diff --git a/client/examples/rss.lua b/examples/rss.lua similarity index 100% rename from client/examples/rss.lua rename to examples/rss.lua diff --git a/client/examples/rx-pkts-distribution.lua b/examples/rx-pkts-distribution.lua similarity index 100% rename from client/examples/rx-pkts-distribution.lua rename to examples/rx-pkts-distribution.lua diff --git a/client/examples/timestamping-tests/README.md b/examples/timestamping-tests/README.md similarity index 100% rename from client/examples/timestamping-tests/README.md rename to examples/timestamping-tests/README.md diff --git a/client/examples/timestamping-tests/drift.lua b/examples/timestamping-tests/drift.lua similarity index 100% rename from client/examples/timestamping-tests/drift.lua rename to examples/timestamping-tests/drift.lua diff --git a/client/examples/timestamping-tests/test-timestamping-capabilities.lua b/examples/timestamping-tests/test-timestamping-capabilities.lua similarity index 100% rename from client/examples/timestamping-tests/test-timestamping-capabilities.lua rename to examples/timestamping-tests/test-timestamping-capabilities.lua diff --git a/client/examples/timestamping-tests/timestamps-software.lua b/examples/timestamping-tests/timestamps-software.lua similarity index 100% rename from client/examples/timestamping-tests/timestamps-software.lua rename to examples/timestamping-tests/timestamps-software.lua diff --git a/client/examples/vxlan-example.lua b/examples/vxlan-example.lua similarity index 100% rename from client/examples/vxlan-example.lua rename to examples/vxlan-example.lua diff --git a/client/log/.gitignore b/log/.gitignore similarity index 100% rename from client/log/.gitignore rename to log/.gitignore diff --git a/client/lua/crc-ratecontrol.lua b/lua/crc-ratecontrol.lua similarity index 100% rename from client/lua/crc-ratecontrol.lua rename to lua/crc-ratecontrol.lua diff --git a/client/lua/moongen-compat.lua b/lua/moongen-compat.lua similarity index 100% rename from client/lua/moongen-compat.lua rename to lua/moongen-compat.lua diff --git a/client/lua/moongen-main.lua b/lua/moongen-main.lua similarity index 100% rename from client/lua/moongen-main.lua rename to lua/moongen-main.lua diff --git a/client/lua/moongen.lua b/lua/moongen.lua similarity index 100% rename from client/lua/moongen.lua rename to lua/moongen.lua diff --git a/client/lua/software-ratecontrol.lua b/lua/software-ratecontrol.lua similarity index 100% rename from client/lua/software-ratecontrol.lua rename to lua/software-ratecontrol.lua diff --git a/client/lua/software-timestamps.lua b/lua/software-timestamps.lua similarity index 100% rename from client/lua/software-timestamps.lua rename to lua/software-timestamps.lua diff --git a/client/rfc2544/Makefile b/rfc2544/Makefile similarity index 100% rename from client/rfc2544/Makefile rename to rfc2544/Makefile diff --git a/client/rfc2544/benchmarks/backtoback.lua b/rfc2544/benchmarks/backtoback.lua similarity index 100% rename from client/rfc2544/benchmarks/backtoback.lua rename to rfc2544/benchmarks/backtoback.lua diff --git a/client/rfc2544/benchmarks/frameloss.lua b/rfc2544/benchmarks/frameloss.lua similarity index 100% rename from client/rfc2544/benchmarks/frameloss.lua rename to rfc2544/benchmarks/frameloss.lua diff --git a/client/rfc2544/benchmarks/latency.lua b/rfc2544/benchmarks/latency.lua similarity index 100% rename from client/rfc2544/benchmarks/latency.lua rename to rfc2544/benchmarks/latency.lua diff --git a/client/rfc2544/benchmarks/throughput.lua b/rfc2544/benchmarks/throughput.lua similarity index 100% rename from client/rfc2544/benchmarks/throughput.lua rename to rfc2544/benchmarks/throughput.lua diff --git a/client/rfc2544/config.lua b/rfc2544/config.lua similarity index 100% rename from client/rfc2544/config.lua rename to rfc2544/config.lua diff --git a/client/rfc2544/master.lua b/rfc2544/master.lua similarity index 100% rename from client/rfc2544/master.lua rename to rfc2544/master.lua diff --git a/client/rfc2544/utils/Makefile b/rfc2544/utils/Makefile similarity index 100% rename from client/rfc2544/utils/Makefile rename to rfc2544/utils/Makefile diff --git a/client/rfc2544/utils/ffi/ssh.lua b/rfc2544/utils/ffi/ssh.lua similarity index 100% rename from client/rfc2544/utils/ffi/ssh.lua rename to rfc2544/utils/ffi/ssh.lua diff --git a/client/rfc2544/utils/manual.lua b/rfc2544/utils/manual.lua similarity index 100% rename from client/rfc2544/utils/manual.lua rename to rfc2544/utils/manual.lua diff --git a/client/rfc2544/utils/snmp.lua b/rfc2544/utils/snmp.lua similarity index 100% rename from client/rfc2544/utils/snmp.lua rename to rfc2544/utils/snmp.lua diff --git a/client/rfc2544/utils/snmpc.c b/rfc2544/utils/snmpc.c similarity index 100% rename from client/rfc2544/utils/snmpc.c rename to rfc2544/utils/snmpc.c diff --git a/client/rfc2544/utils/ssh-freebsd.lua b/rfc2544/utils/ssh-freebsd.lua similarity index 100% rename from client/rfc2544/utils/ssh-freebsd.lua rename to rfc2544/utils/ssh-freebsd.lua diff --git a/client/rfc2544/utils/ssh-mikrotik.lua b/rfc2544/utils/ssh-mikrotik.lua similarity index 100% rename from client/rfc2544/utils/ssh-mikrotik.lua rename to rfc2544/utils/ssh-mikrotik.lua diff --git a/client/rfc2544/utils/ssh.lua b/rfc2544/utils/ssh.lua similarity index 100% rename from client/rfc2544/utils/ssh.lua rename to rfc2544/utils/ssh.lua diff --git a/client/rfc2544/utils/testreport.lua b/rfc2544/utils/testreport.lua similarity index 100% rename from client/rfc2544/utils/testreport.lua rename to rfc2544/utils/testreport.lua diff --git a/client/rfc2544/utils/tikz.lua b/rfc2544/utils/tikz.lua similarity index 100% rename from client/rfc2544/utils/tikz.lua rename to rfc2544/utils/tikz.lua diff --git a/client/rfc2544/utils/utils.lua b/rfc2544/utils/utils.lua similarity index 100% rename from client/rfc2544/utils/utils.lua rename to rfc2544/utils/utils.lua diff --git a/client/setup-hugetlbfs.sh b/setup-hugetlbfs.sh similarity index 100% rename from client/setup-hugetlbfs.sh rename to setup-hugetlbfs.sh diff --git a/client/src/crc-rate-limiter.c b/src/crc-rate-limiter.c similarity index 100% rename from client/src/crc-rate-limiter.c rename to src/crc-rate-limiter.c diff --git a/client/src/moongen-main.cpp b/src/moongen-main.cpp similarity index 100% rename from client/src/moongen-main.cpp rename to src/moongen-main.cpp diff --git a/client/src/software-rate-limiter.cpp b/src/software-rate-limiter.cpp similarity index 100% rename from client/src/software-rate-limiter.cpp rename to src/software-rate-limiter.cpp diff --git a/client/src/software-timestamping.c b/src/software-timestamping.c similarity index 100% rename from client/src/software-timestamping.c rename to src/software-timestamping.c diff --git a/client/test/.gitignore b/test/.gitignore similarity index 100% rename from client/test/.gitignore rename to test/.gitignore diff --git a/client/test/config/.gitignore b/test/config/.gitignore similarity index 100% rename from client/test/config/.gitignore rename to test/config/.gitignore diff --git a/client/test/config/autoconfig.sh b/test/config/autoconfig.sh similarity index 100% rename from client/test/config/autoconfig.sh rename to test/config/autoconfig.sh diff --git a/client/test/config/devices.lua b/test/config/devices.lua similarity index 100% rename from client/test/config/devices.lua rename to test/config/devices.lua diff --git a/client/test/config/pairs.lua b/test/config/pairs.lua similarity index 100% rename from client/test/config/pairs.lua rename to test/config/pairs.lua diff --git a/client/test/config/speed.lua b/test/config/speed.lua similarity index 100% rename from client/test/config/speed.lua rename to test/config/speed.lua diff --git a/client/test/exec.sh b/test/exec.sh similarity index 100% rename from client/test/exec.sh rename to test/exec.sh diff --git a/client/test/testlib.lua b/test/testlib.lua similarity index 100% rename from client/test/testlib.lua rename to test/testlib.lua diff --git a/client/test/testlog.lua b/test/testlog.lua similarity index 100% rename from client/test/testlog.lua rename to test/testlog.lua diff --git a/client/test/tests/00-basics.lua b/test/tests/00-basics.lua similarity index 100% rename from client/test/tests/00-basics.lua rename to test/tests/00-basics.lua diff --git a/client/test/tests/01-send.lua b/test/tests/01-send.lua similarity index 100% rename from client/test/tests/01-send.lua rename to test/tests/01-send.lua diff --git a/client/test/tests/02-receive.lua b/test/tests/02-receive.lua similarity index 100% rename from client/test/tests/02-receive.lua rename to test/tests/02-receive.lua diff --git a/client/test/tests/03-timestamping.lua b/test/tests/03-timestamping.lua similarity index 100% rename from client/test/tests/03-timestamping.lua rename to test/tests/03-timestamping.lua diff --git a/client/test/tests/04-flowratecontrol.lua b/test/tests/04-flowratecontrol.lua similarity index 100% rename from client/test/tests/04-flowratecontrol.lua rename to test/tests/04-flowratecontrol.lua From e2e32aeb115fbdd2d410e1ffbd9470a79becbf60 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Mon, 14 Nov 2016 11:37:58 +0200 Subject: [PATCH 10/15] Updates to match vanilla MoonGen First phase of updating repo to match vanilla MoonGen - WIP Updating repo - WIP Final step to updating repo to match vanilla MoonGen - WIP Add files via upload --- libmoon | 1 + 1 file changed, 1 insertion(+) create mode 160000 libmoon diff --git a/libmoon b/libmoon new file mode 160000 index 000000000..9df2e70df --- /dev/null +++ b/libmoon @@ -0,0 +1 @@ +Subproject commit 9df2e70df86506b1f343a4187303a977e5e4308e From 06ab7b319d471a613a77d9492cc94eb6befa83d8 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Thu, 17 Nov 2016 09:56:26 +0200 Subject: [PATCH 11/15] Moved files and folders to temp dir for merge --- .gitmodules | 3 --- CMakeLists.txt => client/CMakeLists.txt | 0 Doxyfile => client/Doxyfile | 0 LICENSE => client/LICENSE | 0 README.md => client/README.md | 0 bind-interfaces.sh => client/bind-interfaces.sh | 0 build.sh => client/build.sh | 0 {build => client/build}/.gitignore | 0 {doc => client/doc}/DoxygenLayout.xml | 0 {doc => client/doc}/Slides.pdf | Bin {doc => client/doc}/architecture.md | 0 {doc => client/doc}/documentation.md | 0 {doc => client/doc}/download.md | 0 {doc => client/doc}/examples.md | 0 {doc => client/doc}/faq.md | 0 {doc => client/doc}/img/moongen-architecture.png | Bin {doc => client/doc}/img/moongen-architecture@2x.png | Bin .../doc}/img/ratecontrol-moongen-hardware.png | Bin .../doc}/img/ratecontrol-moongen-hardware@2x.png | Bin .../doc}/img/ratecontrol-moongen-software.png | Bin .../doc}/img/ratecontrol-moongen-software@2x.png | Bin .../doc}/img/ratecontrol-traditional-software.png | Bin .../img/ratecontrol-traditional-software@2x.png | Bin {doc => client/doc}/index.md | 0 {doc => client/doc}/install.md | 0 {doc => client/doc}/packet_api.md | 0 {doc => client/doc}/rate_control.md | 0 {doc => client/doc}/timestamping.md | 0 {examples => client/examples}/benchmark/README.md | 0 .../benchmark/compare-rate-control-mechanisms.lua | 0 .../examples}/benchmark/cycles-per-pkt.lua | 0 .../examples}/benchmark/heavy-workload.lua | 0 .../examples}/benchmark/packet-sizes-rx.lua | 0 .../examples}/benchmark/packet-sizes.lua | 0 .../examples}/benchmark/udp-throughput.lua | 0 {examples => client/examples}/dump.lua | 0 .../examples}/icmp-arp-responder.lua | 0 .../examples}/inter-arrival-times.lua | 0 {examples => client/examples}/ipfix-generation.lua | 0 {examples => client/examples}/l2-bursts.lua | 0 {examples => client/examples}/l2-load-latency.lua | 0 .../examples}/l2-poisson-load-latency.lua | 0 {examples => client/examples}/l3-load-latency.lua | 0 {examples => client/examples}/l3-tcp-syn-flood.lua | 0 {examples => client/examples}/lacp.lua | 0 .../examples}/netronome-packetgen/Readme.txt | 0 .../examples}/netronome-packetgen/packetgen.lua | 0 {examples => client/examples}/pcap/dump-pkts.lua | 0 {examples => client/examples}/pcap/replay-pcap.lua | 0 .../examples}/quality-of-service-test.lua | 0 .../examples}/rate-control-methods.lua | 0 {examples => client/examples}/rss.lua | 0 .../examples}/rx-pkts-distribution.lua | 0 .../examples}/timestamping-tests/README.md | 0 .../examples}/timestamping-tests/drift.lua | 0 .../test-timestamping-capabilities.lua | 0 .../timestamping-tests/timestamps-software.lua | 0 {examples => client/examples}/vxlan-example.lua | 0 {log => client/log}/.gitignore | 0 {lua => client/lua}/crc-ratecontrol.lua | 0 {lua => client/lua}/moongen-compat.lua | 0 {lua => client/lua}/moongen-main.lua | 0 {lua => client/lua}/moongen.lua | 0 {lua => client/lua}/software-ratecontrol.lua | 0 {lua => client/lua}/software-timestamps.lua | 0 {rfc2544 => client/rfc2544}/Makefile | 0 .../rfc2544}/benchmarks/backtoback.lua | 0 .../rfc2544}/benchmarks/frameloss.lua | 0 {rfc2544 => client/rfc2544}/benchmarks/latency.lua | 0 .../rfc2544}/benchmarks/throughput.lua | 0 {rfc2544 => client/rfc2544}/config.lua | 0 {rfc2544 => client/rfc2544}/master.lua | 0 {rfc2544 => client/rfc2544}/utils/Makefile | 0 {rfc2544 => client/rfc2544}/utils/ffi/ssh.lua | 0 {rfc2544 => client/rfc2544}/utils/manual.lua | 0 {rfc2544 => client/rfc2544}/utils/snmp.lua | 0 {rfc2544 => client/rfc2544}/utils/snmpc.c | 0 {rfc2544 => client/rfc2544}/utils/ssh-freebsd.lua | 0 {rfc2544 => client/rfc2544}/utils/ssh-mikrotik.lua | 0 {rfc2544 => client/rfc2544}/utils/ssh.lua | 0 {rfc2544 => client/rfc2544}/utils/testreport.lua | 0 {rfc2544 => client/rfc2544}/utils/tikz.lua | 0 {rfc2544 => client/rfc2544}/utils/utils.lua | 0 setup-hugetlbfs.sh => client/setup-hugetlbfs.sh | 0 {src => client/src}/crc-rate-limiter.c | 0 {src => client/src}/moongen-main.cpp | 0 {src => client/src}/software-rate-limiter.cpp | 0 {src => client/src}/software-timestamping.c | 0 {test => client/test}/.gitignore | 0 {test => client/test}/config/.gitignore | 0 {test => client/test}/config/autoconfig.sh | 0 {test => client/test}/config/devices.lua | 0 {test => client/test}/config/pairs.lua | 0 {test => client/test}/config/speed.lua | 0 {test => client/test}/exec.sh | 0 {test => client/test}/testlib.lua | 0 {test => client/test}/testlog.lua | 0 {test => client/test}/tests/00-basics.lua | 0 {test => client/test}/tests/01-send.lua | 0 {test => client/test}/tests/02-receive.lua | 0 {test => client/test}/tests/03-timestamping.lua | 0 {test => client/test}/tests/04-flowratecontrol.lua | 0 libmoon | 1 - 103 files changed, 4 deletions(-) delete mode 100644 .gitmodules rename CMakeLists.txt => client/CMakeLists.txt (100%) rename Doxyfile => client/Doxyfile (100%) rename LICENSE => client/LICENSE (100%) rename README.md => client/README.md (100%) rename bind-interfaces.sh => client/bind-interfaces.sh (100%) rename build.sh => client/build.sh (100%) rename {build => client/build}/.gitignore (100%) rename {doc => client/doc}/DoxygenLayout.xml (100%) rename {doc => client/doc}/Slides.pdf (100%) rename {doc => client/doc}/architecture.md (100%) rename {doc => client/doc}/documentation.md (100%) rename {doc => client/doc}/download.md (100%) rename {doc => client/doc}/examples.md (100%) rename {doc => client/doc}/faq.md (100%) rename {doc => client/doc}/img/moongen-architecture.png (100%) rename {doc => client/doc}/img/moongen-architecture@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-hardware.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-hardware@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-software.png (100%) rename {doc => client/doc}/img/ratecontrol-moongen-software@2x.png (100%) rename {doc => client/doc}/img/ratecontrol-traditional-software.png (100%) rename {doc => client/doc}/img/ratecontrol-traditional-software@2x.png (100%) rename {doc => client/doc}/index.md (100%) rename {doc => client/doc}/install.md (100%) rename {doc => client/doc}/packet_api.md (100%) rename {doc => client/doc}/rate_control.md (100%) rename {doc => client/doc}/timestamping.md (100%) rename {examples => client/examples}/benchmark/README.md (100%) rename {examples => client/examples}/benchmark/compare-rate-control-mechanisms.lua (100%) rename {examples => client/examples}/benchmark/cycles-per-pkt.lua (100%) rename {examples => client/examples}/benchmark/heavy-workload.lua (100%) rename {examples => client/examples}/benchmark/packet-sizes-rx.lua (100%) rename {examples => client/examples}/benchmark/packet-sizes.lua (100%) rename {examples => client/examples}/benchmark/udp-throughput.lua (100%) rename {examples => client/examples}/dump.lua (100%) rename {examples => client/examples}/icmp-arp-responder.lua (100%) rename {examples => client/examples}/inter-arrival-times.lua (100%) rename {examples => client/examples}/ipfix-generation.lua (100%) rename {examples => client/examples}/l2-bursts.lua (100%) rename {examples => client/examples}/l2-load-latency.lua (100%) rename {examples => client/examples}/l2-poisson-load-latency.lua (100%) rename {examples => client/examples}/l3-load-latency.lua (100%) rename {examples => client/examples}/l3-tcp-syn-flood.lua (100%) rename {examples => client/examples}/lacp.lua (100%) rename {examples => client/examples}/netronome-packetgen/Readme.txt (100%) rename {examples => client/examples}/netronome-packetgen/packetgen.lua (100%) rename {examples => client/examples}/pcap/dump-pkts.lua (100%) rename {examples => client/examples}/pcap/replay-pcap.lua (100%) rename {examples => client/examples}/quality-of-service-test.lua (100%) rename {examples => client/examples}/rate-control-methods.lua (100%) rename {examples => client/examples}/rss.lua (100%) rename {examples => client/examples}/rx-pkts-distribution.lua (100%) rename {examples => client/examples}/timestamping-tests/README.md (100%) rename {examples => client/examples}/timestamping-tests/drift.lua (100%) rename {examples => client/examples}/timestamping-tests/test-timestamping-capabilities.lua (100%) rename {examples => client/examples}/timestamping-tests/timestamps-software.lua (100%) rename {examples => client/examples}/vxlan-example.lua (100%) rename {log => client/log}/.gitignore (100%) rename {lua => client/lua}/crc-ratecontrol.lua (100%) rename {lua => client/lua}/moongen-compat.lua (100%) rename {lua => client/lua}/moongen-main.lua (100%) rename {lua => client/lua}/moongen.lua (100%) rename {lua => client/lua}/software-ratecontrol.lua (100%) rename {lua => client/lua}/software-timestamps.lua (100%) rename {rfc2544 => client/rfc2544}/Makefile (100%) rename {rfc2544 => client/rfc2544}/benchmarks/backtoback.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/frameloss.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/latency.lua (100%) rename {rfc2544 => client/rfc2544}/benchmarks/throughput.lua (100%) rename {rfc2544 => client/rfc2544}/config.lua (100%) rename {rfc2544 => client/rfc2544}/master.lua (100%) rename {rfc2544 => client/rfc2544}/utils/Makefile (100%) rename {rfc2544 => client/rfc2544}/utils/ffi/ssh.lua (100%) rename {rfc2544 => client/rfc2544}/utils/manual.lua (100%) rename {rfc2544 => client/rfc2544}/utils/snmp.lua (100%) rename {rfc2544 => client/rfc2544}/utils/snmpc.c (100%) rename {rfc2544 => client/rfc2544}/utils/ssh-freebsd.lua (100%) rename {rfc2544 => client/rfc2544}/utils/ssh-mikrotik.lua (100%) rename {rfc2544 => client/rfc2544}/utils/ssh.lua (100%) rename {rfc2544 => client/rfc2544}/utils/testreport.lua (100%) rename {rfc2544 => client/rfc2544}/utils/tikz.lua (100%) rename {rfc2544 => client/rfc2544}/utils/utils.lua (100%) rename setup-hugetlbfs.sh => client/setup-hugetlbfs.sh (100%) rename {src => client/src}/crc-rate-limiter.c (100%) rename {src => client/src}/moongen-main.cpp (100%) rename {src => client/src}/software-rate-limiter.cpp (100%) rename {src => client/src}/software-timestamping.c (100%) rename {test => client/test}/.gitignore (100%) rename {test => client/test}/config/.gitignore (100%) rename {test => client/test}/config/autoconfig.sh (100%) rename {test => client/test}/config/devices.lua (100%) rename {test => client/test}/config/pairs.lua (100%) rename {test => client/test}/config/speed.lua (100%) rename {test => client/test}/exec.sh (100%) rename {test => client/test}/testlib.lua (100%) rename {test => client/test}/testlog.lua (100%) rename {test => client/test}/tests/00-basics.lua (100%) rename {test => client/test}/tests/01-send.lua (100%) rename {test => client/test}/tests/02-receive.lua (100%) rename {test => client/test}/tests/03-timestamping.lua (100%) rename {test => client/test}/tests/04-flowratecontrol.lua (100%) delete mode 160000 libmoon diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index bcef25b35..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "libmoon"] - path = libmoon - url = https://github.com/libmoon/libmoon diff --git a/CMakeLists.txt b/client/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to client/CMakeLists.txt diff --git a/Doxyfile b/client/Doxyfile similarity index 100% rename from Doxyfile rename to client/Doxyfile diff --git a/LICENSE b/client/LICENSE similarity index 100% rename from LICENSE rename to client/LICENSE diff --git a/README.md b/client/README.md similarity index 100% rename from README.md rename to client/README.md diff --git a/bind-interfaces.sh b/client/bind-interfaces.sh similarity index 100% rename from bind-interfaces.sh rename to client/bind-interfaces.sh diff --git a/build.sh b/client/build.sh similarity index 100% rename from build.sh rename to client/build.sh diff --git a/build/.gitignore b/client/build/.gitignore similarity index 100% rename from build/.gitignore rename to client/build/.gitignore diff --git a/doc/DoxygenLayout.xml b/client/doc/DoxygenLayout.xml similarity index 100% rename from doc/DoxygenLayout.xml rename to client/doc/DoxygenLayout.xml diff --git a/doc/Slides.pdf b/client/doc/Slides.pdf similarity index 100% rename from doc/Slides.pdf rename to client/doc/Slides.pdf diff --git a/doc/architecture.md b/client/doc/architecture.md similarity index 100% rename from doc/architecture.md rename to client/doc/architecture.md diff --git a/doc/documentation.md b/client/doc/documentation.md similarity index 100% rename from doc/documentation.md rename to client/doc/documentation.md diff --git a/doc/download.md b/client/doc/download.md similarity index 100% rename from doc/download.md rename to client/doc/download.md diff --git a/doc/examples.md b/client/doc/examples.md similarity index 100% rename from doc/examples.md rename to client/doc/examples.md diff --git a/doc/faq.md b/client/doc/faq.md similarity index 100% rename from doc/faq.md rename to client/doc/faq.md diff --git a/doc/img/moongen-architecture.png b/client/doc/img/moongen-architecture.png similarity index 100% rename from doc/img/moongen-architecture.png rename to client/doc/img/moongen-architecture.png diff --git a/doc/img/moongen-architecture@2x.png b/client/doc/img/moongen-architecture@2x.png similarity index 100% rename from doc/img/moongen-architecture@2x.png rename to client/doc/img/moongen-architecture@2x.png diff --git a/doc/img/ratecontrol-moongen-hardware.png b/client/doc/img/ratecontrol-moongen-hardware.png similarity index 100% rename from doc/img/ratecontrol-moongen-hardware.png rename to client/doc/img/ratecontrol-moongen-hardware.png diff --git a/doc/img/ratecontrol-moongen-hardware@2x.png b/client/doc/img/ratecontrol-moongen-hardware@2x.png similarity index 100% rename from doc/img/ratecontrol-moongen-hardware@2x.png rename to client/doc/img/ratecontrol-moongen-hardware@2x.png diff --git a/doc/img/ratecontrol-moongen-software.png b/client/doc/img/ratecontrol-moongen-software.png similarity index 100% rename from doc/img/ratecontrol-moongen-software.png rename to client/doc/img/ratecontrol-moongen-software.png diff --git a/doc/img/ratecontrol-moongen-software@2x.png b/client/doc/img/ratecontrol-moongen-software@2x.png similarity index 100% rename from doc/img/ratecontrol-moongen-software@2x.png rename to client/doc/img/ratecontrol-moongen-software@2x.png diff --git a/doc/img/ratecontrol-traditional-software.png b/client/doc/img/ratecontrol-traditional-software.png similarity index 100% rename from doc/img/ratecontrol-traditional-software.png rename to client/doc/img/ratecontrol-traditional-software.png diff --git a/doc/img/ratecontrol-traditional-software@2x.png b/client/doc/img/ratecontrol-traditional-software@2x.png similarity index 100% rename from doc/img/ratecontrol-traditional-software@2x.png rename to client/doc/img/ratecontrol-traditional-software@2x.png diff --git a/doc/index.md b/client/doc/index.md similarity index 100% rename from doc/index.md rename to client/doc/index.md diff --git a/doc/install.md b/client/doc/install.md similarity index 100% rename from doc/install.md rename to client/doc/install.md diff --git a/doc/packet_api.md b/client/doc/packet_api.md similarity index 100% rename from doc/packet_api.md rename to client/doc/packet_api.md diff --git a/doc/rate_control.md b/client/doc/rate_control.md similarity index 100% rename from doc/rate_control.md rename to client/doc/rate_control.md diff --git a/doc/timestamping.md b/client/doc/timestamping.md similarity index 100% rename from doc/timestamping.md rename to client/doc/timestamping.md diff --git a/examples/benchmark/README.md b/client/examples/benchmark/README.md similarity index 100% rename from examples/benchmark/README.md rename to client/examples/benchmark/README.md diff --git a/examples/benchmark/compare-rate-control-mechanisms.lua b/client/examples/benchmark/compare-rate-control-mechanisms.lua similarity index 100% rename from examples/benchmark/compare-rate-control-mechanisms.lua rename to client/examples/benchmark/compare-rate-control-mechanisms.lua diff --git a/examples/benchmark/cycles-per-pkt.lua b/client/examples/benchmark/cycles-per-pkt.lua similarity index 100% rename from examples/benchmark/cycles-per-pkt.lua rename to client/examples/benchmark/cycles-per-pkt.lua diff --git a/examples/benchmark/heavy-workload.lua b/client/examples/benchmark/heavy-workload.lua similarity index 100% rename from examples/benchmark/heavy-workload.lua rename to client/examples/benchmark/heavy-workload.lua diff --git a/examples/benchmark/packet-sizes-rx.lua b/client/examples/benchmark/packet-sizes-rx.lua similarity index 100% rename from examples/benchmark/packet-sizes-rx.lua rename to client/examples/benchmark/packet-sizes-rx.lua diff --git a/examples/benchmark/packet-sizes.lua b/client/examples/benchmark/packet-sizes.lua similarity index 100% rename from examples/benchmark/packet-sizes.lua rename to client/examples/benchmark/packet-sizes.lua diff --git a/examples/benchmark/udp-throughput.lua b/client/examples/benchmark/udp-throughput.lua similarity index 100% rename from examples/benchmark/udp-throughput.lua rename to client/examples/benchmark/udp-throughput.lua diff --git a/examples/dump.lua b/client/examples/dump.lua similarity index 100% rename from examples/dump.lua rename to client/examples/dump.lua diff --git a/examples/icmp-arp-responder.lua b/client/examples/icmp-arp-responder.lua similarity index 100% rename from examples/icmp-arp-responder.lua rename to client/examples/icmp-arp-responder.lua diff --git a/examples/inter-arrival-times.lua b/client/examples/inter-arrival-times.lua similarity index 100% rename from examples/inter-arrival-times.lua rename to client/examples/inter-arrival-times.lua diff --git a/examples/ipfix-generation.lua b/client/examples/ipfix-generation.lua similarity index 100% rename from examples/ipfix-generation.lua rename to client/examples/ipfix-generation.lua diff --git a/examples/l2-bursts.lua b/client/examples/l2-bursts.lua similarity index 100% rename from examples/l2-bursts.lua rename to client/examples/l2-bursts.lua diff --git a/examples/l2-load-latency.lua b/client/examples/l2-load-latency.lua similarity index 100% rename from examples/l2-load-latency.lua rename to client/examples/l2-load-latency.lua diff --git a/examples/l2-poisson-load-latency.lua b/client/examples/l2-poisson-load-latency.lua similarity index 100% rename from examples/l2-poisson-load-latency.lua rename to client/examples/l2-poisson-load-latency.lua diff --git a/examples/l3-load-latency.lua b/client/examples/l3-load-latency.lua similarity index 100% rename from examples/l3-load-latency.lua rename to client/examples/l3-load-latency.lua diff --git a/examples/l3-tcp-syn-flood.lua b/client/examples/l3-tcp-syn-flood.lua similarity index 100% rename from examples/l3-tcp-syn-flood.lua rename to client/examples/l3-tcp-syn-flood.lua diff --git a/examples/lacp.lua b/client/examples/lacp.lua similarity index 100% rename from examples/lacp.lua rename to client/examples/lacp.lua diff --git a/examples/netronome-packetgen/Readme.txt b/client/examples/netronome-packetgen/Readme.txt similarity index 100% rename from examples/netronome-packetgen/Readme.txt rename to client/examples/netronome-packetgen/Readme.txt diff --git a/examples/netronome-packetgen/packetgen.lua b/client/examples/netronome-packetgen/packetgen.lua similarity index 100% rename from examples/netronome-packetgen/packetgen.lua rename to client/examples/netronome-packetgen/packetgen.lua diff --git a/examples/pcap/dump-pkts.lua b/client/examples/pcap/dump-pkts.lua similarity index 100% rename from examples/pcap/dump-pkts.lua rename to client/examples/pcap/dump-pkts.lua diff --git a/examples/pcap/replay-pcap.lua b/client/examples/pcap/replay-pcap.lua similarity index 100% rename from examples/pcap/replay-pcap.lua rename to client/examples/pcap/replay-pcap.lua diff --git a/examples/quality-of-service-test.lua b/client/examples/quality-of-service-test.lua similarity index 100% rename from examples/quality-of-service-test.lua rename to client/examples/quality-of-service-test.lua diff --git a/examples/rate-control-methods.lua b/client/examples/rate-control-methods.lua similarity index 100% rename from examples/rate-control-methods.lua rename to client/examples/rate-control-methods.lua diff --git a/examples/rss.lua b/client/examples/rss.lua similarity index 100% rename from examples/rss.lua rename to client/examples/rss.lua diff --git a/examples/rx-pkts-distribution.lua b/client/examples/rx-pkts-distribution.lua similarity index 100% rename from examples/rx-pkts-distribution.lua rename to client/examples/rx-pkts-distribution.lua diff --git a/examples/timestamping-tests/README.md b/client/examples/timestamping-tests/README.md similarity index 100% rename from examples/timestamping-tests/README.md rename to client/examples/timestamping-tests/README.md diff --git a/examples/timestamping-tests/drift.lua b/client/examples/timestamping-tests/drift.lua similarity index 100% rename from examples/timestamping-tests/drift.lua rename to client/examples/timestamping-tests/drift.lua diff --git a/examples/timestamping-tests/test-timestamping-capabilities.lua b/client/examples/timestamping-tests/test-timestamping-capabilities.lua similarity index 100% rename from examples/timestamping-tests/test-timestamping-capabilities.lua rename to client/examples/timestamping-tests/test-timestamping-capabilities.lua diff --git a/examples/timestamping-tests/timestamps-software.lua b/client/examples/timestamping-tests/timestamps-software.lua similarity index 100% rename from examples/timestamping-tests/timestamps-software.lua rename to client/examples/timestamping-tests/timestamps-software.lua diff --git a/examples/vxlan-example.lua b/client/examples/vxlan-example.lua similarity index 100% rename from examples/vxlan-example.lua rename to client/examples/vxlan-example.lua diff --git a/log/.gitignore b/client/log/.gitignore similarity index 100% rename from log/.gitignore rename to client/log/.gitignore diff --git a/lua/crc-ratecontrol.lua b/client/lua/crc-ratecontrol.lua similarity index 100% rename from lua/crc-ratecontrol.lua rename to client/lua/crc-ratecontrol.lua diff --git a/lua/moongen-compat.lua b/client/lua/moongen-compat.lua similarity index 100% rename from lua/moongen-compat.lua rename to client/lua/moongen-compat.lua diff --git a/lua/moongen-main.lua b/client/lua/moongen-main.lua similarity index 100% rename from lua/moongen-main.lua rename to client/lua/moongen-main.lua diff --git a/lua/moongen.lua b/client/lua/moongen.lua similarity index 100% rename from lua/moongen.lua rename to client/lua/moongen.lua diff --git a/lua/software-ratecontrol.lua b/client/lua/software-ratecontrol.lua similarity index 100% rename from lua/software-ratecontrol.lua rename to client/lua/software-ratecontrol.lua diff --git a/lua/software-timestamps.lua b/client/lua/software-timestamps.lua similarity index 100% rename from lua/software-timestamps.lua rename to client/lua/software-timestamps.lua diff --git a/rfc2544/Makefile b/client/rfc2544/Makefile similarity index 100% rename from rfc2544/Makefile rename to client/rfc2544/Makefile diff --git a/rfc2544/benchmarks/backtoback.lua b/client/rfc2544/benchmarks/backtoback.lua similarity index 100% rename from rfc2544/benchmarks/backtoback.lua rename to client/rfc2544/benchmarks/backtoback.lua diff --git a/rfc2544/benchmarks/frameloss.lua b/client/rfc2544/benchmarks/frameloss.lua similarity index 100% rename from rfc2544/benchmarks/frameloss.lua rename to client/rfc2544/benchmarks/frameloss.lua diff --git a/rfc2544/benchmarks/latency.lua b/client/rfc2544/benchmarks/latency.lua similarity index 100% rename from rfc2544/benchmarks/latency.lua rename to client/rfc2544/benchmarks/latency.lua diff --git a/rfc2544/benchmarks/throughput.lua b/client/rfc2544/benchmarks/throughput.lua similarity index 100% rename from rfc2544/benchmarks/throughput.lua rename to client/rfc2544/benchmarks/throughput.lua diff --git a/rfc2544/config.lua b/client/rfc2544/config.lua similarity index 100% rename from rfc2544/config.lua rename to client/rfc2544/config.lua diff --git a/rfc2544/master.lua b/client/rfc2544/master.lua similarity index 100% rename from rfc2544/master.lua rename to client/rfc2544/master.lua diff --git a/rfc2544/utils/Makefile b/client/rfc2544/utils/Makefile similarity index 100% rename from rfc2544/utils/Makefile rename to client/rfc2544/utils/Makefile diff --git a/rfc2544/utils/ffi/ssh.lua b/client/rfc2544/utils/ffi/ssh.lua similarity index 100% rename from rfc2544/utils/ffi/ssh.lua rename to client/rfc2544/utils/ffi/ssh.lua diff --git a/rfc2544/utils/manual.lua b/client/rfc2544/utils/manual.lua similarity index 100% rename from rfc2544/utils/manual.lua rename to client/rfc2544/utils/manual.lua diff --git a/rfc2544/utils/snmp.lua b/client/rfc2544/utils/snmp.lua similarity index 100% rename from rfc2544/utils/snmp.lua rename to client/rfc2544/utils/snmp.lua diff --git a/rfc2544/utils/snmpc.c b/client/rfc2544/utils/snmpc.c similarity index 100% rename from rfc2544/utils/snmpc.c rename to client/rfc2544/utils/snmpc.c diff --git a/rfc2544/utils/ssh-freebsd.lua b/client/rfc2544/utils/ssh-freebsd.lua similarity index 100% rename from rfc2544/utils/ssh-freebsd.lua rename to client/rfc2544/utils/ssh-freebsd.lua diff --git a/rfc2544/utils/ssh-mikrotik.lua b/client/rfc2544/utils/ssh-mikrotik.lua similarity index 100% rename from rfc2544/utils/ssh-mikrotik.lua rename to client/rfc2544/utils/ssh-mikrotik.lua diff --git a/rfc2544/utils/ssh.lua b/client/rfc2544/utils/ssh.lua similarity index 100% rename from rfc2544/utils/ssh.lua rename to client/rfc2544/utils/ssh.lua diff --git a/rfc2544/utils/testreport.lua b/client/rfc2544/utils/testreport.lua similarity index 100% rename from rfc2544/utils/testreport.lua rename to client/rfc2544/utils/testreport.lua diff --git a/rfc2544/utils/tikz.lua b/client/rfc2544/utils/tikz.lua similarity index 100% rename from rfc2544/utils/tikz.lua rename to client/rfc2544/utils/tikz.lua diff --git a/rfc2544/utils/utils.lua b/client/rfc2544/utils/utils.lua similarity index 100% rename from rfc2544/utils/utils.lua rename to client/rfc2544/utils/utils.lua diff --git a/setup-hugetlbfs.sh b/client/setup-hugetlbfs.sh similarity index 100% rename from setup-hugetlbfs.sh rename to client/setup-hugetlbfs.sh diff --git a/src/crc-rate-limiter.c b/client/src/crc-rate-limiter.c similarity index 100% rename from src/crc-rate-limiter.c rename to client/src/crc-rate-limiter.c diff --git a/src/moongen-main.cpp b/client/src/moongen-main.cpp similarity index 100% rename from src/moongen-main.cpp rename to client/src/moongen-main.cpp diff --git a/src/software-rate-limiter.cpp b/client/src/software-rate-limiter.cpp similarity index 100% rename from src/software-rate-limiter.cpp rename to client/src/software-rate-limiter.cpp diff --git a/src/software-timestamping.c b/client/src/software-timestamping.c similarity index 100% rename from src/software-timestamping.c rename to client/src/software-timestamping.c diff --git a/test/.gitignore b/client/test/.gitignore similarity index 100% rename from test/.gitignore rename to client/test/.gitignore diff --git a/test/config/.gitignore b/client/test/config/.gitignore similarity index 100% rename from test/config/.gitignore rename to client/test/config/.gitignore diff --git a/test/config/autoconfig.sh b/client/test/config/autoconfig.sh similarity index 100% rename from test/config/autoconfig.sh rename to client/test/config/autoconfig.sh diff --git a/test/config/devices.lua b/client/test/config/devices.lua similarity index 100% rename from test/config/devices.lua rename to client/test/config/devices.lua diff --git a/test/config/pairs.lua b/client/test/config/pairs.lua similarity index 100% rename from test/config/pairs.lua rename to client/test/config/pairs.lua diff --git a/test/config/speed.lua b/client/test/config/speed.lua similarity index 100% rename from test/config/speed.lua rename to client/test/config/speed.lua diff --git a/test/exec.sh b/client/test/exec.sh similarity index 100% rename from test/exec.sh rename to client/test/exec.sh diff --git a/test/testlib.lua b/client/test/testlib.lua similarity index 100% rename from test/testlib.lua rename to client/test/testlib.lua diff --git a/test/testlog.lua b/client/test/testlog.lua similarity index 100% rename from test/testlog.lua rename to client/test/testlog.lua diff --git a/test/tests/00-basics.lua b/client/test/tests/00-basics.lua similarity index 100% rename from test/tests/00-basics.lua rename to client/test/tests/00-basics.lua diff --git a/test/tests/01-send.lua b/client/test/tests/01-send.lua similarity index 100% rename from test/tests/01-send.lua rename to client/test/tests/01-send.lua diff --git a/test/tests/02-receive.lua b/client/test/tests/02-receive.lua similarity index 100% rename from test/tests/02-receive.lua rename to client/test/tests/02-receive.lua diff --git a/test/tests/03-timestamping.lua b/client/test/tests/03-timestamping.lua similarity index 100% rename from test/tests/03-timestamping.lua rename to client/test/tests/03-timestamping.lua diff --git a/test/tests/04-flowratecontrol.lua b/client/test/tests/04-flowratecontrol.lua similarity index 100% rename from test/tests/04-flowratecontrol.lua rename to client/test/tests/04-flowratecontrol.lua diff --git a/libmoon b/libmoon deleted file mode 160000 index 88b3a2933..000000000 --- a/libmoon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 88b3a2933abae9e0d6a96a5bb541d6d5bdaba41e From 5a743f5161e7e6f4d816e5c4ff660e0f7005f28e Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Thu, 17 Nov 2016 10:01:07 +0200 Subject: [PATCH 12/15] Re-added submodule --- .gitmodules | 3 +++ libmoon | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 libmoon diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..bcef25b35 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "libmoon"] + path = libmoon + url = https://github.com/libmoon/libmoon diff --git a/libmoon b/libmoon new file mode 160000 index 000000000..88b3a2933 --- /dev/null +++ b/libmoon @@ -0,0 +1 @@ +Subproject commit 88b3a2933abae9e0d6a96a5bb541d6d5bdaba41e From d05caf1ef6d9916c5b74b57b9fcc674fb52a2cad Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Thu, 17 Nov 2016 10:06:39 +0200 Subject: [PATCH 13/15] Merge complete --- client/CMakeLists.txt => CMakeLists.txt | 0 client/Doxyfile => Doxyfile | 0 client/LICENSE => LICENSE | 0 client/README.md => README.md | 0 client/bind-interfaces.sh => bind-interfaces.sh | 0 client/build.sh => build.sh | 0 {client/build => build}/.gitignore | 0 {client/doc => doc}/DoxygenLayout.xml | 0 {client/doc => doc}/Slides.pdf | Bin {client/doc => doc}/architecture.md | 0 {client/doc => doc}/documentation.md | 0 {client/doc => doc}/download.md | 0 {client/doc => doc}/examples.md | 0 {client/doc => doc}/faq.md | 0 {client/doc => doc}/img/moongen-architecture.png | Bin {client/doc => doc}/img/moongen-architecture@2x.png | Bin .../img/ratecontrol-moongen-hardware.png | Bin .../img/ratecontrol-moongen-hardware@2x.png | Bin .../img/ratecontrol-moongen-software.png | Bin .../img/ratecontrol-moongen-software@2x.png | Bin .../img/ratecontrol-traditional-software.png | Bin .../img/ratecontrol-traditional-software@2x.png | Bin {client/doc => doc}/index.md | 0 {client/doc => doc}/install.md | 0 {client/doc => doc}/packet_api.md | 0 {client/doc => doc}/rate_control.md | 0 {client/doc => doc}/timestamping.md | 0 {client/examples => examples}/benchmark/README.md | 0 .../benchmark/compare-rate-control-mechanisms.lua | 0 .../benchmark/cycles-per-pkt.lua | 0 .../benchmark/heavy-workload.lua | 0 .../benchmark/packet-sizes-rx.lua | 0 .../benchmark/packet-sizes.lua | 0 .../benchmark/udp-throughput.lua | 0 {client/examples => examples}/dump.lua | 0 .../examples => examples}/icmp-arp-responder.lua | 0 .../examples => examples}/inter-arrival-times.lua | 0 {client/examples => examples}/ipfix-generation.lua | 0 {client/examples => examples}/l2-bursts.lua | 0 {client/examples => examples}/l2-load-latency.lua | 0 .../l2-poisson-load-latency.lua | 0 {client/examples => examples}/l3-load-latency.lua | 0 {client/examples => examples}/l3-tcp-syn-flood.lua | 0 {client/examples => examples}/lacp.lua | 0 .../netronome-packetgen/Readme.txt | 0 .../netronome-packetgen/packetgen.lua | 0 {client/examples => examples}/pcap/dump-pkts.lua | 0 {client/examples => examples}/pcap/replay-pcap.lua | 0 .../quality-of-service-test.lua | 0 .../examples => examples}/rate-control-methods.lua | 0 {client/examples => examples}/rss.lua | 0 .../examples => examples}/rx-pkts-distribution.lua | 0 .../timestamping-tests/README.md | 0 .../timestamping-tests/drift.lua | 0 .../test-timestamping-capabilities.lua | 0 .../timestamping-tests/timestamps-software.lua | 0 {client/examples => examples}/vxlan-example.lua | 0 {client/log => log}/.gitignore | 0 {client/lua => lua}/crc-ratecontrol.lua | 0 {client/lua => lua}/moongen-compat.lua | 0 {client/lua => lua}/moongen-main.lua | 0 {client/lua => lua}/moongen.lua | 0 {client/lua => lua}/software-ratecontrol.lua | 0 {client/lua => lua}/software-timestamps.lua | 0 {client/rfc2544 => rfc2544}/Makefile | 0 .../rfc2544 => rfc2544}/benchmarks/backtoback.lua | 0 .../rfc2544 => rfc2544}/benchmarks/frameloss.lua | 0 {client/rfc2544 => rfc2544}/benchmarks/latency.lua | 0 .../rfc2544 => rfc2544}/benchmarks/throughput.lua | 0 {client/rfc2544 => rfc2544}/config.lua | 0 {client/rfc2544 => rfc2544}/master.lua | 0 {client/rfc2544 => rfc2544}/utils/Makefile | 0 {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua | 0 {client/rfc2544 => rfc2544}/utils/manual.lua | 0 {client/rfc2544 => rfc2544}/utils/snmp.lua | 0 {client/rfc2544 => rfc2544}/utils/snmpc.c | 0 {client/rfc2544 => rfc2544}/utils/ssh-freebsd.lua | 0 {client/rfc2544 => rfc2544}/utils/ssh-mikrotik.lua | 0 {client/rfc2544 => rfc2544}/utils/ssh.lua | 0 {client/rfc2544 => rfc2544}/utils/testreport.lua | 0 {client/rfc2544 => rfc2544}/utils/tikz.lua | 0 {client/rfc2544 => rfc2544}/utils/utils.lua | 0 client/setup-hugetlbfs.sh => setup-hugetlbfs.sh | 0 {client/src => src}/crc-rate-limiter.c | 0 {client/src => src}/moongen-main.cpp | 0 {client/src => src}/software-rate-limiter.cpp | 0 {client/src => src}/software-timestamping.c | 0 {client/test => test}/.gitignore | 0 {client/test => test}/config/.gitignore | 0 {client/test => test}/config/autoconfig.sh | 0 {client/test => test}/config/devices.lua | 0 {client/test => test}/config/pairs.lua | 0 {client/test => test}/config/speed.lua | 0 {client/test => test}/exec.sh | 0 {client/test => test}/testlib.lua | 0 {client/test => test}/testlog.lua | 0 {client/test => test}/tests/00-basics.lua | 0 {client/test => test}/tests/01-send.lua | 0 {client/test => test}/tests/02-receive.lua | 0 {client/test => test}/tests/03-timestamping.lua | 0 {client/test => test}/tests/04-flowratecontrol.lua | 0 101 files changed, 0 insertions(+), 0 deletions(-) rename client/CMakeLists.txt => CMakeLists.txt (100%) rename client/Doxyfile => Doxyfile (100%) rename client/LICENSE => LICENSE (100%) rename client/README.md => README.md (100%) rename client/bind-interfaces.sh => bind-interfaces.sh (100%) rename client/build.sh => build.sh (100%) rename {client/build => build}/.gitignore (100%) rename {client/doc => doc}/DoxygenLayout.xml (100%) rename {client/doc => doc}/Slides.pdf (100%) rename {client/doc => doc}/architecture.md (100%) rename {client/doc => doc}/documentation.md (100%) rename {client/doc => doc}/download.md (100%) rename {client/doc => doc}/examples.md (100%) rename {client/doc => doc}/faq.md (100%) rename {client/doc => doc}/img/moongen-architecture.png (100%) rename {client/doc => doc}/img/moongen-architecture@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-hardware@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software.png (100%) rename {client/doc => doc}/img/ratecontrol-moongen-software@2x.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software.png (100%) rename {client/doc => doc}/img/ratecontrol-traditional-software@2x.png (100%) rename {client/doc => doc}/index.md (100%) rename {client/doc => doc}/install.md (100%) rename {client/doc => doc}/packet_api.md (100%) rename {client/doc => doc}/rate_control.md (100%) rename {client/doc => doc}/timestamping.md (100%) rename {client/examples => examples}/benchmark/README.md (100%) rename {client/examples => examples}/benchmark/compare-rate-control-mechanisms.lua (100%) rename {client/examples => examples}/benchmark/cycles-per-pkt.lua (100%) rename {client/examples => examples}/benchmark/heavy-workload.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes-rx.lua (100%) rename {client/examples => examples}/benchmark/packet-sizes.lua (100%) rename {client/examples => examples}/benchmark/udp-throughput.lua (100%) rename {client/examples => examples}/dump.lua (100%) rename {client/examples => examples}/icmp-arp-responder.lua (100%) rename {client/examples => examples}/inter-arrival-times.lua (100%) rename {client/examples => examples}/ipfix-generation.lua (100%) rename {client/examples => examples}/l2-bursts.lua (100%) rename {client/examples => examples}/l2-load-latency.lua (100%) rename {client/examples => examples}/l2-poisson-load-latency.lua (100%) rename {client/examples => examples}/l3-load-latency.lua (100%) rename {client/examples => examples}/l3-tcp-syn-flood.lua (100%) rename {client/examples => examples}/lacp.lua (100%) rename {client/examples => examples}/netronome-packetgen/Readme.txt (100%) rename {client/examples => examples}/netronome-packetgen/packetgen.lua (100%) rename {client/examples => examples}/pcap/dump-pkts.lua (100%) rename {client/examples => examples}/pcap/replay-pcap.lua (100%) rename {client/examples => examples}/quality-of-service-test.lua (100%) rename {client/examples => examples}/rate-control-methods.lua (100%) rename {client/examples => examples}/rss.lua (100%) rename {client/examples => examples}/rx-pkts-distribution.lua (100%) rename {client/examples => examples}/timestamping-tests/README.md (100%) rename {client/examples => examples}/timestamping-tests/drift.lua (100%) rename {client/examples => examples}/timestamping-tests/test-timestamping-capabilities.lua (100%) rename {client/examples => examples}/timestamping-tests/timestamps-software.lua (100%) rename {client/examples => examples}/vxlan-example.lua (100%) rename {client/log => log}/.gitignore (100%) rename {client/lua => lua}/crc-ratecontrol.lua (100%) rename {client/lua => lua}/moongen-compat.lua (100%) rename {client/lua => lua}/moongen-main.lua (100%) rename {client/lua => lua}/moongen.lua (100%) rename {client/lua => lua}/software-ratecontrol.lua (100%) rename {client/lua => lua}/software-timestamps.lua (100%) rename {client/rfc2544 => rfc2544}/Makefile (100%) rename {client/rfc2544 => rfc2544}/benchmarks/backtoback.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/frameloss.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/latency.lua (100%) rename {client/rfc2544 => rfc2544}/benchmarks/throughput.lua (100%) rename {client/rfc2544 => rfc2544}/config.lua (100%) rename {client/rfc2544 => rfc2544}/master.lua (100%) rename {client/rfc2544 => rfc2544}/utils/Makefile (100%) rename {client/rfc2544 => rfc2544}/utils/ffi/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/manual.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmp.lua (100%) rename {client/rfc2544 => rfc2544}/utils/snmpc.c (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-freebsd.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh-mikrotik.lua (100%) rename {client/rfc2544 => rfc2544}/utils/ssh.lua (100%) rename {client/rfc2544 => rfc2544}/utils/testreport.lua (100%) rename {client/rfc2544 => rfc2544}/utils/tikz.lua (100%) rename {client/rfc2544 => rfc2544}/utils/utils.lua (100%) rename client/setup-hugetlbfs.sh => setup-hugetlbfs.sh (100%) rename {client/src => src}/crc-rate-limiter.c (100%) rename {client/src => src}/moongen-main.cpp (100%) rename {client/src => src}/software-rate-limiter.cpp (100%) rename {client/src => src}/software-timestamping.c (100%) rename {client/test => test}/.gitignore (100%) rename {client/test => test}/config/.gitignore (100%) rename {client/test => test}/config/autoconfig.sh (100%) rename {client/test => test}/config/devices.lua (100%) rename {client/test => test}/config/pairs.lua (100%) rename {client/test => test}/config/speed.lua (100%) rename {client/test => test}/exec.sh (100%) rename {client/test => test}/testlib.lua (100%) rename {client/test => test}/testlog.lua (100%) rename {client/test => test}/tests/00-basics.lua (100%) rename {client/test => test}/tests/01-send.lua (100%) rename {client/test => test}/tests/02-receive.lua (100%) rename {client/test => test}/tests/03-timestamping.lua (100%) rename {client/test => test}/tests/04-flowratecontrol.lua (100%) diff --git a/client/CMakeLists.txt b/CMakeLists.txt similarity index 100% rename from client/CMakeLists.txt rename to CMakeLists.txt diff --git a/client/Doxyfile b/Doxyfile similarity index 100% rename from client/Doxyfile rename to Doxyfile diff --git a/client/LICENSE b/LICENSE similarity index 100% rename from client/LICENSE rename to LICENSE diff --git a/client/README.md b/README.md similarity index 100% rename from client/README.md rename to README.md diff --git a/client/bind-interfaces.sh b/bind-interfaces.sh similarity index 100% rename from client/bind-interfaces.sh rename to bind-interfaces.sh diff --git a/client/build.sh b/build.sh similarity index 100% rename from client/build.sh rename to build.sh diff --git a/client/build/.gitignore b/build/.gitignore similarity index 100% rename from client/build/.gitignore rename to build/.gitignore diff --git a/client/doc/DoxygenLayout.xml b/doc/DoxygenLayout.xml similarity index 100% rename from client/doc/DoxygenLayout.xml rename to doc/DoxygenLayout.xml diff --git a/client/doc/Slides.pdf b/doc/Slides.pdf similarity index 100% rename from client/doc/Slides.pdf rename to doc/Slides.pdf diff --git a/client/doc/architecture.md b/doc/architecture.md similarity index 100% rename from client/doc/architecture.md rename to doc/architecture.md diff --git a/client/doc/documentation.md b/doc/documentation.md similarity index 100% rename from client/doc/documentation.md rename to doc/documentation.md diff --git a/client/doc/download.md b/doc/download.md similarity index 100% rename from client/doc/download.md rename to doc/download.md diff --git a/client/doc/examples.md b/doc/examples.md similarity index 100% rename from client/doc/examples.md rename to doc/examples.md diff --git a/client/doc/faq.md b/doc/faq.md similarity index 100% rename from client/doc/faq.md rename to doc/faq.md diff --git a/client/doc/img/moongen-architecture.png b/doc/img/moongen-architecture.png similarity index 100% rename from client/doc/img/moongen-architecture.png rename to doc/img/moongen-architecture.png diff --git a/client/doc/img/moongen-architecture@2x.png b/doc/img/moongen-architecture@2x.png similarity index 100% rename from client/doc/img/moongen-architecture@2x.png rename to doc/img/moongen-architecture@2x.png diff --git a/client/doc/img/ratecontrol-moongen-hardware.png b/doc/img/ratecontrol-moongen-hardware.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware.png rename to doc/img/ratecontrol-moongen-hardware.png diff --git a/client/doc/img/ratecontrol-moongen-hardware@2x.png b/doc/img/ratecontrol-moongen-hardware@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-hardware@2x.png rename to doc/img/ratecontrol-moongen-hardware@2x.png diff --git a/client/doc/img/ratecontrol-moongen-software.png b/doc/img/ratecontrol-moongen-software.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software.png rename to doc/img/ratecontrol-moongen-software.png diff --git a/client/doc/img/ratecontrol-moongen-software@2x.png b/doc/img/ratecontrol-moongen-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-moongen-software@2x.png rename to doc/img/ratecontrol-moongen-software@2x.png diff --git a/client/doc/img/ratecontrol-traditional-software.png b/doc/img/ratecontrol-traditional-software.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software.png rename to doc/img/ratecontrol-traditional-software.png diff --git a/client/doc/img/ratecontrol-traditional-software@2x.png b/doc/img/ratecontrol-traditional-software@2x.png similarity index 100% rename from client/doc/img/ratecontrol-traditional-software@2x.png rename to doc/img/ratecontrol-traditional-software@2x.png diff --git a/client/doc/index.md b/doc/index.md similarity index 100% rename from client/doc/index.md rename to doc/index.md diff --git a/client/doc/install.md b/doc/install.md similarity index 100% rename from client/doc/install.md rename to doc/install.md diff --git a/client/doc/packet_api.md b/doc/packet_api.md similarity index 100% rename from client/doc/packet_api.md rename to doc/packet_api.md diff --git a/client/doc/rate_control.md b/doc/rate_control.md similarity index 100% rename from client/doc/rate_control.md rename to doc/rate_control.md diff --git a/client/doc/timestamping.md b/doc/timestamping.md similarity index 100% rename from client/doc/timestamping.md rename to doc/timestamping.md diff --git a/client/examples/benchmark/README.md b/examples/benchmark/README.md similarity index 100% rename from client/examples/benchmark/README.md rename to examples/benchmark/README.md diff --git a/client/examples/benchmark/compare-rate-control-mechanisms.lua b/examples/benchmark/compare-rate-control-mechanisms.lua similarity index 100% rename from client/examples/benchmark/compare-rate-control-mechanisms.lua rename to examples/benchmark/compare-rate-control-mechanisms.lua diff --git a/client/examples/benchmark/cycles-per-pkt.lua b/examples/benchmark/cycles-per-pkt.lua similarity index 100% rename from client/examples/benchmark/cycles-per-pkt.lua rename to examples/benchmark/cycles-per-pkt.lua diff --git a/client/examples/benchmark/heavy-workload.lua b/examples/benchmark/heavy-workload.lua similarity index 100% rename from client/examples/benchmark/heavy-workload.lua rename to examples/benchmark/heavy-workload.lua diff --git a/client/examples/benchmark/packet-sizes-rx.lua b/examples/benchmark/packet-sizes-rx.lua similarity index 100% rename from client/examples/benchmark/packet-sizes-rx.lua rename to examples/benchmark/packet-sizes-rx.lua diff --git a/client/examples/benchmark/packet-sizes.lua b/examples/benchmark/packet-sizes.lua similarity index 100% rename from client/examples/benchmark/packet-sizes.lua rename to examples/benchmark/packet-sizes.lua diff --git a/client/examples/benchmark/udp-throughput.lua b/examples/benchmark/udp-throughput.lua similarity index 100% rename from client/examples/benchmark/udp-throughput.lua rename to examples/benchmark/udp-throughput.lua diff --git a/client/examples/dump.lua b/examples/dump.lua similarity index 100% rename from client/examples/dump.lua rename to examples/dump.lua diff --git a/client/examples/icmp-arp-responder.lua b/examples/icmp-arp-responder.lua similarity index 100% rename from client/examples/icmp-arp-responder.lua rename to examples/icmp-arp-responder.lua diff --git a/client/examples/inter-arrival-times.lua b/examples/inter-arrival-times.lua similarity index 100% rename from client/examples/inter-arrival-times.lua rename to examples/inter-arrival-times.lua diff --git a/client/examples/ipfix-generation.lua b/examples/ipfix-generation.lua similarity index 100% rename from client/examples/ipfix-generation.lua rename to examples/ipfix-generation.lua diff --git a/client/examples/l2-bursts.lua b/examples/l2-bursts.lua similarity index 100% rename from client/examples/l2-bursts.lua rename to examples/l2-bursts.lua diff --git a/client/examples/l2-load-latency.lua b/examples/l2-load-latency.lua similarity index 100% rename from client/examples/l2-load-latency.lua rename to examples/l2-load-latency.lua diff --git a/client/examples/l2-poisson-load-latency.lua b/examples/l2-poisson-load-latency.lua similarity index 100% rename from client/examples/l2-poisson-load-latency.lua rename to examples/l2-poisson-load-latency.lua diff --git a/client/examples/l3-load-latency.lua b/examples/l3-load-latency.lua similarity index 100% rename from client/examples/l3-load-latency.lua rename to examples/l3-load-latency.lua diff --git a/client/examples/l3-tcp-syn-flood.lua b/examples/l3-tcp-syn-flood.lua similarity index 100% rename from client/examples/l3-tcp-syn-flood.lua rename to examples/l3-tcp-syn-flood.lua diff --git a/client/examples/lacp.lua b/examples/lacp.lua similarity index 100% rename from client/examples/lacp.lua rename to examples/lacp.lua diff --git a/client/examples/netronome-packetgen/Readme.txt b/examples/netronome-packetgen/Readme.txt similarity index 100% rename from client/examples/netronome-packetgen/Readme.txt rename to examples/netronome-packetgen/Readme.txt diff --git a/client/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua similarity index 100% rename from client/examples/netronome-packetgen/packetgen.lua rename to examples/netronome-packetgen/packetgen.lua diff --git a/client/examples/pcap/dump-pkts.lua b/examples/pcap/dump-pkts.lua similarity index 100% rename from client/examples/pcap/dump-pkts.lua rename to examples/pcap/dump-pkts.lua diff --git a/client/examples/pcap/replay-pcap.lua b/examples/pcap/replay-pcap.lua similarity index 100% rename from client/examples/pcap/replay-pcap.lua rename to examples/pcap/replay-pcap.lua diff --git a/client/examples/quality-of-service-test.lua b/examples/quality-of-service-test.lua similarity index 100% rename from client/examples/quality-of-service-test.lua rename to examples/quality-of-service-test.lua diff --git a/client/examples/rate-control-methods.lua b/examples/rate-control-methods.lua similarity index 100% rename from client/examples/rate-control-methods.lua rename to examples/rate-control-methods.lua diff --git a/client/examples/rss.lua b/examples/rss.lua similarity index 100% rename from client/examples/rss.lua rename to examples/rss.lua diff --git a/client/examples/rx-pkts-distribution.lua b/examples/rx-pkts-distribution.lua similarity index 100% rename from client/examples/rx-pkts-distribution.lua rename to examples/rx-pkts-distribution.lua diff --git a/client/examples/timestamping-tests/README.md b/examples/timestamping-tests/README.md similarity index 100% rename from client/examples/timestamping-tests/README.md rename to examples/timestamping-tests/README.md diff --git a/client/examples/timestamping-tests/drift.lua b/examples/timestamping-tests/drift.lua similarity index 100% rename from client/examples/timestamping-tests/drift.lua rename to examples/timestamping-tests/drift.lua diff --git a/client/examples/timestamping-tests/test-timestamping-capabilities.lua b/examples/timestamping-tests/test-timestamping-capabilities.lua similarity index 100% rename from client/examples/timestamping-tests/test-timestamping-capabilities.lua rename to examples/timestamping-tests/test-timestamping-capabilities.lua diff --git a/client/examples/timestamping-tests/timestamps-software.lua b/examples/timestamping-tests/timestamps-software.lua similarity index 100% rename from client/examples/timestamping-tests/timestamps-software.lua rename to examples/timestamping-tests/timestamps-software.lua diff --git a/client/examples/vxlan-example.lua b/examples/vxlan-example.lua similarity index 100% rename from client/examples/vxlan-example.lua rename to examples/vxlan-example.lua diff --git a/client/log/.gitignore b/log/.gitignore similarity index 100% rename from client/log/.gitignore rename to log/.gitignore diff --git a/client/lua/crc-ratecontrol.lua b/lua/crc-ratecontrol.lua similarity index 100% rename from client/lua/crc-ratecontrol.lua rename to lua/crc-ratecontrol.lua diff --git a/client/lua/moongen-compat.lua b/lua/moongen-compat.lua similarity index 100% rename from client/lua/moongen-compat.lua rename to lua/moongen-compat.lua diff --git a/client/lua/moongen-main.lua b/lua/moongen-main.lua similarity index 100% rename from client/lua/moongen-main.lua rename to lua/moongen-main.lua diff --git a/client/lua/moongen.lua b/lua/moongen.lua similarity index 100% rename from client/lua/moongen.lua rename to lua/moongen.lua diff --git a/client/lua/software-ratecontrol.lua b/lua/software-ratecontrol.lua similarity index 100% rename from client/lua/software-ratecontrol.lua rename to lua/software-ratecontrol.lua diff --git a/client/lua/software-timestamps.lua b/lua/software-timestamps.lua similarity index 100% rename from client/lua/software-timestamps.lua rename to lua/software-timestamps.lua diff --git a/client/rfc2544/Makefile b/rfc2544/Makefile similarity index 100% rename from client/rfc2544/Makefile rename to rfc2544/Makefile diff --git a/client/rfc2544/benchmarks/backtoback.lua b/rfc2544/benchmarks/backtoback.lua similarity index 100% rename from client/rfc2544/benchmarks/backtoback.lua rename to rfc2544/benchmarks/backtoback.lua diff --git a/client/rfc2544/benchmarks/frameloss.lua b/rfc2544/benchmarks/frameloss.lua similarity index 100% rename from client/rfc2544/benchmarks/frameloss.lua rename to rfc2544/benchmarks/frameloss.lua diff --git a/client/rfc2544/benchmarks/latency.lua b/rfc2544/benchmarks/latency.lua similarity index 100% rename from client/rfc2544/benchmarks/latency.lua rename to rfc2544/benchmarks/latency.lua diff --git a/client/rfc2544/benchmarks/throughput.lua b/rfc2544/benchmarks/throughput.lua similarity index 100% rename from client/rfc2544/benchmarks/throughput.lua rename to rfc2544/benchmarks/throughput.lua diff --git a/client/rfc2544/config.lua b/rfc2544/config.lua similarity index 100% rename from client/rfc2544/config.lua rename to rfc2544/config.lua diff --git a/client/rfc2544/master.lua b/rfc2544/master.lua similarity index 100% rename from client/rfc2544/master.lua rename to rfc2544/master.lua diff --git a/client/rfc2544/utils/Makefile b/rfc2544/utils/Makefile similarity index 100% rename from client/rfc2544/utils/Makefile rename to rfc2544/utils/Makefile diff --git a/client/rfc2544/utils/ffi/ssh.lua b/rfc2544/utils/ffi/ssh.lua similarity index 100% rename from client/rfc2544/utils/ffi/ssh.lua rename to rfc2544/utils/ffi/ssh.lua diff --git a/client/rfc2544/utils/manual.lua b/rfc2544/utils/manual.lua similarity index 100% rename from client/rfc2544/utils/manual.lua rename to rfc2544/utils/manual.lua diff --git a/client/rfc2544/utils/snmp.lua b/rfc2544/utils/snmp.lua similarity index 100% rename from client/rfc2544/utils/snmp.lua rename to rfc2544/utils/snmp.lua diff --git a/client/rfc2544/utils/snmpc.c b/rfc2544/utils/snmpc.c similarity index 100% rename from client/rfc2544/utils/snmpc.c rename to rfc2544/utils/snmpc.c diff --git a/client/rfc2544/utils/ssh-freebsd.lua b/rfc2544/utils/ssh-freebsd.lua similarity index 100% rename from client/rfc2544/utils/ssh-freebsd.lua rename to rfc2544/utils/ssh-freebsd.lua diff --git a/client/rfc2544/utils/ssh-mikrotik.lua b/rfc2544/utils/ssh-mikrotik.lua similarity index 100% rename from client/rfc2544/utils/ssh-mikrotik.lua rename to rfc2544/utils/ssh-mikrotik.lua diff --git a/client/rfc2544/utils/ssh.lua b/rfc2544/utils/ssh.lua similarity index 100% rename from client/rfc2544/utils/ssh.lua rename to rfc2544/utils/ssh.lua diff --git a/client/rfc2544/utils/testreport.lua b/rfc2544/utils/testreport.lua similarity index 100% rename from client/rfc2544/utils/testreport.lua rename to rfc2544/utils/testreport.lua diff --git a/client/rfc2544/utils/tikz.lua b/rfc2544/utils/tikz.lua similarity index 100% rename from client/rfc2544/utils/tikz.lua rename to rfc2544/utils/tikz.lua diff --git a/client/rfc2544/utils/utils.lua b/rfc2544/utils/utils.lua similarity index 100% rename from client/rfc2544/utils/utils.lua rename to rfc2544/utils/utils.lua diff --git a/client/setup-hugetlbfs.sh b/setup-hugetlbfs.sh similarity index 100% rename from client/setup-hugetlbfs.sh rename to setup-hugetlbfs.sh diff --git a/client/src/crc-rate-limiter.c b/src/crc-rate-limiter.c similarity index 100% rename from client/src/crc-rate-limiter.c rename to src/crc-rate-limiter.c diff --git a/client/src/moongen-main.cpp b/src/moongen-main.cpp similarity index 100% rename from client/src/moongen-main.cpp rename to src/moongen-main.cpp diff --git a/client/src/software-rate-limiter.cpp b/src/software-rate-limiter.cpp similarity index 100% rename from client/src/software-rate-limiter.cpp rename to src/software-rate-limiter.cpp diff --git a/client/src/software-timestamping.c b/src/software-timestamping.c similarity index 100% rename from client/src/software-timestamping.c rename to src/software-timestamping.c diff --git a/client/test/.gitignore b/test/.gitignore similarity index 100% rename from client/test/.gitignore rename to test/.gitignore diff --git a/client/test/config/.gitignore b/test/config/.gitignore similarity index 100% rename from client/test/config/.gitignore rename to test/config/.gitignore diff --git a/client/test/config/autoconfig.sh b/test/config/autoconfig.sh similarity index 100% rename from client/test/config/autoconfig.sh rename to test/config/autoconfig.sh diff --git a/client/test/config/devices.lua b/test/config/devices.lua similarity index 100% rename from client/test/config/devices.lua rename to test/config/devices.lua diff --git a/client/test/config/pairs.lua b/test/config/pairs.lua similarity index 100% rename from client/test/config/pairs.lua rename to test/config/pairs.lua diff --git a/client/test/config/speed.lua b/test/config/speed.lua similarity index 100% rename from client/test/config/speed.lua rename to test/config/speed.lua diff --git a/client/test/exec.sh b/test/exec.sh similarity index 100% rename from client/test/exec.sh rename to test/exec.sh diff --git a/client/test/testlib.lua b/test/testlib.lua similarity index 100% rename from client/test/testlib.lua rename to test/testlib.lua diff --git a/client/test/testlog.lua b/test/testlog.lua similarity index 100% rename from client/test/testlog.lua rename to test/testlog.lua diff --git a/client/test/tests/00-basics.lua b/test/tests/00-basics.lua similarity index 100% rename from client/test/tests/00-basics.lua rename to test/tests/00-basics.lua diff --git a/client/test/tests/01-send.lua b/test/tests/01-send.lua similarity index 100% rename from client/test/tests/01-send.lua rename to test/tests/01-send.lua diff --git a/client/test/tests/02-receive.lua b/test/tests/02-receive.lua similarity index 100% rename from client/test/tests/02-receive.lua rename to test/tests/02-receive.lua diff --git a/client/test/tests/03-timestamping.lua b/test/tests/03-timestamping.lua similarity index 100% rename from client/test/tests/03-timestamping.lua rename to test/tests/03-timestamping.lua diff --git a/client/test/tests/04-flowratecontrol.lua b/test/tests/04-flowratecontrol.lua similarity index 100% rename from client/test/tests/04-flowratecontrol.lua rename to test/tests/04-flowratecontrol.lua From b651e59466cc3b067fc3f602f45ec2c03cb55dd7 Mon Sep 17 00:00:00 2001 From: NetronomeMoongen Date: Thu, 17 Nov 2016 15:26:16 +0200 Subject: [PATCH 14/15] Use moongen instead of libmoon --- examples/netronome-packetgen/packetgen.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua index 42cd99c93..eea5301f0 100644 --- a/examples/netronome-packetgen/packetgen.lua +++ b/examples/netronome-packetgen/packetgen.lua @@ -31,7 +31,6 @@ packet sizes 1514, 570, and 64, respectively. --]] -local libmoon = require "libmoon" local mg = require "moongen" local moongen = require "dpdk" local dpdkc = require "dpdkc" @@ -271,7 +270,7 @@ function master(...) -- Check if the port must be used as a TX slave: for _, txPortId in ipairs(clParams.txSlavePorts) do if txPortId == portId then - libmoon.startTask("txSlave", devices[i], portId, slaveId, clParams) + mg.startTask("txSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end @@ -279,7 +278,7 @@ function master(...) -- Check if the port must be used as a RX slave: for _, rxPortId in ipairs(clParams.rxSlavePorts) do if rxPortId == portId then - libmoon.startTask("rxSlave", devices[i], portId, slaveId, clParams) + mg.startTask("rxSlave", devices[i], portId, slaveId, clParams) slaveId = slaveId + 1 break end From 01e02c7d4e9869121eea7c80a26243487690b4f5 Mon Sep 17 00:00:00 2001 From: Netronome-moongen Date: Mon, 21 Nov 2016 14:56:33 +0200 Subject: [PATCH 15/15] Add files via upload --- examples/netronome-packetgen/packetgen.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/netronome-packetgen/packetgen.lua b/examples/netronome-packetgen/packetgen.lua index eea5301f0..fd984cb95 100644 --- a/examples/netronome-packetgen/packetgen.lua +++ b/examples/netronome-packetgen/packetgen.lua @@ -1,4 +1,4 @@ ---[[ +--[[ Copyright (C) 2016 Netronome Systems, Inc. All rights reserved.