Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use moongen startTask instead of libmoon startTask call in packetgen #158

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Use moongen startTask instead of libmoon startTask call in packetgen #158

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e924eed
First phase of updating repo to match vanilla MoonGen - WIP
NetronomeMoongen Nov 14, 2016
24c8abc
Updating repo - WIP
NetronomeMoongen Nov 14, 2016
ec6251d
Final step to updating repo to match vanilla MoonGen - WIP
NetronomeMoongen Nov 14, 2016
b89a849
Add files via upload
NetronomeMoongen Nov 14, 2016
74459de
Moved files and folders to temporary client dir
NetronomeMoongen Nov 16, 2016
9f5b8fb
Removed submodule
NetronomeMoongen Nov 16, 2016
bdfaf8e
Removed conflicts
NetronomeMoongen Nov 16, 2016
521c567
Moved files and folders from temporary client directory to their prop…
NetronomeMoongen Nov 16, 2016
aff3baa
Updated packetgen to accomodate changes to MoonGen
NetronomeMoongen Nov 16, 2016
9f2ee09
Updated to match vanilla MoonGen
NetronomeMoongen Nov 14, 2016
9f8f511
Updates to match vanilla MoonGenMerge branch 'master' of https://gith…
NetronomeMoongen Nov 16, 2016
e2e32ae
Updates to match vanilla MoonGen
NetronomeMoongen Nov 14, 2016
805288e
Merge branch 'master' of https://github.com/NetronomeMoongen/MoonGen
NetronomeMoongen Nov 16, 2016
06ab7b3
Moved files and folders to temp dir for merge
NetronomeMoongen Nov 17, 2016
867be1c
Prepare repo for merge
NetronomeMoongen Nov 17, 2016
5a743f5
Re-added submodule
NetronomeMoongen Nov 17, 2016
d05caf1
Merge complete
NetronomeMoongen Nov 17, 2016
b651e59
Use moongen instead of libmoon
NetronomeMoongen Nov 17, 2016
01e02c7
Add files via upload
NetronomeMoongen Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions examples/netronome-packetgen/packetgen.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--[[
--[[

Copyright (C) 2016 Netronome Systems, Inc. All rights reserved.

Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -271,15 +270,15 @@ 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
end
-- 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
Expand Down