diff options
| author | 刘畅 <[email protected]> | 2024-06-14 01:38:18 +0000 |
|---|---|---|
| committer | 刘畅 <[email protected]> | 2024-06-14 01:38:18 +0000 |
| commit | 23ddf75eaad60fd42693dbf6b9558806247dc519 (patch) | |
| tree | e3251f57fda271f7b1bfc1f4f36514591081999f /shaping/src/shaper_aqm.cpp | |
| parent | f91407a5524365bb93dc6e8f96ef2b08ef3fe8a0 (diff) | |
| parent | cfc13ad17d6dd65239b6acc85417fdd804d3d267 (diff) | |
Merge branch 'separate_swarmkv_priority_len_in_out' into 'rel'v3.1.38
separate in out direction for queue_len stored in swarmkv
See merge request tango/shaping-engine!98
Diffstat (limited to 'shaping/src/shaper_aqm.cpp')
| -rw-r--r-- | shaping/src/shaper_aqm.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shaping/src/shaper_aqm.cpp b/shaping/src/shaper_aqm.cpp index 5f2a860..1de33e9 100644 --- a/shaping/src/shaper_aqm.cpp +++ b/shaping/src/shaper_aqm.cpp @@ -96,7 +96,7 @@ static void shaper_aqm_mark_processed(struct shaping_packet_wrapper *pkt_wrapper } } -int shaper_aqm_need_drop(struct shaping_profile_info *profile, struct shaping_packet_wrapper *pkt_wrapper, struct timespec *curr_time, unsigned long long latency_us) +int shaper_aqm_need_drop(struct shaping_profile_info *profile, struct shaping_packet_wrapper *pkt_wrapper, enum shaping_packet_dir dir, struct timespec *curr_time, unsigned long long latency_us) { int ret = 0; unsigned long long curr_time_ms; @@ -111,7 +111,7 @@ int shaper_aqm_need_drop(struct shaping_profile_info *profile, struct shaping_pa switch (profile->hash_node->aqm_type) { case AQM_TYPE_BLUE: - ret = shaper_aqm_blue_need_drop(profile->id, &profile->hash_node->aqm_blue_para, profile->hash_node->queue_len[profile->priority]); + ret = shaper_aqm_blue_need_drop(profile->id, &profile->hash_node->aqm_blue_para, profile->hash_node->queue_len[profile->priority][dir]); break; case AQM_TYPE_CODEL: curr_time_ms = curr_time->tv_sec * MILLI_SECONDS_PER_SEC + curr_time->tv_nsec / NANO_SECONDS_PER_MILLI_SEC; |