Raphael Defosseux
bb566eaeb8
Merge remote-tracking branch 'origin/x2' into develop_integration_2018_w39
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-09-28 17:00:21 +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
Konstantinos Alexandris
67cc97a42c
Merge remote-tracking branch 'origin/develop' into x2
2018-09-21 16:01:52 +02:00
Konstantinos Alexandris
2c27a38dc3
x2ap: implement x2setuprequest, x2setupresponse, x2setupfailure
2018-09-21 15:58:36 +02:00
Wang Tsu-Han
2dc3dfa373
adding parallel config in dlsim and ulsim
2018-09-20 15:17:32 +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
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
3005929bca
modify threading option into config file
2018-09-11 18:50:11 +02:00
Cedric Roux
00e21e74a6
integration fix: better error reporting in case of X2 failure
...
If the IP address for X2AP is not good, the error message reported
was very unclear. Attempt to make it better.
2018-09-10 16:32:20 +02:00
Cedric Roux
833016123a
hotfix: revert commits that break the basic simulator
...
This commit manually reverts the commits:
- 97c69dc4a4
- 3278aa494d
The basic simulator was not functional anymore because
the UE did not send RRCConnectionSetupComplete due to
some problem in the PDCP layer, most probably.
2018-09-10 16:22:03 +02:00
Cedric Roux
82ab88f546
integration fix: add missing break
...
This break was there and went away, for whatever reason...
2018-09-07 17:24:37 +02:00
Cedric Roux
c1d96a49ca
Merge remote-tracking branch 'origin/nasmesh_new_kernel' into develop_integration_2018_w36
2018-09-07 17:01:28 +02:00
Cedric Roux
73da898f9b
integration fix: fix bad merge conflict resolution + fix compilation error
2018-09-07 16:57:55 +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
Cedric Roux
2c9be8c102
Merge remote-tracking branch 'origin/fix-nfapi-in-scheduler' into develop_integration_2018_w36
2018-09-07 16:08:09 +02:00
Cedric Roux
b0eff6c0a6
Merge remote-tracking branch 'origin/scheduler-small-fix' into develop_integration_2018_w36
2018-09-07 16:07:23 +02:00
Cedric Roux
cbdc8f662a
Merge remote-tracking branch 'origin/issue343_dlcqi_retransmission' into develop_integration_2018_w36
2018-09-07 16:04:05 +02:00
laurent
7d22622474
fix nasmesh kernel 4.15
2018-09-07 15:44:57 +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
2b85c4a3a6
Pass multi socket descriptor in SCTP + add SCTP multi init req/resp mechanism
2018-09-07 15:15:41 +02:00
Masayuki HARADA
c1359a103f
Fix wrong slice_allocation loop in fairRR scheduler
2018-09-06 19:03:05 +02:00
Cedric Roux
8534982afe
bugfix: check that we are manipulating the structure for the correct RNTI
...
The bug popped up when one UE was doing TCP UL iperf and a second UE
attempted to connect. A crash of the eNB happened because we changed
the wrong NFAPI structure in a TTI where both UEs are scheduled.
Something like that.
2018-09-06 16:42:10 +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
70e1841bb1
Fix: RAN API: remove_ul_slice() frees ul sched_name pointer, when sched_name set, free it when resetting
2018-09-05 14:21:39 +02:00
Robert Schmidt
cbc78cd3db
Don't warn of ignoring sorting
2018-09-05 14:21:39 +02:00
Robert Schmidt
7162bf6895
Bugfix: Assure available_rbs is positive
2018-09-05 14:21:39 +02:00
Robert Schmidt
066ab90402
Bugfix: Give correct first_rb value to UE
2018-09-05 14:21:39 +02:00
Robert Schmidt
d798e03e9d
fix rb_table loop
2018-09-05 14:21:39 +02:00
Robert Schmidt
ff83dc7017
Fix greedy allocation: schedule not more than what slice has
2018-09-05 14:21:39 +02:00
Robert Schmidt
fa27b6dcce
Fix: Correct numbering of protobuf messages (as in RTC)
2018-09-05 14:21:39 +02:00
Robert Schmidt
af83d352c8
Fix: use frame_subframe2_dl_harq_pid()
2018-09-05 14:21:39 +02:00
Robert Schmidt
9f04614304
Remove huge comment from sort_UEs()
...
Commit 7823858e2d11e8cabc1ca7bf7f507b9a050942d3 introduced this as a comment.
2018-09-05 14:21:38 +02:00
Robert Schmidt
07ad2470d1
Remove warnings pre_processor_fairRR
2018-09-05 14:21:36 +02:00
Cedric Roux
6270d94f91
bugfix: use correct comparison
...
The comparison in AssertFatal was not correct,
taking the opposite meaning to the one expected.
2018-09-04 12:43:29 +02:00
Robert Schmidt
49b167d6ae
Remove warnings pre_processor
2018-09-03 18:10:28 +02:00
Robert Schmidt
972f52fd56
fix remove LOG_N in restart
2018-09-03 18:10:28 +02:00
Robert Schmidt
e1a598bc8d
Fix function parameter definition/order
...
Affects:
* store_dlsch_buffer()
* assign_rbs_required()
2018-09-03 18:10:28 +02:00
Robert Schmidt
21983a2028
Patch fairRR scheduler to use slice iface of pre-processor
2018-09-03 18:10:28 +02:00
Robert Schmidt
08b122e3ff
FlexRAN: update slice config array dimensions
2018-09-03 18:10:28 +02:00
Robert Schmidt
71a9115abd
Iterate over actual number of CC, not NFAPI_CC_MAX
2018-09-03 18:10:28 +02:00
Robert Schmidt
3278aa494d
Return immediately from pdcp_data_req
...
When the RLC layer returns error codes (like dropped packets), this is still
counted as PDCP layer traffic. In order to reflect dropped packets or
malfunctioning, this patch makes that upon an RLC error code, the function is
exited immediately. In this case, it is not counted as additional PDCP traffic.
An example is too much UDP traffic. If the RLC buffer is saturated and the
packet therefore refused, incoming traffic won't be counted anymore. With this
patch, the PDCP layer statistics won't count such traffic anymore.
2018-09-03 18:10:28 +02:00
Robert Schmidt
204281e3af
change types in RCconfig_flexran(), avoid seg fault
...
the integration of the nfapi-L2-emulator-for-develop (f254107b2 ) added more
types in the RCconfig_flexran(), but they were partially wrong. This commit
fixes those types after the rebase of this branch on top of 2018.w19
2018-09-03 18:10:28 +02:00
Robert Schmidt
77f2ffcdfb
FlexRAN: call the agent_rrc_xface with the mod_id
2018-09-03 18:10:28 +02:00
Robert Schmidt
cca5c1b71a
FlexRAN: use correct identifiers for PDCP, RRC
...
* give the correct UE_id instead an index of the protobuf message (they can
diverge from each other)
* in the PDCP part of the RAN API, the RAN API has to make the conversion UE_id
(MAC) to UID (PDCP)
* a follow up commit could clean up the interfaces:
- the MAC functions take the UE_id
- the RRC functions take the RNTI
- the PDCP functions take the UID
this would mean the caller has to find those ID but would decrease
computations since the RAN API functions do not have to do that themselves
2018-09-03 18:10:28 +02:00
Robert Schmidt
97c69dc4a4
Drop traffic in PDCP if RLC buffer is full
...
If the buffer in the RLC is full, testing the buffer state over and over again
slows the DL traffic down. In order to circumvent this, the PDCP will drop any
data during a configurable time (compile-time) before it delivers data to RLC
again.
To change this, see the constant TM_SKIP_FULL_BUF_MS in pdcp.h.
2018-09-03 18:10:28 +02:00
Robert Schmidt
3b80c73f93
FlexRAN: Loop over UEs using UE_id, not index
2018-09-03 18:10:28 +02:00