Commit Graph

1026 Commits

Author SHA1 Message Date
Francisco Paisana 5d41fd0aec renamed ue test structs 2020-05-05 14:35:40 +01:00
Francisco Paisana 1e56082214 use ul/dl harq info storing at the ue side to evalue info stored in the dl/ul sched result dcis 2020-05-05 14:35:40 +01:00
Francisco Paisana 500a7f6357 created new separate ue class in sched tester to handle acks and harq tests 2020-05-05 14:35:40 +01:00
Pedro Alvarez 2ea78c8feb Added configuration options for stack logging. 2020-05-05 14:34:47 +01:00
yagoda 3f99e40159 -changing rlc so that mrb is never removed when going to idle
-adding metric counting to eMBMS MAC so that the count is not lost during eMBMS subframes
2020-05-04 17:50:57 +02:00
Xavier Arteaga d94078d543 Minor changes
Fix UE sequence generation

minor change
2020-05-01 21:07:33 +02:00
yagoda 94f62b54ad fixing some bugs in embms with new stack and cc scheduler in enodeb 2020-05-01 21:06:26 +02:00
Ismael Gomez 8c82203c74 Removed unused pregenerate option 2020-05-01 21:05:00 +02:00
Andre Puschmann 8d7a336bee enb: fix ok/nok packets
fix ok/nok counter, since we do not count the correctly
decoded packets explicitly, we need to calculate them from
the total number of pkts minus the failed pkts to avoid this:

------DL--------------------------------UL------------------------------------
rnti cqi  ri mcs brate   ok  nok  (%)  snr  phr mcs brate   ok  nok  (%)   bsr
  46 6.2   0 0.0     0    0    0   0% 0.11  0.00.10     0  900  900 100% 15.3k
  46 7.9   0 0.0   504    1    0   0% 0.11  0.00.10     0  900  900 100% 15.3k
