Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangwenhui
OpenXG-RAN
Commits
8250ecd7
Commit
8250ecd7
authored
8 years ago
by
Xenofon Foukas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added info required for stability and fairness of remote scheduler
parent
0e687fb7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
7 deletions
+18
-7
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+4
-3
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+11
-4
openair2/ENB_APP/flexran_agent_common.h
openair2/ENB_APP/flexran_agent_common.h
+3
-0
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
8250ecd7
...
...
@@ -449,8 +449,8 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
rlc_reports
[
j
]
->
has_tx_queue_size
=
1
;
//TODO:Set tx queue head of line delay in ms
rlc_reports
[
j
]
->
tx_queue_hol_delay
=
100
;
rlc_reports
[
j
]
->
has_tx_queue_hol_delay
=
0
;
rlc_reports
[
j
]
->
tx_queue_hol_delay
=
flexran_get_hol_delay
(
enb_id
,
i
,
j
+
1
)
;
rlc_reports
[
j
]
->
has_tx_queue_hol_delay
=
1
;
//TODO:Set retransmission queue size in bytes
rlc_reports
[
j
]
->
retransmission_queue_size
=
10
;
rlc_reports
[
j
]
->
has_retransmission_queue_size
=
0
;
...
...
@@ -977,6 +977,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
}
}
// LOG_I(FLEXRAN_AGENT, "Sending subframe trigger for frame %d and subframe %d\n", flexran_get_current_frame(mod_id), (flexran_get_current_subframe(mod_id) + 1) % 10);
/*TODO: Fill in the number of dl HARQ related info, based on the number of currently
...
...
@@ -1002,7 +1003,7 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
if
(
dl_info
[
i
]
==
NULL
)
goto
error
;
protocol__flex_dl_info__init
(
dl_info
[
i
]);
dl_info
[
i
]
->
rnti
=
flexran_get_ue_crnti
(
mod_id
,
i
);
dl_info
[
i
]
->
rnti
=
flexran_get_ue_crnti
(
mod_id
,
UE_id
);
dl_info
[
i
]
->
has_rnti
=
1
;
/*Fill in the right id of this round's HARQ process for this UE*/
// uint8_t harq_id;
...
...
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/flexran_agent_common.c
View file @
8250ecd7
...
...
@@ -566,6 +566,13 @@ int flexran_get_tx_queue_size(mid_t mod_id, mid_t ue_id, logical_chan_id_t chann
return
rlc_status
.
bytes_in_buffer
;
}
int
flexran_get_hol_delay
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
)
{
rnti_t
rnti
=
flexran_get_ue_crnti
(
mod_id
,
ue_id
);
uint16_t
frame
=
(
uint16_t
)
flexran_get_current_frame
(
mod_id
);
mac_rlc_status_resp_t
rlc_status
=
mac_rlc_status_ind
(
mod_id
,
rnti
,
mod_id
,
frame
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
channel_id
,
0
);
return
rlc_status
.
head_sdu_creation_time
;
}
short
flexran_get_TA
(
mid_t
mod_id
,
mid_t
ue_id
,
int
CC_id
)
{
UE_list_t
*
UE_list
=&
eNB_mac_inst
[
mod_id
].
UE_list
;
...
...
This diff is collapsed.
Click to expand it.
openair2/ENB_APP/flexran_agent_common.h
View file @
8250ecd7
...
...
@@ -185,6 +185,9 @@ int flexran_get_ue_wcqi (mid_t mod_id, mid_t ue_id);
/* Get the transmission queue size for a UE with a channel_id logical channel id */
int
flexran_get_tx_queue_size
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
);
/* Get the head of line delay for a UE with a channel_id logical channel id */
int
flexran_get_hol_delay
(
mid_t
mod_id
,
mid_t
ue_id
,
logical_chan_id_t
channel_id
);
/* Check the status of the timing advance for a UE */
short
flexran_get_TA
(
mid_t
mod_id
,
mid_t
ue_id
,
int
CC_id
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment