maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trace in case tx/rx mismatch

Browse Source
This commit is contained in:
laurent
2019-05-15 16:05:05 +02:00
parent 7a5214c6b4
commit b6c2f9c1df
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/openairinterface5g_limits.h
+4 -4
View File
@@ -8,10 +8,10 @@
#define NUMBER_OF_NR_RU_MAX 2 #define NUMBER_OF_NR_RU_MAX 2
#ifndef PHYSIM #ifndef PHYSIM
#ifndef UE_EXPANSION #ifndef UE_EXPANSION
#define NUMBER_OF_UE_MAX 16 #define NUMBER_OF_UE_MAX 4
#define NUMBER_OF_NR_UE_MAX 16 #define NUMBER_OF_NR_UE_MAX 4
#define NUMBER_OF_CONNECTED_eNB_MAX 3 #define NUMBER_OF_CONNECTED_eNB_MAX 1
#define NUMBER_OF_CONNECTED_gNB_MAX 3 #define NUMBER_OF_CONNECTED_gNB_MAX 1
#else #else
#define NUMBER_OF_UE_MAX 256 #define NUMBER_OF_UE_MAX 256
#define NUMBER_OF_NR_UE_MAX 256 #define NUMBER_OF_NR_UE_MAX 256
targets/ARCH/rfsimulator/simulator.c
+4 -2
View File
@@ -198,7 +198,7 @@ sin_addr:
t->buf[sock].alreadyRead=true; // UE will start blocking on read t->buf[sock].alreadyRead=true; // UE will start blocking on read
return 0; return 0;
} }
uint64_t lastW=-1;
int rfsimulator_write(openair0_device *device, openair0_timestamp timestamp, void **samplesVoid, int nsamps, int nbAnt, int flags) { int rfsimulator_write(openair0_device *device, openair0_timestamp timestamp, void **samplesVoid, int nsamps, int nbAnt, int flags) {
rfsimulator_state_t *t = device->priv; rfsimulator_state_t *t = device->priv;
LOG_D(HW,"sending %d samples at time: %ld\n", nsamps, timestamp); LOG_D(HW,"sending %d samples at time: %ld\n", nsamps, timestamp);
@@ -222,7 +222,7 @@ int rfsimulator_write(openair0_device *device, openair0_timestamp timestamp, voi
fullwrite(ptr->conn_sock, (void *)tmpSamples, sampleToByte(nsamps,nbAnt), t); fullwrite(ptr->conn_sock, (void *)tmpSamples, sampleToByte(nsamps,nbAnt), t);
} }
} }
lastW=timestamp;
LOG_D(HW,"sent %d samples at time: %ld->%ld, energy in first antenna: %d\n", LOG_D(HW,"sent %d samples at time: %ld->%ld, energy in first antenna: %d\n",
nsamps, timestamp, timestamp+nsamps, signal_energy(samplesVoid[0], nsamps) ); nsamps, timestamp, timestamp+nsamps, signal_energy(samplesVoid[0], nsamps) );
return nsamps; return nsamps;
@@ -306,6 +306,8 @@ static bool flushInput(rfsimulator_state_t *t) {
} }
b->lastReceivedTS=b->th.timestamp; b->lastReceivedTS=b->th.timestamp;
AssertFatal(lastW == -1 || ( abs((double)lastW-b->lastReceivedTS) < (double)CirSize),
"Tx/Rx shift too large Tx:%lu, Rx:%lu\n", lastW, b->lastReceivedTS);
b->transferPtr=(char *)&b->circularBuf[b->lastReceivedTS%CirSize]; b->transferPtr=(char *)&b->circularBuf[b->lastReceivedTS%CirSize];
b->remainToTransfer=sampleToByte(b->th.size, b->th.nbAnt); b->remainToTransfer=sampleToByte(b->th.size, b->th.nbAnt);
} }