Commit Graph
2513 Commits
Author SHA1 Message Date
Raphael Defosseux 7260c9a908 Merge remote-tracking branch 'origin/fix_ulsim' into develop_integration_2018_w40 2018-10-04 13:10:23 +02:00
laurent f7b69a7b93 manual merge because conflict 2018-10-03 19:56:29 +02:00
Florian Kaltenberger 1942d2674c adding command line paramter usrp-args and usrp-clksrc to UE 2018-09-30 11:25:37 -07:00
Florian Kaltenberger 9f5f0ade7e removing some dead code 2018-09-30 09:54:34 -07:00
Florian Kaltenberger 3547d525f4 Merge remote-tracking branch 'origin/develop' into 352-support-for-n300 2018-09-29 12:09:51 -07:00
Raphael Defosseux bf86de006c Merge remote-tracking branch 'origin/basic-simulator-tdd' into develop_integration_2018_w39 2018-09-28 16:58:30 +02:00
Raphael Defosseux 38d09bc733 Merge remote-tracking branch 'origin/parallel-config' into develop_integration_2018_w39
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-09-28 16:58:12 +02:00
Raphael Defosseux 8037229e49 Merge remote-tracking branch 'origin/fix_issue_350_gtpu_init' into develop_integration_2018_w39 2018-09-28 16:57:00 +02:00
Florian Kaltenberger 84d04b3cd5 new interpretation of sdr_addrs string in RU config file: this is now directly passed to the uhd to specify a device. It may contain a device type (i.e., "type=x300") or an IP address (i.e., "addr=192.168.10.2") 2018-09-28 00:11:35 -07:00
Florian Kaltenberger c4afc399fc astyling usrp_lib.cpp 2018-09-28 00:08:13 -07:00
laurent de2362761c after testing other targets 2018-09-27 18:10:03 +02:00
Wang Tsu-Han 1fc9fd4a46 Merge remote-tracking branch 'origin/develop' into parallel-config 2018-09-21 11:06:22 +02:00
laurent d8472426c4 fix_issue_350_gtpu_init 2018-09-20 12:37:26 +02:00
Wang Tsu-Han 0511ff45dc adding both configurable at config file and commandline 2018-09-20 12:06:55 +02:00
Raphael Defosseux 7d602d5cc2 CI: basic-simulator --> seg fault core dumps are recovered and part of artifacts
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2018-09-19 11:55:43 +02:00
Cedric Roux 824f62d8bf basic simulator: support TDD mode
For whatever reason we need N_TA_offset to be 0 for the basic simulator
to function properly.

This is more a hack than a proper solution. More analysis is needed
to understand what happens and what should be really done.
2018-09-14 15:01:55 +02:00
Cedric Roux ab7515e280 basic simulator: handle discontinuities in output
In TDD mode the eNB does not output data all the time,
only in downlink and special subframes.

The basic simulator needs a continuous stream of samples.

So let's fill the blank with silence.
2018-09-14 14:58:15 +02:00
Wang Tsu-Han 5b1260a759 fixed for phy-simulation mode 2018-09-13 15:02:15 +02:00
Wang Tsu-Han cf09d19879 adding definition for UE 2018-09-13 12:52:44 +02:00
Wang Tsu-Han c5cd47f976 fixes for not having parallel config inside the config file 2018-09-12 15:32:44 +02:00
Wang Tsu-Han d7fd3013a1 config file adding parallel configuration 2018-09-12 10:49:57 +02:00
Wang Tsu-Han 3005929bca modify threading option into config file 2018-09-11 18:50:11 +02:00
Wang Tsu-Han 8bb3b91665 Merge branch 'develop' into parallel-config
Conflicts:
	targets/RT/USER/lte-ru.c
2018-09-11 16:11:59 +02:00
Cedric Roux afb2fd4012 Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w36 2018-09-07 16:15:13 +02:00
Cedric Roux 2cb87ddd02 Merge remote-tracking branch 'origin/feature-slice+restart-w35' into develop_integration_2018_w36
Conflicts:
	openair2/ENB_APP/flexran_agent_common_internal.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
2018-09-07 16:13:40 +02:00
Konstantinos Alexandris 938e0242e2 Merge remote-tracking branch 'origin/develop' into x2
Conflicts:
	cmake_targets/CMakeLists.txt
	openair2/ENB_APP/enb_app.c
	openair2/X2AP/x2ap_common.h