2020-05-01 11:05:19 +02:00
Francisco Paisana b69b274c63 comment removed 2020-04-30 18:34:25 +01:00
Francisco Paisana 442ce0d7b0 fix cqi allocated check in rrc::ue 2020-04-30 18:34:25 +01:00
Francisco Paisana 6f02c067b3 fix cell ptr assignment 2020-04-30 18:34:25 +01:00
Francisco Paisana 5ef6031b44 added ability to use single-carrier if we are unable to allocate resources for the scells 2020-04-30 18:34:25 +01:00
Ismael Gomez a0163ae30a Use all CQI/SR resources by default 2020-04-30 15:52:39 +02:00
Francisco Paisana 439193e4b0 added code to handle fail to alloc ue cqi and sr 2020-04-30 13:19:11 +01:00
Xavier Arteaga f200c01566 SRSENB: PUSCH EVM measure is optional and disabled by default 2020-04-29 21:11:30 +02:00
Pedro Alvarez 6a65cb0624 Accept both decimal and hexadecimal for enb_id 2020-04-29 21:02:15 +02:00
Francisco Paisana 5f4b0b1e0c added default sf_mapping for cqi and sr in the enb parser 2020-04-29 12:30:44 +01:00
Francisco Paisana de4d58d8fe fix coverity scan issues in master 2020-04-29 11:17:00 +02:00
Ismael Gomez 485771749e Allocate Scell resources when creating it rather than at UE creation 2020-04-29 10:11:43 +01:00
Ismael Gomez c0054140e9 Configure properly PUCCH CS mode for CA in ConnectionReconfiguration. Allocate n_pucch_cs resource and cqi/sr at rrc::ue constructor 2020-04-29 10:11:43 +01:00
Francisco Paisana 96f565d4f2 disabled handover tests, as handover is disabled in the current release 2020-04-28 14:57:49 +01:00
Francisco Paisana 0fc36d44d7 disable handover altogether to avoid crash 2020-04-28 14:57:49 +01:00
yagoda faf1cf6975 limiting prach search space to number of prachs set in sib2 2020-04-28 14:40:20 +02:00
Francisco Paisana 38f848ecdf fix type name deducing for clang 2020-04-27 22:19:08 +01:00
Francisco Paisana 12b2ea7dde remove warnings for base classes with no virtual dtors 2020-04-27 22:19:08 +01:00
Francisco Paisana b8e6ba02e4 remove warnings related to unused vars and fwd declarations with trivial dtors 2020-04-27 22:19:08 +01:00
Francisco Paisana df06443470 use c++ variadic template instead of variadic function 2020-04-27 22:19:08 +01:00
Xavier Arteaga eaec5efde5 Fix enb_phy_test 2020-04-27 21:03:44 +02:00
Xavier Arteaga d7e7399e7b srsENB: PHY configuration in two stages 2020-04-27 21:03:44 +02:00
Xavier Arteaga 1bbf1caabc Reverted PUCCH3 default CA DL HARQ method 2020-04-27 21:03:44 +02:00
Xavier Arteaga b9583d4182 Fix Extended CSI request bits in DCI 2020-04-27 21:03:44 +02:00
Xavier Arteaga a59884a14a SRSENB: configure PUCCH3 as default HARQ feedback for CA 2020-04-27 21:03:44 +02:00
yagoda 8e0b106c22 fixing some warnings from LGTM 2020-04-27 20:59:40 +02:00
Pedro Alvarez 218531b418 Making sure the eNB only sends S1AP context release requests if it has a MME-UE-S1AP-ID assigned. 2020-04-27 11:31:14 +01:00
Andre Puschmann 3aa0179caf {ue,enb}.conf.example: add zmq examples to config
the examples are commented but by just uncommenting those
two lines the user should be able to run a eNB and UE on the same
machine in SISO mode over ZMQ
2020-04-27 11:03:48 +02:00
Jason Tang 7b7308ac1b Fix CSFB 2020-04-25 11:22:42 +02:00
jmasterfunk84 7f51fcb419 Update s1ap.cc 2020-04-24 15:29:05 +02:00
Francisco Paisana b506e29b72 removed common ce_typeenum 2020-04-24 11:55:53 +01:00
Francisco Paisana 372126deac created ul-sch and mch lcid types 2020-04-24 11:55:53 +01:00
Francisco Paisana 367a190829 created dl-sch lcid type 2020-04-24 11:55:53 +01:00
Xavier Arteaga 6c15feeff3 Fix compilation 2020-04-22 18:01:43 +02:00
Xavier Arteaga 77d5dedddc Fix LGTM warnings and recommendations 2020-04-22 18:01:43 +02:00
Pedro Alvarez ad0abe740b Added support to PDCP SN len of 7. Also added a check for valid configs in pdcp entity. 2020-04-22 17:44:00 +02:00
Francisco Paisana 7a132f9ccd more enb interface comments 2020-04-22 13:34:37 +01:00
Francisco Paisana 0526ae8ab1 updated rrc mobility parsing. added some utility methods 2020-04-22 12:57:11 +01:00
Francisco Paisana 20f6655c6b use common method to build mac pdu. allow CE allocations in dci format2/2a 2020-04-22 11:34:08 +01:00
Francisco Paisana 64557740fc use mac_buffer_state interface to schedule CEs in scheduler 2020-04-22 11:34:08 +01:00
Francisco Paisana ec94819f08 changed mechanism for conres ce scheduling to be controlled by rrc 2020-04-22 11:34:08 +01:00
Francisco Paisana 66a38f53f5 fix req_bytes methods to account for new method to calculate conres scheduling. 2020-04-22 11:34:08 +01:00
Francisco Paisana d716d8bf7e use mini state machine for ConRes CE scheduling instead of relying that there is data in the DL buffer 2020-04-22 11:34:08 +01:00
Francisco Paisana 6de7b644ec schedule conres ce when pcell changes 2020-04-22 11:34:08 +01:00
Francisco Paisana d183d64409 added allocate_rnti method to mac. Useful both during PRACH and handover UE resource allocation 2020-04-22 11:34:08 +01:00
Francisco Paisana 6ddedd5972 moved pdu to common mac folder 2020-04-22 10:06:08 +01:00
Xavier Arteaga 4756319e8f Reduce PHY logging 2020-04-20 16:10:01 +02:00
Pedro Alvarez 882a610504 Fix mistake in adding dedicated DRB to scheduler. 2020-04-13 20:45:27 +02:00
Pedro Alvarez b176eef8e7 Using a single map to store erab_info messages. 2020-04-13 20:45:27 +02:00
Pedro Alvarez 84b012051c Added ability to reconfigure more than one DRB in the eNB RRC reconfiguration. 2020-04-13 20:45:27 +02:00
Pedro Alvarez 9b60d7977e Make sure that the NAS buffers for multiple erabs are initialized. 2020-04-13 20:45:27 +02:00
Pedro Alvarez cc2b474754 Starting to add array of erab_info messages. 2020-04-13 20:45:27 +02:00
Pedro Alvarez f872e6ec39 Marking nas_pending a vector to support multiple erab setup on sending RRC reconf. 2020-04-13 20:45:27 +02:00
Francisco Paisana 6fedec8223 avoid dangling scells 2020-04-13 11:15:28 +01:00
Francisco Paisana ca7e667a22 small fix in list size check 2020-04-13 11:15:28 +01:00
Francisco Paisana 4d0068243b fixing scell activation in the enb rrc 2020-04-13 11:15:28 +01:00
Francisco Paisana c09f76ed6c unified stack task defer method 2020-04-10 22:30:59 +01:00
Xavier Arteaga 5b7493cab5 Added 256QAM modulation tables to scheduler 2020-04-10 17:48:53 +02:00
Xavier Arteaga a4225b189b SRSENB: Added initial UE capability parser 2020-04-10 17:48:53 +02:00
Xavier Arteaga 784bf81a1a Multiple fixes HARQ ACK/NACK feedback and CSI reporting for MIMO and CA 2020-04-10 15:58:25 +02:00
Xavier Arteaga 8b265883e4 SRSENB: UL TA measurement waits for a start order before start measuring 2020-04-10 15:57:41 +02:00
Andre Puschmann 3e916ac3a8 srsenb_phy: only wait for txrx thread if it has actually been started 2020-04-10 14:58:36 +02:00
Andre Puschmann b994255b35 enb: fix handling of GTPU and S1AP init return values
if the eNB stack startup fails, for example due to binding
the wrong GTPU socket or similar issues, the eNB should stop
and log a message. Previously the return values for
S1AP and GTPU init were not even evaluated.
2020-04-10 14:58:36 +02:00
Ismael Gomez 425c70c8d7 Fix CQI scheduling allocation for CA 2020-04-09 22:24:04 +02:00
Ismael Gomez 0841ec510c Fix deadlock when UE disconnected due to incorrect use of rwlock 2020-04-09 22:24:04 +02:00
Francisco Paisana 26211f12bd add warning when space in pdcch cannot be found 2020-04-08 15:25:33 +01:00
Francisco Paisana 40da4495ce do a loop in rrc::tti_clock() to process all pending events 2020-04-06 15:55:20 +01:00
Andre Puschmann d69aa55a42 enb: don't exit enb if rr.cfg for 6 PRBs isn't correct
we agreed to print the error message but still patch the values to
work for 6 PRBs. Since there is only one option there is not
configuration ambiguity.
2020-04-03 22:22:04 +02:00
Xavier Arteaga 9a2b0b7cc7 Standard vector allocation uses vector library 2020-04-02 20:49:58 +02:00
Francisco Paisana 076aa6b1f8 fix mobility test for when the eutra_capability is received 2020-04-01 19:27:11 +01:00
Francisco Paisana 69486f2953 took out change in cc_worker to force retxs 2020-04-01 15:02:21 +01:00
Francisco Paisana 179e959d05 fix msg3 retx issue. Now nof_prb for pucch above 1 are forbidden for prb==6 2020-04-01 15:02:21 +01:00
Francisco Paisana c661025cda fix log tti, and print a warning when the ul_harq tti does not match existing ones 2020-04-01 15:02:21 +01:00
Francisco Paisana 30ae2226c1 common interface for stack multiqueue tasks, background tasks and timers 2020-03-31 13:42:06 +01:00
Andre Puschmann 62e4bd9469 log_ptr: fix issue if accessing log_ptr that was reset already
during deinit of the UE/eNB it could happen that the log_ptr
was already set to null but the stack thread was still accessing
it through log_h->info()

