From ada4be081caa14db2a9f83feea06324ac397ab67 Mon Sep 17 00:00:00 2001
From: Robert Schmidt <robert.schmidt@openairinterface.org>
Date: Wed, 4 May 2022 10:43:15 +0200
Subject: [PATCH] Remove clock_gettime() introduced in this branch
---
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 6 +-----
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c | 8 ++------
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c | 9 ++-------
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index 7e4710ccda0..f1eebfc0260 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -456,14 +456,10 @@ int nr_process_mac_pdu(module_id_t module_idP,
if (!get_mac_len(pduP, pdu_len, &mac_len, &mac_subheader_len))
return 0;
- struct timespec time_request;
- clock_gettime(CLOCK_REALTIME, &time_request);
- LOG_D(NR_MAC, "[UE %04x] %d.%d : Time %lu.%lu ULSCH -> UL-%s %d (gNB %d, %d bytes)\n",
+ LOG_D(NR_MAC, "[UE %x] %d.%d: ULSCH -> UL-%s %d (gNB %d, %d bytes)\n",
UE_info->rnti[UE_id],
frameP,
slot,
- time_request.tv_sec,
- time_request.tv_nsec,
rx_lcid<4?"DCCH":"DTCH",
rx_lcid,
module_idP,
diff --git a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
index ac7da5412bd..b5cea6bdb99 100644
--- a/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+++ b/openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
@@ -711,9 +711,7 @@ rb_found:
memblock = get_free_mem_block(size, __FUNCTION__);
memcpy(memblock->data, buf, size);
- struct timespec time_request;
- clock_gettime(CLOCK_REALTIME, &time_request);
- LOG_D(PDCP, "%s(): (rb %d) calling enqueue_rlc_data_req size %d at time %lu.%lu\n", __func__, rb_id, size,time_request.tv_sec,time_request.tv_nsec);
+ LOG_D(PDCP, "%s(): (srb %d) calling rlc_data_req size %d\n", __func__, rb_id, size);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n");
enqueue_rlc_data_req(&ctxt, 0, MBMS_FLAG_NO, rb_id, sdu_id, 0, size, memblock);
@@ -1338,9 +1336,7 @@ static boolean_t pdcp_data_req_drb(
const sdu_size_t sdu_buffer_size,
unsigned char *const sdu_buffer)
{
- struct timespec time_request;
- clock_gettime(CLOCK_REALTIME, &time_request);
- LOG_D(PDCP, "%s() called at time %lu.%lu, size %d\n", __func__, time_request.tv_sec,time_request.tv_nsec,sdu_buffer_size);
+ LOG_D(PDCP, "%s() called, size %d\n", __func__, sdu_buffer_size);
nr_pdcp_ue_t *ue;
nr_pdcp_entity_t *rb;
int rnti = ctxt_pP->rnti;
diff --git a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
index 18ee7da8e2d..baae1fa4364 100644
--- a/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
+++ b/openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
@@ -460,14 +460,9 @@ static void deliver_sdu(void *_ue, nr_rlc_entity_t *entity, char *buf, int size)
exit(1);
rb_found:
- if (is_srb==0) {
- struct timespec time_request;
- clock_gettime(CLOCK_REALTIME, &time_request);
+ LOG_D(RLC, "%s:%d:%s: delivering SDU (rnti %d is_srb %d rb_id %d) size %d\n",
+ __FILE__, __LINE__, __FUNCTION__, ue->rnti, is_srb, rb_id, size);
- LOG_D(RLC, "%s:%d:%s: delivering SDU Time %lu.%lu (rnti %d is_srb %d rb_id %d) size %d\n",
- __FILE__, __LINE__, __FUNCTION__, time_request.tv_sec,time_request.tv_nsec,
- ue->rnti, is_srb, rb_id, size);
- }
/* unused fields? */
ctx.instance = 0;
ctx.frame = 0;
--
GitLab