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
Michael Black
OpenXG-RAN
Commits
11dadce3
Commit
11dadce3
authored
Jun 05, 2023
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix mutex in UL mac
parent
090178a3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
5 deletions
+0
-5
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+0
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+0
-2
No files found.
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
11dadce3
...
@@ -474,7 +474,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
...
@@ -474,7 +474,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
fapi_nr_ul_config_request_t
*
ul_config
=
scheduled_response
->
ul_config
;
fapi_nr_ul_config_request_t
*
ul_config
=
scheduled_response
->
ul_config
;
int
pdu_done
=
0
;
int
pdu_done
=
0
;
pthread_mutex_lock
(
&
ul_config
->
mutex_ul_config
);
LOG_D
(
PHY
,
"%d.%d ul S ul_config %p pdu_done %d number_pdus %d
\n
"
,
scheduled_response
->
frame
,
slot
,
ul_config
,
pdu_done
,
ul_config
->
number_pdus
);
LOG_D
(
PHY
,
"%d.%d ul S ul_config %p pdu_done %d number_pdus %d
\n
"
,
scheduled_response
->
frame
,
slot
,
ul_config
,
pdu_done
,
ul_config
->
number_pdus
);
for
(
int
i
=
0
;
i
<
ul_config
->
number_pdus
;
++
i
){
for
(
int
i
=
0
;
i
<
ul_config
->
number_pdus
;
++
i
){
...
@@ -640,8 +639,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
...
@@ -640,8 +639,6 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
LOG_D
(
PHY
,
"%d.%d clear ul_config %p
\n
"
,
scheduled_response
->
frame
,
slot
,
ul_config
);
LOG_D
(
PHY
,
"%d.%d clear ul_config %p
\n
"
,
scheduled_response
->
frame
,
slot
,
ul_config
);
memset
(
ul_config
->
ul_config_list
,
0
,
sizeof
(
ul_config
->
ul_config_list
));
memset
(
ul_config
->
ul_config_list
,
0
,
sizeof
(
ul_config
->
ul_config_list
));
}
}
pthread_mutex_unlock
(
&
ul_config
->
mutex_ul_config
);
}
}
}
}
return
0
;
return
0
;
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
11dadce3
...
@@ -1113,13 +1113,11 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
...
@@ -1113,13 +1113,11 @@ void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info)
}
}
}
}
}
}
pthread_mutex_unlock
(
&
ul_config
->
mutex_ul_config
);
// avoid double lock
fill_scheduled_response
(
&
scheduled_response
,
NULL
,
ul_config
,
&
tx_req
,
mod_id
,
cc_id
,
frame_tx
,
slot_tx
,
ul_info
->
phy_data
);
fill_scheduled_response
(
&
scheduled_response
,
NULL
,
ul_config
,
&
tx_req
,
mod_id
,
cc_id
,
frame_tx
,
slot_tx
,
ul_info
->
phy_data
);
if
(
mac
->
if_module
!=
NULL
&&
mac
->
if_module
->
scheduled_response
!=
NULL
){
if
(
mac
->
if_module
!=
NULL
&&
mac
->
if_module
->
scheduled_response
!=
NULL
){
LOG_D
(
NR_MAC
,
"3# scheduled_response transmitted,%d, %d
\n
"
,
frame_tx
,
slot_tx
);
LOG_D
(
NR_MAC
,
"3# scheduled_response transmitted,%d, %d
\n
"
,
frame_tx
,
slot_tx
);
mac
->
if_module
->
scheduled_response
(
&
scheduled_response
);
mac
->
if_module
->
scheduled_response
(
&
scheduled_response
);
}
}
pthread_mutex_lock
(
&
ul_config
->
mutex_ul_config
);
}
}
pthread_mutex_unlock
(
&
ul_config
->
mutex_ul_config
);
pthread_mutex_unlock
(
&
ul_config
->
mutex_ul_config
);
}
}
...
...
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