diff options
| author |   Andrew Yourtchenko <ayourtch@gmail.com> | 2018-03-26 18:19:20 +0200 |
|---|---|---|
| committer |   Chris Luke <chris_luke@comcast.com> | 2018-03-27 17:43:37 +0000 |
| commit | 82f2e6e50dfedd495f8788f85b0f366f79ae8e1a (patch) | |
| tree | c63587ec7cd2fc94ea9e2fddc6679b0182efaf9d /src/plugins/acl/acl.h | |
| parent | f756401ddda1349e024dbf631d5774efb9e7f55a (diff) | |
acl-plugin: autosize the ACL plugin heap and fix the heap size types and parsing
- autosize the ACL plugin heap size based on the number of workers
- for manual heap size setting, use the proper types (uword),
and proper format/unformat functions (unformat_memory_size)
Change-Id: I7c46134e949862a0abc9087d7232402fc5a95ad8
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Diffstat (limited to 'src/plugins/acl/acl.h')
| -rw-r--r-- | src/plugins/acl/acl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h index 789a0759804..2d4dc551470 100644 --- a/src/plugins/acl/acl.h +++ b/src/plugins/acl/acl.h @@ -38,8 +38,6 @@ #define TCP_SESSION_IDLE_TIMEOUT_SEC (3600*24) #define TCP_SESSION_TRANSIENT_TIMEOUT_SEC 120 -#define ACL_FA_DEFAULT_HEAP_SIZE (2 << 29) - #define ACL_PLUGIN_HASH_LOOKUP_HEAP_SIZE (2 << 25) #define ACL_PLUGIN_HASH_LOOKUP_HASH_BUCKETS 65536 #define ACL_PLUGIN_HASH_LOOKUP_HASH_MEMORY (2 << 25) @@ -136,7 +134,7 @@ typedef struct typedef struct { /* mheap to hold all the ACL module related allocations, other than hash */ void *acl_mheap; - u32 acl_mheap_size; + uword acl_mheap_size; /* API message ID base */ u16 msg_id_base; @@ -154,7 +152,7 @@ typedef struct { /* mheap to hold all the miscellaneous allocations related to hash-based lookups */ void *hash_lookup_mheap; - u32 hash_lookup_mheap_size; + uword hash_lookup_mheap_size; int acl_lookup_hash_initialized; /* applied_hash_ace_entry_t **input_hash_entry_vec_by_sw_if_index; |