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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
937e4b17
Commit
937e4b17
authored
Mar 26, 2024
by
Ming-Hong Hsu
Committed by
hsum
Mar 28, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add from VNF to PNF TX_Data.request log path (t1~t5)
parent
f5093375
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
1 deletion
+7
-1
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+3
-0
nfapi/open-nFAPI/vnf/src/vnf_p7.c
nfapi/open-nFAPI/vnf/src/vnf_p7.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-0
No files found.
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
937e4b17
...
@@ -2008,6 +2008,7 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
...
@@ -2008,6 +2008,7 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
pnf_p7
->
slot_buffer
[
buffer_index
].
sfn
=
req
->
SFN
;
pnf_p7
->
slot_buffer
[
buffer_index
].
sfn
=
req
->
SFN
;
pnf_p7
->
slot_buffer
[
buffer_index
].
slot
=
req
->
Slot
;
pnf_p7
->
slot_buffer
[
buffer_index
].
slot
=
req
->
Slot
;
pnf_p7
->
slot_buffer
[
buffer_index
].
tx_data_req
=
req
;
pnf_p7
->
slot_buffer
[
buffer_index
].
tx_data_req
=
req
;
LOG_I
(
NFAPI_PNF
,
"[t5] Fill tx_data in buf[%d] , %d/%d
\n
"
,
buffer_index
,
req
->
SFN
,
req
->
Slot
);
pnf_p7
->
stats
.
tx_data_ontime
++
;
pnf_p7
->
stats
.
tx_data_ontime
++
;
}
}
...
@@ -2560,6 +2561,7 @@ void pnf_nr_dispatch_p7_message(void *pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
...
@@ -2560,6 +2561,7 @@ void pnf_nr_dispatch_p7_message(void *pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
pnf_handle_ul_dci_request
(
pRecvMsg
,
recvMsgLen
,
pnf_p7
);
pnf_handle_ul_dci_request
(
pRecvMsg
,
recvMsgLen
,
pnf_p7
);
break
;
break
;
case
NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST
:
case
NFAPI_NR_PHY_MSG_TYPE_TX_DATA_REQUEST
:
LOG_I
(
NFAPI_PNF
,
"[t4] pnf_nr_dispatch_p7_message , %d/%d
\n
"
,
pnf_p7
->
sfn
,
pnf_p7
->
slot
);
pnf_handle_tx_data_request
(
pRecvMsg
,
recvMsgLen
,
pnf_p7
);
pnf_handle_tx_data_request
(
pRecvMsg
,
recvMsgLen
,
pnf_p7
);
break
;
break
;
default:
default:
...
@@ -3252,6 +3254,7 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
...
@@ -3252,6 +3254,7 @@ int pnf_nr_p7_message_pump(pnf_p7_t* pnf_p7)
if
(
FD_ISSET
(
pnf_p7
->
p7_sock
,
&
rfds
))
if
(
FD_ISSET
(
pnf_p7
->
p7_sock
,
&
rfds
))
{
{
LOG_I
(
NFAPI_PNF
,
"[t3] socket receive
\n
"
);
pnf_nr_nfapi_p7_read_dispatch_message
(
pnf_p7
,
now_hr_time
);
pnf_nr_nfapi_p7_read_dispatch_message
(
pnf_p7
,
now_hr_time
);
}
}
}
}
...
...
nfapi/open-nFAPI/vnf/src/vnf_p7.c
View file @
937e4b17
...
@@ -460,6 +460,7 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7)
...
@@ -460,6 +460,7 @@ int send_mac_subframe_indications(vnf_p7_t* vnf_p7)
int
vnf_send_p7_msg
(
vnf_p7_t
*
vnf_p7
,
nfapi_vnf_p7_connection_info_t
*
p7_info
,
uint8_t
*
msg
,
const
uint32_t
len
)
int
vnf_send_p7_msg
(
vnf_p7_t
*
vnf_p7
,
nfapi_vnf_p7_connection_info_t
*
p7_info
,
uint8_t
*
msg
,
const
uint32_t
len
)
{
{
LOG_I
(
NFAPI_VNF
,
"[t2] socket sent
\n
"
);
int
sendto_result
=
sendto
(
vnf_p7
->
socket
,
msg
,
len
,
0
,
(
struct
sockaddr
*
)
&
(
p7_info
->
remote_addr
),
sizeof
(
p7_info
->
remote_addr
));
int
sendto_result
=
sendto
(
vnf_p7
->
socket
,
msg
,
len
,
0
,
(
struct
sockaddr
*
)
&
(
p7_info
->
remote_addr
),
sizeof
(
p7_info
->
remote_addr
));
//printf("P7 msg sent \n");
//printf("P7 msg sent \n");
if
(
sendto_result
!=
len
)
if
(
sendto_result
!=
len
)
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
937e4b17
...
@@ -1450,6 +1450,7 @@ static void nr_generate_Msg2(module_id_t module_idP,
...
@@ -1450,6 +1450,7 @@ static void nr_generate_Msg2(module_id_t module_idP,
TX_req
->
SFN
=
frameP
;
TX_req
->
SFN
=
frameP
;
TX_req
->
Number_of_PDUs
++
;
TX_req
->
Number_of_PDUs
++
;
TX_req
->
Slot
=
slotP
;
TX_req
->
Slot
=
slotP
;
LOG_I
(
NFAPI_VNF
,
"[t1] scheduler_RA fill TX_D , %d/%d
\n
"
,
frameP
,
slotP
);
// Mark the corresponding symbols RBs as used
// Mark the corresponding symbols RBs as used
fill_pdcch_vrb_map
(
nr_mac
,
fill_pdcch_vrb_map
(
nr_mac
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
View file @
937e4b17
...
@@ -620,7 +620,7 @@ void schedule_nr_sib1(module_id_t module_idP,
...
@@ -620,7 +620,7 @@ void schedule_nr_sib1(module_id_t module_idP,
TX_req
->
Slot
=
slotP
;
TX_req
->
Slot
=
slotP
;
type0_PDCCH_CSS_config
->
active
=
false
;
type0_PDCCH_CSS_config
->
active
=
false
;
LOG_I
(
NFAPI_VNF
,
"[t1] scheduler_bch fill TX_D , %d/%d
\n
"
,
frameP
,
slotP
);
T
(
T_GNB_MAC_DL_PDU_WITH_DATA
,
T
(
T_GNB_MAC_DL_PDU_WITH_DATA
,
T_INT
(
module_idP
),
T_INT
(
module_idP
),
T_INT
(
CC_id
),
T_INT
(
CC_id
),
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
937e4b17
...
@@ -1385,6 +1385,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -1385,6 +1385,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
TX_req
->
Number_of_PDUs
++
;
TX_req
->
Number_of_PDUs
++
;
TX_req
->
SFN
=
frame
;
TX_req
->
SFN
=
frame
;
TX_req
->
Slot
=
slot
;
TX_req
->
Slot
=
slot
;
LOG_I
(
NFAPI_VNF
,
"[t1] scheduler_dlsch fill TX_D , %d/%d
\n
"
,
frame
,
slot
);
/* mark UE as scheduled */
/* mark UE as scheduled */
sched_pdsch
->
rbSize
=
0
;
sched_pdsch
->
rbSize
=
0
;
}
}
...
...
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