5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed pdu latency calculation to std chrono

Browse Source
master
Francisco Paisana 4 years ago
parent 7ffc236a1a
commit 0f693b36b2
6 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

23
lib/include/srslte/common/common.h
Unescape Escape View File

@ -18,6 +18,7 @@
*******************************************************************************/ *******************************************************************************/
#include "srslte/adt/span.h" #include "srslte/adt/span.h"
#include <chrono>
#include <memory> #include <memory>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -104,9 +105,6 @@ public:
byte_buffer_t() : N_bytes(0) byte_buffer_t() : N_bytes(0)
{ {
bzero(buffer, SRSLTE_MAX_BUFFER_SIZE_BYTES); bzero(buffer, SRSLTE_MAX_BUFFER_SIZE_BYTES);
#ifdef ENABLE_TIMESTAMP
timestamp_is_set = false;
#endif
msg = &buffer[SRSLTE_BUFFER_HEADER_OFFSET]; msg = &buffer[SRSLTE_BUFFER_HEADER_OFFSET];
next = NULL; next = NULL;
#ifdef SRSLTE_BUFFER_POOL_LOG_ENABLED #ifdef SRSLTE_BUFFER_POOL_LOG_ENABLED
@ -145,23 +143,22 @@ public:
uint32_t get_headroom() { return msg - buffer; } uint32_t get_headroom() { return msg - buffer; }
// Returns the remaining space from what is reported to be the length of msg // Returns the remaining space from what is reported to be the length of msg
uint32_t get_tailroom() { return (sizeof(buffer) - (msg - buffer) - N_bytes); } uint32_t get_tailroom() { return (sizeof(buffer) - (msg - buffer) - N_bytes); }
long get_latency_us() std::chrono::microseconds get_latency_us()
{ {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
if (!timestamp_is_set) if (!timestamp_is_set) {
return 0; return std::chrono::microseconds{0};
gettimeofday(&timestamp[2], NULL); }
get_time_interval(timestamp); return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now() - tp);
return timestamp[0].tv_usec + timestamp[0].tv_sec * 1000000;
#else #else
return 0; return std::chrono::microseconds{0};
#endif #endif
} }
void set_timestamp() void set_timestamp()
{ {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
gettimeofday(&timestamp[1], NULL); tp = std::chrono::high_resolution_clock::now();
timestamp_is_set = true; timestamp_is_set = true;
#endif #endif
} }
@ -174,8 +171,8 @@ public:
private: private:
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
struct timeval timestamp[3]; std::chrono::high_resolution_clock::time_point tp;
bool timestamp_is_set; bool timestamp_is_set = false;
#endif #endif
byte_buffer_t* next; byte_buffer_t* next;
}; };

4
lib/src/upper/rlc_am_lte.cc
Unescape Escape View File

@ -838,7 +838,7 @@ int rlc_am_lte::rlc_am_lte_tx::build_data_pdu(uint8_t* payload, uint32_t nof_byt
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
long latency_us = tx_sdu->get_latency_us(); long latency_us = tx_sdu->get_latency_us().count();
mean_pdu_latency_us.push(latency_us); mean_pdu_latency_us.push(latency_us);
log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n", log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n",
RB_NAME, RB_NAME,
@ -886,7 +886,7 @@ int rlc_am_lte::rlc_am_lte_tx::build_data_pdu(uint8_t* payload, uint32_t nof_byt
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
long latency_us = tx_sdu->get_latency_us(); long latency_us = tx_sdu->get_latency_us().count();
mean_pdu_latency_us.push(latency_us); mean_pdu_latency_us.push(latency_us);
log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n", log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n",
RB_NAME, RB_NAME,

2
lib/src/upper/rlc_tm.cc
Unescape Escape View File

@ -142,7 +142,7 @@ int rlc_tm::read_pdu(uint8_t* payload, uint32_t nof_bytes)
memcpy(payload, buf->msg, buf->N_bytes); memcpy(payload, buf->msg, buf->N_bytes);
log->debug("%s Complete SDU scheduled for tx. Stack latency: %ld us\n", log->debug("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
rrc->get_rb_name(lcid).c_str(), rrc->get_rb_name(lcid).c_str(),
buf->get_latency_us()); buf->get_latency_us().count());
log->info_hex(payload, log->info_hex(payload,
pdu_size, pdu_size,
"TX %s, %s PDU, queue size=%d, bytes=%d", "TX %s, %s PDU, queue size=%d, bytes=%d",

4
lib/src/upper/rlc_um_lte.cc
Unescape Escape View File

@ -146,7 +146,7 @@ int rlc_um_lte::rlc_um_lte_tx::build_data_pdu(unique_byte_buffer_t pdu, uint8_t*
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
long latency_us = tx_sdu->get_latency_us(); auto latency_us = tx_sdu->get_latency_us().count();
mean_pdu_latency_us.push(latency_us); mean_pdu_latency_us.push(latency_us);
log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n", log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n",
rb_name.c_str(), rb_name.c_str(),
@ -185,7 +185,7 @@ int rlc_um_lte::rlc_um_lte_tx::build_data_pdu(unique_byte_buffer_t pdu, uint8_t*
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
#ifdef ENABLE_TIMESTAMP #ifdef ENABLE_TIMESTAMP
long latency_us = tx_sdu->get_latency_us(); auto latency_us = tx_sdu->get_latency_us().count();
mean_pdu_latency_us.push(latency_us); mean_pdu_latency_us.push(latency_us);
log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n", log->debug("%s Complete SDU scheduled for tx. Stack latency (last/average): %ld/%ld us\n",
rb_name.c_str(), rb_name.c_str(),

10
lib/src/upper/rlc_um_nr.cc
Unescape Escape View File

@ -139,8 +139,9 @@ int rlc_um_nr::rlc_um_nr_tx::build_data_pdu(unique_byte_buffer_t pdu, uint8_t* p
tx_sdu->N_bytes -= to_move; tx_sdu->N_bytes -= to_move;
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
log->debug( log->debug("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
"%s Complete SDU scheduled for tx. Stack latency: %ld us\n", rb_name.c_str(), tx_sdu->get_latency_us()); rb_name.c_str(),
tx_sdu->get_latency_us().count());
tx_sdu.reset(); tx_sdu.reset();
header.si = rlc_nr_si_field_t::last_segment; header.si = rlc_nr_si_field_t::last_segment;
} else { } else {
@ -163,8 +164,9 @@ int rlc_um_nr::rlc_um_nr_tx::build_data_pdu(unique_byte_buffer_t pdu, uint8_t* p
tx_sdu->N_bytes -= to_move; tx_sdu->N_bytes -= to_move;
tx_sdu->msg += to_move; tx_sdu->msg += to_move;
if (tx_sdu->N_bytes == 0) { if (tx_sdu->N_bytes == 0) {
log->debug( log->debug("%s Complete SDU scheduled for tx. Stack latency: %ld us\n",
"%s Complete SDU scheduled for tx. Stack latency: %ld us\n", rb_name.c_str(), tx_sdu->get_latency_us()); rb_name.c_str(),
tx_sdu->get_latency_us().count());
tx_sdu.reset(); tx_sdu.reset();
header.si = rlc_nr_si_field_t::full_sdu; header.si = rlc_nr_si_field_t::full_sdu;
} else { } else {

9
srsue/src/stack/upper/gw.cc
Unescape Escape View File

@ -113,7 +113,7 @@ void gw::get_metrics(gw_metrics_t& m, const uint32_t nof_tti)
*******************************************************************************/ *******************************************************************************/
void gw::write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu) void gw::write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu)
{ {
log.info_hex(pdu->msg, pdu->N_bytes, "RX PDU. Stack latency: %ld us\n", pdu->get_latency_us()); log.info_hex(pdu->msg, pdu->N_bytes, "RX PDU. Stack latency: %ld us\n", pdu->get_latency_us().count());
dl_tput_bytes += pdu->N_bytes; dl_tput_bytes += pdu->N_bytes;
if (!if_up) { if (!if_up) {
log.warning("TUN/TAP not up - dropping gw RX message\n"); log.warning("TUN/TAP not up - dropping gw RX message\n");
@ -137,8 +137,11 @@ void gw::write_pdu(uint32_t lcid, srslte::unique_byte_buffer_t pdu)
void gw::write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t pdu) void gw::write_pdu_mch(uint32_t lcid, srslte::unique_byte_buffer_t pdu)
{ {
if (pdu->N_bytes > 2) { if (pdu->N_bytes > 2) {
log.info_hex( log.info_hex(pdu->msg,
pdu->msg, pdu->N_bytes, "RX MCH PDU (%d B). Stack latency: %ld us\n", pdu->N_bytes, pdu->get_latency_us()); pdu->N_bytes,
"RX MCH PDU (%d B). Stack latency: %ld us\n",
pdu->N_bytes,
pdu->get_latency_us().count());
dl_tput_bytes += pdu->N_bytes; dl_tput_bytes += pdu->N_bytes;
// Hack to drop initial 2 bytes // Hack to drop initial 2 bytes

Write Preview
Loading…
Cancel
Save