Update URR report #139
Merged
Update URR report #139
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…port request arrives.
tim-ywliu
reviewed
Feb 7, 2025
src/genl/genl_report.c
Outdated
| // set the use_bytes2 flag to the opposite value | ||
| urr->use_bytes2 = !urr->use_bytes2; | ||
| // sleep for 1 millisecond to make sure the counter is updated | ||
| // before the report is converted |
There was a problem hiding this comment.
// before converting to the report
tim-ywliu
reviewed
Feb 7, 2025
include/urr.h
Outdated
| @@ -79,6 +79,7 @@ struct urr { | |||
| struct Volume volumequota; | |||
|
|
|||
| // For usage report volume measurement | |||
| bool use_bytes2; | |||
There was a problem hiding this comment.
rename to
bool use_vol2;
struct VolumeMeasurement vol;
struct VolumeMeasurement vol2;
tim-ywliu
reviewed
Mar 3, 2025
src/gtpu/encap.c
Outdated
| @@ -670,15 +670,16 @@ int update_urr_counter_and_send_report(struct pdr *pdr, struct far *far, u64 vol | |||
| } else { | |||
| volume = vol; | |||
| } | |||
|
|
|||
| // Caculate Volume measurement for each trigger | |||
tim-ywliu
reviewed
Mar 3, 2025
include/urr.h
Outdated
| struct VolumeMeasurement bytes; | ||
| struct VolumeMeasurement bytes2; | ||
| bool use_vol2; | ||
| struct VolumeMeasurement vol; |
tim-ywliu
reviewed
Mar 3, 2025
src/genl/genl_report.c
Outdated
| @@ -158,13 +158,15 @@ int gtp5g_genl_get_usage_report(struct sk_buff *skb, struct genl_info *info) | |||
| goto fail; | |||
| } | |||
|
|
|||
| // set the use_vol2 flag to the opposite value | |||
There was a problem hiding this comment.
// use the other one vol counter
tim-ywliu
reviewed
Mar 3, 2025
src/genl/genl_report.c
Outdated
| @@ -250,13 +252,15 @@ int gtp5g_genl_get_multi_usage_reports(struct sk_buff *skb, struct genl_info *in | |||
| goto fail; | |||
| } | |||
|
|
|||
| // set the use_vol2 flag to the opposite value | |||
There was a problem hiding this comment.
// use the other one vol counter
4507bfe to
a2ca3e7
Compare
…ta consistency Changes: - Reader 1. Update the table that the writer will write to (opposite to the one being read). 2. Read data. - Writer 1. Acquire the target table for writing. 2. Write data. Locking mechanism adjustments: - Reader lock scope: - Lock is held while updating the writer's target table and released immediately after, allowing the reader to read the current table freely. - Writer lock scope: - Lock is held while acquiring the target table and writing data. - Ensures consistency between packet count and packet volume, preventing a scenario where packet count is updated but packet volume remains stale before the reader fetches the data.
a2ca3e7 to
e1d3a98
Compare
tim-ywliu
reviewed
Mar 5, 2025
cb12d3c to
2c5a3ed
Compare
tim-ywliu
approved these changes
Mar 5, 2025
ianchen0119
reviewed
Mar 29, 2025
8000
| convert_urr_to_report(urrs[i], &report[i]); | ||
| } | ||
| urr_counter = get_urr_counter_by_trigger(urrs[i], triggers[i]); | ||
| convert_urr_to_report(urr, urr_counter, &report[i]); |
There was a problem hiding this comment.
@chen042531 @tim-ywliu
This change introduces a new bug in the online charging feature. I believe the first parameter should be urrs[i] instead of urr.
I propose a fix for this issue in #143 , please help to review the PR.
Thanks!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactor period counter statistics and reading mechanism to ensure data consistency
Changes:
Reader
Writer
Locking mechanism adjustments:
Reader lock scope:
Writer lock scope: