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

Merge remote-tracking branch 'origin/fix-running-modem-in-generic-fedora-container' into integration_2022_wk13b

Browse Source
This commit is contained in:
Robert Schmidt
2022-04-01 13:36:43 +02:00
parent 5a3eeac5e4 87c5007970
commit e8463bd610
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/system.c
+4 -3
View File
@@ -234,9 +234,10 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name,
ret=pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); ret=pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno); AssertFatal(ret==0,"ret: %d, errno: %d\n",ret, errno);
if (system("grep -iq 'ID_LIKE.*fedora' /etc/os-release && uname -a | grep -c rt")==0) if (checkIfFedoraDistribution())
if (system("cat /proc/self/cgroup | egrep -c 'libpod|podman|kubepods'")==0) if (checkIfGenericKernelOnFedora())
settingPriority = 0; if (checkIfInsideContainer())
settingPriority = 0;
if (settingPriority) { if (settingPriority) {
ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
executables/nr-uesoftmodem.c
+8 -1
View File
@@ -396,7 +396,14 @@ void *rrc_enb_process_msg(void *notUsed) {
int main( int argc, char **argv ) { int main( int argc, char **argv ) {
set_priority(79); int set_exe_prio = 1;
if (checkIfFedoraDistribution())
if (checkIfGenericKernelOnFedora())
if (checkIfInsideContainer())
set_exe_prio = 0;
if (set_exe_prio)
set_priority(79);
if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1) if (mlockall(MCL_CURRENT | MCL_FUTURE) == -1)
{ {
fprintf(stderr, "mlockall: %s\n", strerror(errno)); fprintf(stderr, "mlockall: %s\n", strerror(errno));