Commit ad8685c4 authored by Marius Tillner's avatar Marius Tillner

added downlink latseq points for latency measurement

parent 6320e807
...@@ -45,6 +45,8 @@ ...@@ -45,6 +45,8 @@
#include "executables/softmodem-common.h" #include "executables/softmodem-common.h"
#include "../../../nfapi/oai_integration/vendor_ext.h" #include "../../../nfapi/oai_integration/vendor_ext.h"
#include "common/utils/LATSEQ/latseq.h"
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
/////* DLSCH MAC PDU generation (6.1.2 TS 38.321) *///// /////* DLSCH MAC PDU generation (6.1.2 TS 38.321) */////
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
...@@ -1213,6 +1215,7 @@ void nr_schedule_ue_spec(module_id_t module_id, ...@@ -1213,6 +1215,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
dlsch_total_bytes += len; dlsch_total_bytes += len;
lcid_bytes += len; lcid_bytes += len;
sdus += 1; sdus += 1;
LATSEQ_P("D mac.coded--TODO", "len%u::rlcbuf%u.fm%u.sl%u.bufa%u", len, buf-len, frame, slot, buf-len-sizeof(NR_MAC_SUBHEADER_LONG));
} }
UE->mac_stats.dl.lc_bytes[lcid] += lcid_bytes; UE->mac_stats.dl.lc_bytes[lcid] += lcid_bytes;
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include "nr_pdcp_sdu.h" #include "nr_pdcp_sdu.h"
#include "LOG/log.h" #include "LOG/log.h"
#include "common/utils/LATSEQ/latseq.h"
static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity, static void nr_pdcp_entity_recv_pdu(nr_pdcp_entity_t *entity,
char *_buffer, int size) char *_buffer, int size)
...@@ -241,6 +242,7 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity, ...@@ -241,6 +242,7 @@ static void nr_pdcp_entity_recv_sdu(nr_pdcp_entity_t *entity,
entity->security_mode_completed = true; entity->security_mode_completed = true;
} }
LATSEQ_P("D pdcp.coded--rlc.coded", "len%u::sdapbuf%u.sn%u", header_size+size+integrity_size, buffer, sn);
entity->tx_next++; entity->tx_next++;
entity->deliver_pdu(entity->deliver_pdu_data, entity, buf, entity->deliver_pdu(entity->deliver_pdu_data, entity, buf,
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "LOG/log.h" #include "LOG/log.h"
#include "common/utils/time_stat.h" #include "common/utils/time_stat.h"
#include "common/utils/LATSEQ/latseq.h"
/* for a given SDU/SDU segment, computes the corresponding PDU header size */ /* for a given SDU/SDU segment, computes the corresponding PDU header size */
static int compute_pdu_header_size(nr_rlc_entity_am_t *entity, static int compute_pdu_header_size(nr_rlc_entity_am_t *entity,
...@@ -1468,6 +1469,7 @@ static int generate_retx_pdu(nr_rlc_entity_am_t *entity, char *buffer, ...@@ -1468,6 +1469,7 @@ static int generate_retx_pdu(nr_rlc_entity_am_t *entity, char *buffer,
int p; int p;
sdu = entity->retransmit_list; sdu = entity->retransmit_list;
LATSEQ_P("D rlc.retx--TODO", "len%u::sn%u.so%u", sdu->size, sdu->sdu->sn, sdu->so);
pdu_header_size = compute_pdu_header_size(entity, sdu); pdu_header_size = compute_pdu_header_size(entity, sdu);
...@@ -1615,6 +1617,7 @@ static int generate_tx_pdu(nr_rlc_entity_am_t *entity, char *buffer, int size) ...@@ -1615,6 +1617,7 @@ static int generate_tx_pdu(nr_rlc_entity_am_t *entity, char *buffer, int size)
entity->force_poll = 0; entity->force_poll = 0;
} }
int ret_size = serialize_sdu(entity, sdu, buffer, size, p); int ret_size = serialize_sdu(entity, sdu, buffer, size, p);
LATSEQ_P("D rlc.coded--mac.coded", "len%u::sn%u.so%u.rlcbuf%u", pdu_size, sdu->sdu->sn, sdu->so, buffer);
entity->common.stats.txpdu_pkts++; entity->common.stats.txpdu_pkts++;
entity->common.stats.txpdu_bytes += ret_size; entity->common.stats.txpdu_bytes += ret_size;
...@@ -1677,6 +1680,7 @@ void nr_rlc_entity_am_recv_sdu(nr_rlc_entity_t *_entity, ...@@ -1677,6 +1680,7 @@ void nr_rlc_entity_am_recv_sdu(nr_rlc_entity_t *_entity,
char *buffer, int size, char *buffer, int size,
int sdu_id) int sdu_id)
{ {
LATSEQ_P("D rlc.sdu--TODO", "len%u::bufaddr%u", size, buffer);
nr_rlc_entity_am_t *entity = (nr_rlc_entity_am_t *)_entity; nr_rlc_entity_am_t *entity = (nr_rlc_entity_am_t *)_entity;
nr_rlc_sdu_segment_t *sdu; nr_rlc_sdu_segment_t *sdu;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#include "common/utils/LATSEQ/latseq.h"
typedef struct { typedef struct {
nr_sdap_entity_t *sdap_entity_llist; nr_sdap_entity_t *sdap_entity_llist;
...@@ -85,6 +86,7 @@ static bool nr_sdap_tx_entity(nr_sdap_entity_t *entity, ...@@ -85,6 +86,7 @@ static bool nr_sdap_tx_entity(nr_sdap_entity_t *entity,
if(!pdcp_ent_has_sdap){ if(!pdcp_ent_has_sdap){
LOG_D(SDAP, "TX - DRB ID: %ld does not have SDAP\n", entity->qfi2drb_table[qfi].drb_id); LOG_D(SDAP, "TX - DRB ID: %ld does not have SDAP\n", entity->qfi2drb_table[qfi].drb_id);
LATSEQ_P("D sdap.pdu--pdcp.coded", "len%u::sdapbuf%u", sdu_buffer_size, sdu_buffer);
ret = pdcp_data_req(ctxt_p, ret = pdcp_data_req(ctxt_p,
srb_flag, srb_flag,
sdap_drb_id, sdap_drb_id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment