Performance improvements

src/ue/cmd.cpp

@@ -7,9 +7,8 @@
 //
 
 #include "cmd.hpp"
+#include "task.hpp"
 
-#include <ue/cmd.hpp>
-#include <ue/l23/task.hpp>
 #include <utils/common.hpp>
 #include <utils/printer.hpp>
 

src/ue/nas/mm/access.cpp

@@ -11,8 +11,8 @@
 #include <sstream>
 
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/sm/sm.hpp>
+#include <ue/task.hpp>
 
 #include <asn/rrc/ASN_RRC_EstablishmentCause.h>
 
@@ -260,7 +260,8 @@ EUacResult NasMm::performUac()
         return ASN_RRC_EstablishmentCause_mt_Access;
     }();
 
-    auto res = m_base->l23Task->rrc().performUac(accessIdentities, accessCategory, static_cast<int>(establishmentCause));
+    auto res =
+        m_base->l23Task->rrc().performUac(accessIdentities, accessCategory, static_cast<int>(establishmentCause));
 
     switch (res)
     {

src/ue/nas/mm/base.cpp

@@ -9,8 +9,8 @@
 #include "mm.hpp"
 
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/usim/usim.hpp>
+#include <ue/task.hpp>
 #include <utils/common.hpp>
 
 namespace nr::ue

src/ue/nas/mm/dereg.cpp

@@ -9,8 +9,8 @@
 #include "mm.hpp"
 
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/sm/sm.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/nas/mm/messaging.cpp

@@ -9,9 +9,9 @@
 #include "mm.hpp"
 
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/enc.hpp>
 #include <ue/nas/sm/sm.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/nas/mm/radio.cpp

@@ -11,8 +11,8 @@
 #include <algorithm>
 
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/sm/sm.hpp>
+#include <ue/task.hpp>
 #include <utils/common.hpp>
 
 namespace nr::ue

src/ue/nas/sm/release.cpp

@@ -10,8 +10,8 @@
 #include <lib/nas/proto_conf.hpp>
 #include <lib/nas/utils.hpp>
 #include <optional>
-#include <ue/l23/task.hpp>
 #include <ue/nas/mm/mm.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/nas/sm/resource.cpp

@@ -10,8 +10,8 @@
 #include <algorithm>
 #include <lib/nas/proto_conf.hpp>
 #include <lib/nas/utils.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/mm/mm.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/nas/sm/sap.cpp

@@ -11,8 +11,8 @@
 #include <algorithm>
 
 #include <lib/nas/proto_conf.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nas/mm/mm.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/rls/ctl_layer.cpp

 #include "ctl_layer.hpp"
 
-#include <ue/l23/task.hpp>
+#include <ue/task.hpp>
 
 static constexpr const size_t MAX_PDU_COUNT = 128;
 static constexpr const int MAX_PDU_TTL = 3000;

src/ue/rls/udp_layer.cpp

@@ -3,8 +3,8 @@
 #include <cstdint>
 #include <set>
 
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 #include <utils/common.hpp>
 #include <utils/constants.hpp>
 

src/ue/rrc/cells.cpp

@@ -9,7 +9,7 @@
 #include "layer.hpp"
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/rrc/channel.cpp

@@ -9,7 +9,7 @@
 #include "layer.hpp"
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
+#include <ue/task.hpp>
 
 #include <asn/rrc/ASN_RRC_RRCReject.h>
 #include <asn/rrc/ASN_RRC_RRCSetup.h>

src/ue/rrc/connection.cpp

@@ -9,8 +9,8 @@
 #include "layer.hpp"
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 #include <utils/random.hpp>
 
 #include <asn/rrc/ASN_RRC_RRCSetup-IEs.h>

src/ue/rrc/failures.cpp

@@ -9,8 +9,8 @@
 #include "layer.hpp"
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/rrc/handler.cpp

@@ -10,8 +10,8 @@
 
 #include <lib/asn/utils.hpp>
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 #include <utils/common.hpp>
 
 #include <asn/rrc/ASN_RRC_DLInformationTransfer-IEs.h>

src/ue/rrc/idle.cpp

@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/rrc/nas.cpp

@@ -9,8 +9,8 @@
 #include "layer.hpp"
 
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 
 #include <asn/rrc/ASN_RRC_DLInformationTransfer-IEs.h>
 #include <asn/rrc/ASN_RRC_DLInformationTransfer.h>

src/ue/rrc/state.cpp

@@ -8,10 +8,9 @@
 
 #include "layer.hpp"
 
-#include <lib/asn/rrc.hpp>
 #include <lib/asn/utils.hpp>
 #include <lib/rrc/encode.hpp>
-#include <ue/l23/task.hpp>
+#include <ue/task.hpp>
 
 namespace nr::ue
 {

src/ue/l23/task.cpp → src/ue/task.cpp

@@ -7,9 +7,9 @@
 //
 
 #include "task.hpp"
+#include "cmd.hpp"
 
 #include <utils/random.hpp>
-#include <ue/cmd.hpp>
 
 struct TimerId
 {

src/ue/l23/task.hpp → src/ue/task.hpp

@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include "types.hpp"
+
 #include <memory>
 #include <optional>
 #include <thread>
@@ -22,7 +24,6 @@
 #include <ue/rls/udp_layer.hpp>
 #include <ue/rrc/layer.hpp>
 #include <ue/tun/layer.hpp>
-#include <ue/types.hpp>
 #include <utils/common_types.hpp>
 #include <utils/logger.hpp>
 #include <utils/nts.hpp>

src/ue/tun/layer.cpp

@@ -12,8 +12,8 @@
 #include <cstring>
 #include <unistd.h>
 
-#include <ue/l23/task.hpp>
 #include <ue/nts.hpp>
+#include <ue/task.hpp>
 #include <utils/libc_error.hpp>
 
 #define RECEIVER_BUFFER_SIZE 8000 // TODO: May be reduced to MTU 1500

src/ue/ue.cpp

@@ -8,7 +8,7 @@
 
 #include "ue.hpp"
 
-#include "l23/task.hpp"
+#include "task.hpp"
 
 namespace nr::ue
 {