Skip to content

[Bug Fix] Add NF Cleanup after Critical Errors #131

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

Merged
koolzz merged 4 commits into from
Jun 3, 2019
Merged

[Bug Fix] Add NF Cleanup after Critical Errors #131

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cae52c
Fix pcap send in speed_tester
koolzz Jun 1, 2019
1d3edfe
Fixed nf cleanup on errors
kevindweb Jun 2, 2019
4587a66
I know ci will complain
kevindweb Jun 2, 2019
d63f087
Merge branch 'develop' of github.com:sdnfv/openNetVM into nf_error_cl…
kevindweb Jun 2, 2019
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
9 changes: 7 additions & 2 deletions examples/speed_tester/speed_tester.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,8 +328,10 @@ run_advanced_rings(struct onvm_nf_local_ctx *nf_local_ctx) {

/* Set core affinity depending on what we got from mgr */
/* TODO as this is advanced ring mode it should have access to the core info struct */
if (onvm_threading_core_affinitize(nf->thread_info.core) < 0)
if (onvm_threading_core_affinitize(nf->thread_info.core) < 0) {
onvm_nflib_stop(nf_local_ctx);
rte_exit(EXIT_FAILURE, "Failed to affinitize to core %d\n", nf->thread_info.core);
}

printf("Process %d handling packets using advanced rings\n", nf->instance_id);
start_time = rte_get_tsc_cycles();
Expand Down Expand Up @@ -416,6 +418,7 @@ nf_setup(struct onvm_nf_local_ctx *nf_local_ctx) {
pcap = pcap_open_offline(pcap_filename, errbuf);
if (pcap == NULL) {
fprintf(stderr, "Error reading pcap file: %s\n", errbuf);
onvm_nflib_stop(nf_local_ctx);
rte_exit(EXIT_FAILURE, "Cannot open pcap file\n");
}

Expand Down Expand Up @@ -505,8 +508,10 @@ nf_setup(struct onvm_nf_local_ctx *nf_local_ctx) {
}
#endif
/* Exit if packets were unexpectedly not created */
if (pkts_generated == 0 && packet_number > 0)
if (pkts_generated == 0 && packet_number > 0) {
onvm_nflib_stop(nf_local_ctx);
rte_exit(EXIT_FAILURE, "Failed to create packets\n");
}

packet_number = pkts_generated;
}
Expand Down