2018-09-07 15:30:49 +02:00
Konstantinos Alexandris 1729b3dc66 X2AP: init funcs (register/association) + handler/management functions
SCTP: one to many sockets implementation
2018-09-06 15:49:59 +02:00
laurent 46231a5d5d merge with latest develop 2018-09-06 09:43:26 +02:00
laurent abbffef015 fix some exit situations, that was badly done by SIGUSR1 handler 2018-09-05 17:03:19 +02:00
Robert Schmidt f86b51990c restart: first stop RU, then eNB proc threads 2018-09-05 14:21:39 +02:00
Robert Schmidt 5a1e8c2869 Lock sync_var access in restart_L1L2() 2018-09-05 14:21:39 +02:00
Robert Schmidt c1b024d354 stop_L1L2(): Do not turn of RF, is done in ru_thread 2018-09-05 14:21:39 +02:00
Robert Schmidt 1f60f4ecea Log Level Debug for Freeing Transport Channel Msg 2018-09-05 14:21:39 +02:00
Navid Nikaein 1adbaa7a54 when restarting, re-init MAC UE_list 2018-09-03 18:10:28 +02:00
Robert Schmidt 175d28ee35 bugfixes kill_eNB_proc()
* put mutex lock around instance_prach
* destroy attributes
2018-09-03 18:10:28 +02:00
Robert Schmidt f0670154b3 Correctly join RU threads
* join pthread_FH (ru_thread) once all condition variables have been set
* join RU FHTX only if it has been started (check as for pthread_create())
* join PRACH thread in the monolithic case
* send broadcast on condition variable cond_eNBs, as there can be multiple
  waits on it
* integrate stop_ru(*ru) into kill_RU_proc(*ru)
* Correct memory freeing
2018-09-03 18:10:28 +02:00
Robert Schmidt 2e1dfb5b3e place oai_exit test after wait_on_condition() in threads 2018-09-03 18:10:28 +02:00
Robert Schmidt c56b5af00e bugfix: kill td/te threads only if initialized
* init_td_thread()/init_te_thread() are only initialized depending on condition
  get_nprocs() > 2 && codingw
* apply the same the same for the functions kill_td_thread()/kill_te_thread()
2018-09-03 18:10:28 +02:00
Robert Schmidt 35b3a2af14 Reorganize TASK_L2L1 loop 2018-09-03 18:10:28 +02:00
Robert Schmidt 0846460753 show which task sends TERMINATE_MESSAGE to which task 2018-09-03 18:10:28 +02:00
Cedric Roux 4c069754d3 Merge remote-tracking branch 'origin/basic-simulator-fixes' into develop_integration_2018_w35 2018-08-31 14:49:50 +02:00
Wang Tsu-Han ee04caab8a replacing judgment from get_nprocs() and worker flags by paralle_stage and worker_stage 2018-08-31 12:58:49 +02:00
Cedric Roux c22180ff31 Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
2018-08-31 12:55:28 +02:00
Cedric Roux 7654f8a208 Merge remote-tracking branch 'origin/issue_344_segv_trace_wireshark' into develop_integration_2018_w35 2018-08-31 12:43:33 +02:00
Cedric Roux 3f08e4503b Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w35 2018-08-31 12:29:15 +02:00
Cedric Roux 99535adacc integration: remove compilation warning 2018-08-31 12:02:04 +02:00
Cedric Roux 4aec4a23a8 Merge remote-tracking branch 'origin/multi-sdr-ip-conf' into develop_integration_2018_w35 2018-08-31 11:50:19 +02:00
Cedric Roux a48c36582f bugfix: fix threading in the UE
Various problems were found with the basic simulator.

Variables used by various threads for synchronization need to
be initialized properly. That is before the various threads
start using them.

This goes for:
- UE->is_synchronized
- UE->proc.instance_cnt_synch
- UE->proc.instance_cnt_rxtx

The function "UE->rfdevice.trx_start_func" was called in
"UE_thread_synch" but should be called in "UE_thread" because
"UE_thread" is the one that calls "UE->rfdevice.trx_read_func"
and there is no guaranty that the call to "UE->rfdevice.trx_start_func"
is done before as it has to (it's in another thread).

And finally "pthread_cond_signal(&proc->cond_rxtx)" was called twice,
which may not be a problem but was certainly not intended. Plus
removing one call simplifies the code by removing some "if" logic,
which is a good thing per se.

This commit was not tested with a real UE and may thus introduce some
issues. Hopefully not!
2018-08-27 17:46:03 +02:00
Cedric Roux 97ddf5ea28 basic simulator: bugfix: wait for synch ready at the right time
Before this commit we were checking for UE->is_synchronized == 0
then we were waiting for a potentially active synch routine to
finish and then we were starting the synch routine again but the
synch routine that was running may have set UE->is_synchronized
to 1. This was leading to various problems, most notably the following
message repeated over and over in the UE log and the UE unable to
connect properly:

    [RRC]  [UE 0] Frame 377: OUT OF SYNC FROM eNB 0 (T310 active 0 : T310 0, N310 345, N311 0)

So let's wait for a potentially active synch routine to finish
before anything else.
2018-08-27 17:32:00 +02:00
Cedric Roux 2276996f74 basic simulator: minor bugfix: clear memory before use 2018-08-27 17:28:50 +02:00