8000 Merge multiprocess and lwaftr branches by lukego · Pull Request #1148 · snabbco/snabb · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Merge multiprocess and lwaftr branches #1148

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.

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

8000
Merged
merged 787 commits into from
Jun 23, 2017

Conversation

lukego
Copy link
Member
@lukego lukego commented May 22, 2017

This integration branch is based on next and first merges multiprocess support (#1021) and then the latest lwAFTR (#1133).

The lwAFTR branch has already merged the multiprocess branch several times during development and so many commits are common to both branches. The reason that I merge both onto this integration branch is to make sure no commits are left behind and to detect any conflicts before landing on next. Git did not detect any conflicts so if the CI tests pass we are golden.

For anybody who wants to see how the new multiprocess support works: hop over to #1021 to see the short README for the API and shortish diff for the code. Don't be distracted by all of the discussion threads on the #1021 PR because that is mostly preliminary chatter while we thrashed out a working design. The API and implementation are both quite small and straightforward.

Katerina Barone-Adesi and others added 30 commits December 9, 2016 17:33
Remove useless pcap files, clarify docs and code.
Hard word wrap at 80 chars for filter perf doc
Sketch out Igalia's testing strategy
Minor improvements to snabb config listen
Add basic error reporting to snabb-softwire-v1
- Get rid of `screen` command.
- Connect to VM via telnet instead of ssh.
- Change syntax to "verb command".
- Remove "lwaftr" command.
- Enable extra tap network interface to have external internet access
  from the guest.
- program/lwaftr/Makefile: Clean up .o files.
- program/snabbvmx/Makefile: Clean up .o files.
lukego and others added 20 commits April 12, 2017 11:29
Tables of callback functions are now cached as instance variables
rather than being created with {...} on every call. These allocations
were not being sunk and so this eliminates heap allocation & GC.

(cherry picked from commit 76782f5)
* src/Makefile (snabb): Correctly add YANGOBJs.
* src/program/wall/tests/selftest.sh (SKIPPED_CODE): Skip if ndpi
  isn't available.
* src/program/wall/tests/selftest.sh (SKIPPED_CODE): Reverse the sense
  of the check.
The snabbvmx selftest currently passes only when run on a system with a
3.x kernel on the host.  We will fix this but in the interests of
getting the lwaftr in a mergeable state, temporarily disabling this test
by renaming it.
…mx-test

Temporarily disable snabbvmx selftest
…intel_mp

Disable bus-mastering cleanup for intel_mp
@wingo
Copy link
Contributor
wingo commented Jun 1, 2017

I don't quite understand the snabbdoc build error; do you, @lukego? I would think we can merge this to next at this point though.

@lukego
Copy link
Member Author
lukego commented Jun 2, 2017

Sorry about the wait. Hopefully fixed in 56a5acf.

@lukego
Copy link
Member Author
lukego commented Jun 2, 2017

Yep that did it. Merged onto next now.

@lukego lukego added the merged label Jun 2, 2017
@eugeneia eugeneia merged commit 56a5acf into snabbco:master Jun 23, 2017
takikawa added a commit to takikawa/snabb that referenced this pull request Jul 12, 2018
Share queue stats among all apps on a NIC
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants
0