i've moved the old macro into a new header and used as as much
as possible. there are still places in the code where similar
macros are used but we would need to change the variable name
to replace them
2020-03-31 12:32:52 +02:00
Pedro Alvarez 88f56721ee Fix issue where connection was still setup when no EPC was connected. 2020-03-25 22:19:26 +01:00
Francisco Paisana 344eaf49ec use logmap in the whole enb and ue 2020-03-25 15:50:30 +00:00
Ismael Gomez 9a264b62c4
Protect access to shared grants (#1117)
* Protect access to shared grants

* Set correct number of carriers for DL

* Fix previous issues

* Address comments
2020-03-25 14:30:43 +01:00
Francisco Paisana 4baeee10c5 avoid dangerous [] map operator 2020-03-24 17:48:29 +00:00
Francisco Paisana 1839b9a6e5 cleaned up paging code to avoid extra processing steps in worker threads 2020-03-24 17:48:29 +00:00
Francisco Paisana 9c028ab723 removed user_mutex from srsenb::rrc. All that needed to happen was the prach_worker calling add_user from stack thread (done in an earlier PR), and the get_metrics run in the stack thread. I achieved the latter with an extra metrics queue 2020-03-24 17:48:29 +00:00
Pedro Alvarez 75f35d8ded Making the default eNB TAC match the default EPC TAC. 2020-03-24 17:02:47 +01:00
Ismael Gomez c157a37894 Address comments 2020-03-24 16:47:33 +01:00
Ismael Gomez 7a7385d0e5 Support multiple carriers for common buffers (RAR/BCCH/PCCH) 2020-03-24 16:47:33 +01:00
Xavier Arteaga 8e891b7038 Added AWGN channel to SRSUE and SRSENB 2020-03-24 12:16:28 +01:00
Francisco Paisana a2866f661b made the number of ue payload allocations proportional to number of active carriers. Made mac::ue_db use unique_ptrs 2020-03-23 14:49:17 +00:00
Francisco Paisana 8772d8f85c use byte buffer pool for the ue tx_payload_buffer allocation. This halves the mac::ue object creation time 2020-03-23 14:49:17 +00:00
Andre Puschmann dff00c77c0 srsenb: fix mobility test after adding UE cap enquiry 2020-03-22 18:28:25 +01:00
Andre Puschmann ce45aabfec srsenb: enable UE capability enquiry during attach
the UE capability information isn't used so far but can now
be analyzed in the PCAP
2020-03-22 18:28:25 +01:00
Xavier Arteaga 2c93f6d20a Fix PUCCH DMRS correlation 2020-03-22 08:49:12 +01:00
Ismael Gomez fd3d4a7874 Refactor thread_pool: use std::mutex and fix some hidden potential bugs 2020-03-22 08:48:40 +01:00
Francisco Paisana 82cb6baef0 now the whole ue and enb mac uses the logmap 2020-03-20 11:32:03 +00:00
Ismael Gomez 5846e64a4d
Deallocate all CQI resources when deallocating users (#1097) 2020-03-20 12:24:46 +01:00
Francisco Paisana fb967d17a2 now we can disable tprofs individually 2020-03-19 10:59:37 +00:00
Francisco Paisana deb76d5dbd improved design to avoid data structures, and allow guarded start/stop even in lambdas 2020-03-19 10:59:37 +00:00
Francisco Paisana 8a54aef89d created a better/more composable design for time measures 2020-03-19 10:59:37 +00:00
Francisco Paisana eb20f651b9 account for all exit points 2020-03-19 10:59:37 +00:00
Francisco Paisana 854211496b redesign of tprof for thread safety 2020-03-19 10:59:37 +00:00
Francisco Paisana 269c852767 created a class for time profiling. An object of such class, if disabled, has almost zero overhead. Added a compile-time flag to turn on/off time profiling 2020-03-19 10:59:37 +00:00
Andre Puschmann 76f1b87b69 fix uninit var in s1ap 2020-03-19 10:33:15 +01:00
Francisco Paisana 34bc48d31a fix cfi to cc assignment 2020-03-18 19:55:39 +00:00
Francisco Paisana 0770c13f08 fixed overwriting of parsed max CFI 2020-03-18 19:55:39 +00:00
Francisco Paisana 5ee96079a2 added nof ctrl symbols of CFI to enb.conf 2020-03-18 13:27:56 +00:00
Francisco Paisana 4fc243ae4b added minimum CFI to config 2020-03-17 22:06:37 +00:00
Francisco Paisana 807d177b47 fix hanging issue, and simplified the handling of minRBG for different CFIs 2020-03-17 22:06:37 +00:00
Francisco Paisana ede09cb9b2 added dynamic CFI capability to the eNB scheduler 2020-03-17 22:06:37 +00:00
Xavier Arteaga ada8772f57 Initial srenb TA compensation 2020-03-17 17:21:43 +01:00
Andre Puschmann ac17ec6452 add common signal_handler for srsUE/srsENB/srsEPC
the signal handler is the same for all three apps. The "running" flag
as well as the file_logger object are in the common header in order
to allow the signal handler to flush the file if the alarm goes off.
2020-03-17 09:58:01 +01:00
Ismael Gomez cf4f4508ce Normalize throughput in CSV/stdout metrics with respect to number of TTIs 2020-03-16 22:58:09 +01:00
Xavier Arteaga 0408d357a7 Minor fixes 2020-03-16 15:07:12 +01:00
Ismael Gomez 858165f177
Allocate a different PDU buffer for each carrier in MAC eNodeB (#1069) 2020-03-16 13:35:03 +01:00
Ismael Gomez 73447972d8
Fix issue with simultaneous CQI and ACK/NACK transmission in CA (#1067)
* Fix memory corruption when phy calling mac scheduler and not yet initiated

* Do not drop CQI if collision with ACK/NACK and PUSCH

* Allocate CQI resources for SCell properly

* Use UE_PCELL_CC_IDX macro

* Protect ul_sched from being called if not yet started
2020-03-16 13:10:21 +01:00
Xavier Arteaga e832769ae6 Updated copyright 2020-03-16 11:26:06 +01:00
Francisco Paisana afd7ea9e83 Fixed the check for msg3 delay to account for retxs 2020-03-13 19:57:48 +00:00
Francisco Paisana 5330249625 created tti_point type and unit test. Added also the tti_point to the scheduler harqs, and rrc procedure 2020-03-13 19:20:40 +00:00
Francisco Paisana e824cbd251 fixes in the mac log and cell parsing 2020-03-13 18:45:38 +01:00
Andre Puschmann 1099e75e7c fix SCell carrier list population for MAC config
the issue caused to assign 0 as enb_cc_idx for the first SCell always
2020-03-13 18:41:24 +01:00
Xavier Arteaga caf7b514a0 Avoid TTI initial magic number 2020-03-13 14:01:58 +01:00
Xavier Arteaga 5af89513eb use double precission for frequency in srsue and srsenb 2020-03-13 14:01:58 +01:00
Xavier Arteaga 834a081c09 Add EPRE measurement to PUSCH decoder 2020-03-13 14:01:58 +01:00
Francisco Paisana 567790c1a2 Renamed struct to store cell context in rrc. Moved sib buffers to this struct. Created helper methods for lookup 2020-03-13 11:46:12 +00:00
Francisco Paisana fe3195bb27 add default pcell to ue_cfg in RRC 2020-03-13 11:46:12 +00:00
Francisco Paisana ce03971ca0 fix rrc_mobility_test 2020-03-13 11:46:12 +00:00
Francisco Paisana 349aed5e0d use sib configuration to set SCellToAddModList 2020-03-13 11:46:12 +00:00
Andre Puschmann 764c912977 fix a few more displaying issue in the stdout metrics 2020-03-13 11:34:32 +01:00
Francisco Paisana 4217dba7e0 fix msg3 delayed allocation and update test 2020-03-13 08:30:42 +01:00
Ismael Gomez e8b8c9922e
Add RF per-channel frequency band constraints (#1026) 2020-03-12 23:06:09 +01:00
Andre Puschmann 2f8643fb97 add tx/rx pkt ok/nok to enb metrics, also add enb metrics test
This is what it'll look like if running the new test:

------DL--------------------------------UL-------------------------------------
rnti cqi  ri mcs brate   ok  nok  (%)  snr  phr mcs brate   ok  nok  (%)    bsr
  46  16 1.5  28 15.2G 1000 1000 100% 14.2 12.0  20 15.2M   50   10  20%  100.0
ffff 1.2 1.5 6.2 1.00M  100   54  54% 22.2 99.1  28 1.00k   50   10  20%  100.0
2020-03-12 21:43:36 +01:00
Andre Puschmann 074ffbbb1d remove braces and reformat code 2020-03-12 21:04:15 +01:00
Andre Puschmann a95605a8a2 trim log name for eNB 2020-03-12 21:04:15 +01:00
Andre Puschmann f14697cdaa schedule PMI for SCells right after PCell, disable SRS for SCells 2020-03-12 21:04:15 +01:00
Andre Puschmann fdb7b0fa41 fix simple typo 2020-03-12 20:55:47 +01:00
Andre Puschmann 111aa6fc46 add SIB3 definition and enable in SI scheduling
SIB3 contains common cell re-selection information for intra, inter and intra-RAT cell reselection
2020-03-12 20:55:47 +01:00
Andre Puschmann 90beda34a1 fix parsing of optional field in SIB3 2020-03-12 20:55:47 +01:00
Andre Puschmann c534ee2b55 fix SCell packing in RRC reconfig 2020-03-12 12:22:41 +01:00
Andre Puschmann 0e4f97d1a0 fix bug in MAC where new PHY RNTI was always registered for enb_cc_idx==0 2020-03-12 12:22:41 +01:00
Andre Puschmann ab210c5f3c tiny cosmetic changes to the error messages printing 0x and clear cc_idx use 2020-03-12 12:22:41 +01:00
Andre Puschmann b7aad27d86 move packing of SCell list into extra method and add fill PHY config on the spot
previously we've packed the RRCReconfig with SCellToAddMod list and have then
parsed the message again to pack the PHY config dedicated for the new SCell carrier. This
is now done in one step.
2020-03-12 12:22:41 +01:00
Francisco Paisana d18b476e37 use utility macro for printing function name 2020-03-12 11:11:20 +00:00
yagoda f09c8324eb adding success/error macros in scheduler.cc 2020-03-12 11:11:20 +00:00
yagoda bfa451559b adding error logs to some scheduler function calls to ue_db to add clarity 2020-03-12 11:11:20 +00:00
Francisco Paisana 9b4a0baa87 activate scells in the phy 2020-03-11 21:56:33 +01:00