From 87c5007970190d9e5c5a13a35e51ae40c714bdd8 Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Mon, 21 Mar 2022 10:14:02 +0100 Subject: [PATCH] fix(container): when running in fedora-generic-kerner container, no setting of priority Signed-off-by: Raphael Defosseux --- common/utils/system.c | 7 ++++--- executables/nr-uesoftmodem.c | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/utils/system.c b/common/utils/system.c index d897063144..00839b485c 100644 --- a/common/utils/system.c +++ b/common/utils/system.c @@ -234,9 +234,10 @@ void threadCreate(pthread_t* t, void * (*func)(void*), void * param, char* name, ret=pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); 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 (system("cat /proc/self/cgroup | egrep -c 'libpod|podman|kubepods'")==0) - settingPriority = 0; + if (checkIfFedoraDistribution()) + if (checkIfGenericKernelOnFedora()) + if (checkIfInsideContainer()) + settingPriority = 0; if (settingPriority) { ret=pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED); diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c index 00f019c03a..23615b2c98 100644 --- a/executables/nr-uesoftmodem.c +++ b/executables/nr-uesoftmodem.c @@ -396,7 +396,14 @@ void *rrc_enb_process_msg(void *notUsed) { 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) { fprintf(stderr, "mlockall: %s\n", strerror(errno));