diff options
| -rw-r--r-- | VNFs/DPPD-PROX/handle_lat.c | 16 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 28 | ||||
| -rw-r--r-- | docs/release/results/results.rst | 4 |
3 files changed, 27 insertions, 21 deletions
diff --git a/VNFs/DPPD-PROX/handle_lat.c b/VNFs/DPPD-PROX/handle_lat.c index 7901173d..0ebe1e13 100644 --- a/VNFs/DPPD-PROX/handle_lat.c +++ b/VNFs/DPPD-PROX/handle_lat.c @@ -115,10 +115,16 @@ struct task_lat { FILE *fp_tx; struct prox_port_cfg *port; }; - -static uint32_t diff_or_zero(uint32_t a, uint32_t b) +/* This function calculate the difference between rx and tx_time + * Both values are uint32_t (see handle_lat_bulk) + * rx time should be higher than tx_time...except every UINT32_MAX + * cycles, when rx_time overflows. + * As the return value is also uint32_t, returning (rx_time - tx_time) + * is also fine when it overflows. + */ +static uint32_t diff_time(uint32_t rx_time, uint32_t tx_time) { - return a < b? 0 : a - b; + return rx_time - tx_time; } struct lat_test *task_lat_get_latency_meassurement(struct task_lat *task) @@ -257,7 +263,7 @@ static uint64_t lat_latency_buffer_get_min_tsc(struct task_lat *task) static uint64_t lat_info_get_lat_tsc(struct lat_info *lat_info) { - uint64_t lat = diff_or_zero(lat_info->rx_time, lat_info->tx_time); + uint64_t lat = diff_time(lat_info->rx_time, lat_info->tx_time); return lat << LATENCY_ACCURACY; } @@ -498,7 +504,7 @@ static void task_lat_store_lat(struct task_lat *task, uint64_t rx_packet_index, { if (tx_time == 0) return; - uint32_t lat_tsc = diff_or_zero(rx_time, tx_time) << LATENCY_ACCURACY; + uint32_t lat_tsc = diff_time(rx_time, tx_time) << LATENCY_ACCURACY; lat_test_add_latency(task->lat_test, lat_tsc, rx_error + tx_error); diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index ffd07133..e76e5098 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -17,7 +17,7 @@ The *SampleVNFs*, the *SampleVNF test cases* are opensource software, licensed under the terms of the Apache License, Version 2.0. ========================================== -OPNFV Euphrates Release Note for SampleVNF +OPNFV Farser Release Note for SampleVNF ========================================== .. toctree:: @@ -43,7 +43,7 @@ Version History | *Date* | *Version* | *Comment* | | | | | +----------------+--------------------+---------------------------------+ -| "Oct 20 2017" | 5.1 | SampleVNF for Euphrates release | +| "Oct 20 2017" | 6.0 | SampleVNF for Farser release | | | | | +----------------+--------------------+---------------------------------+ @@ -56,10 +56,10 @@ The software delivered in the OPNFV SampleVNF_ Project, comprising the Project is a realization of the methodology in ETSI-ISG NFV-TST001_. -OPNFV Euphrates Release +OPNFV Farser Release ====================== -This Euphrates release provides *SampleVNF* as a approx VNF repository for +This Farser release provides *SampleVNF* as a approx VNF repository for VNF/NFVI testing, characterization and OPNFV feature testing, automated on OPNFV platform, including: @@ -77,7 +77,7 @@ OPNFV platform, including: * SampleVNF source code -For Euphrates release, the *SampleVNF* supported: +For Farser release, the *SampleVNF* supported: +----------------+---------------------------------------------------------+-------------------+ | *VNF* | *Name* | *version* | @@ -97,7 +97,7 @@ For Euphrates release, the *SampleVNF* supported: .. note:: Highlevel Desgin and features supported by each of the VNFs is described in Developer and user guide. -For Euphrates release, the *SampleVNF* is used for the following +For Farser release, the *SampleVNF* is used for the following testing: * OPNFV platform testing - generic test cases to measure the categories: @@ -108,7 +108,7 @@ testing: * VNF Characterization: - * Network - rfc2544, rfc3511, latency, http_test etc + * Network - rfc2544, rfc36.0, latency, http_test etc The *SampleVNF* is developed in the OPNFV community, by the SampleVNF_ team. @@ -127,19 +127,19 @@ Release Data | **Project** | SampleVNF | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | samplevnf/Euphrates.5.1 | +| **Repo/tag** | samplevnf/Farser.6.0 | | | | +--------------------------------------+--------------------------------------+ -| **SampleVNF Docker image tag** | Euphrates.5.1 | +| **SampleVNF Docker image tag** | Farser.6.0 | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | Euphrates | +| **Release designation** | Farser | | | | +--------------------------------------+--------------------------------------+ | **Release date** | "October 20 2017" | | | | +--------------------------------------+--------------------------------------+ -| **Purpose of the delivery** | OPNFV Euphrates release 5.1 | +| **Purpose of the delivery** | OPNFV Farser release 6.0 | | | | +--------------------------------------+--------------------------------------+ @@ -211,7 +211,7 @@ Known Issues/Faults Corrected Faults ---------------- -Euphrates.5.1: +Farser.6.0: +----------------------------+------------------------------------------------+ | **JIRA REFERENCE** | **DESCRIPTION** | @@ -222,7 +222,7 @@ Euphrates.5.1: +----------------------------+------------------------------------------------+ -Euphrates known restrictions/issues +Farser known restrictions/issues ==================================== +-----------+-----------+----------------------------------------------+ | Installer | Scenario | Issue | @@ -248,7 +248,7 @@ Useful links - wiki project page: https://wiki.opnfv.org/display/SAM - - wiki SampleVNF Euphrates release planing page: https://wiki.opnfv.org/display/SAM/SampleVNF+Euphrates+Release+Planning + - wiki SampleVNF Farser release planing page: https://wiki.opnfv.org/display/SAM/F+Release+Plan+for+SampleVNF - SampleVNF repo: https://git.opnfv.org/cgit/samplevnf diff --git a/docs/release/results/results.rst b/docs/release/results/results.rst index 11fd1aff..bda09af1 100644 --- a/docs/release/results/results.rst +++ b/docs/release/results/results.rst @@ -7,8 +7,8 @@ Results listed by scenario ========================== The following sections describe the yardstick results as evaluated for the -Euphrates release. Each section describes the determined state of the specific -test case in Euphrates release. +Farser release. Each section describes the determined state of the specific +test case in Farser release. Feature Test Results ==================== |