Skip to content

Commit

Permalink
wip: ofproto: Use the term hard stop in comments
Browse files Browse the repository at this point in the history
Recently OVS adopted a policy of using the inclusive naming word list v1
[1, 2].

This patch addresses the use of the term abort within the scope of
comments in ofproto/.  It does so by using the term hard stop instead.

[1] df5e5cf ("Documentation: Add section on inclusive language.")
[2] https://inclusivenaming.org/word-lists/

Signed-off-by: Simon Horman <horms@ovn.org>
  • Loading branch information
Simon Horman committed Feb 21, 2024
1 parent cec60ae commit ea3aba6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
15 changes: 8 additions & 7 deletions ofproto/ofproto-dpif-xlate.c
Expand Up @@ -242,15 +242,16 @@ struct xlate_ctx {
* tables in strictly monotonically increasing order don't contribute to
* 'depth' because they cannot cause a flow translation to take an infinite
* amount of time (because the number of tables is finite). Translation
* aborts when 'depth' exceeds MAX_DEPTH.
* hard stop occurs when 'depth' exceeds MAX_DEPTH.
*
* 'resubmits', on the other hand, prevents flow translation from
* performing an extraordinarily large while still finite amount of work.
* It counts the total number of resubmits (and a few other activities)
* that have been executed. Returning from a resubmit does not affect this
* counter. Thus, this limits the amount of work that a particular
* translation can perform. Translation aborts when 'resubmits' exceeds
* MAX_RESUBMITS (which is much larger than MAX_DEPTH).
* performing an extraordinarily large while still finite amount of
* work. It counts the total number of resubmits (and a few other
* activities) that have been executed. Returning from a resubmit does
* not affect this counter. Thus, this limits the amount of work that
* a particular translation can perform. Translation hard stop occurs
* when 'resubmits' exceeds MAX_RESUBMITS (which is much larger than
* MAX_DEPTH).
*/
int depth; /* Current resubmit nesting depth. */
int resubmits; /* Total number of resubmits. */
Expand Down
7 changes: 3 additions & 4 deletions ofproto/ofproto-dpif.c
Expand Up @@ -5102,10 +5102,9 @@ group_dpif_credit_stats(struct group_dpif *group,
/* Calculate the dp_hash mask needed to provide the least weighted bucket
* with at least one hash value and construct a mapping table from masked
* dp_hash value to group bucket using the Webster method.
* If the caller specifies a non-zero max_hash value, abort and return false
* if more hash values would be required. The absolute maximum number of
* hash values supported is 256. */

* If the caller specifies a non-zero max_hash value, hard stop and return
* false if more hash values would be required. The absolute maximum number
* of hash values supported is 256. */
#define MAX_SELECT_GROUP_HASH_VALUES 256

static bool
Expand Down

0 comments on commit ea3aba6

Please sign in to comment.