SGWC: config fixes

etc/spgw_c.conf

@@ -49,6 +49,12 @@ S-GW =
             SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
             SCHED_PRIORITY = 84;
         };
+        SGW_APP_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
         ASYNC_CMD_SCHED_PARAMS :
         {
             CPU_ID       = 1;
@@ -93,6 +99,46 @@ P-GW =
     INSTANCE                                  = @INSTANCE@;                     # 0 is the default
     PID_DIRECTORY                             = "@PID_DIRECTORY@";              # /var/run is the default
 
+    ITTI_TASKS :
+    {
+        ITTI_TIMER_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 85;
+        };
+        S11_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
+        S5S8_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
+        SX_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
+        PGW_APP_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
+        ASYNC_CMD_SCHED_PARAMS :
+        {
+            CPU_ID       = 1;
+            SCHED_POLICY = "SCHED_FIFO"; # Values in { SCHED_OTHER, SCHED_IDLE, SCHED_BATCH, SCHED_FIFO, SCHED_RR }
+            SCHED_PRIORITY = 84;
+        };
+    };
+
     INTERFACES :
     {
         S5_S8_CP :

src/oai_spgwc/main.cpp

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
   // Inter task Interface
   itti_inst = new itti_mw();
-  itti_inst->start(sgwc_cfg.itti.itti_timer_sched_params);
+  itti_inst->start(pgw_cfg.itti.itti_timer_sched_params);
 
   // system command
   async_shell_cmd_inst = new async_shell_cmd(sgwc_cfg.itti.async_cmd_sched_params);

src/sgwc/sgwc_config.cpp

@@ -103,8 +103,8 @@ int sgwc_config::load_itti(const Setting& itti_cfg, itti_cfg_t& cfg)
   const Setting& sx_sched_params_cfg = itti_cfg[SGWC_CONFIG_STRING_SX_SCHED_PARAMS];
   load_thread_sched_params(sx_sched_params_cfg, cfg.sx_sched_params);
 
-  const Setting& spgwc_app_sched_params_cfg = itti_cfg[SGWC_CONFIG_STRING_SPGWC_APP_SCHED_PARAMS];
-  load_thread_sched_params(spgwc_app_sched_params_cfg, cfg.spgwc_app_sched_params);
+  const Setting& sgw_app_sched_params_cfg = itti_cfg[SGWC_CONFIG_STRING_SGW_APP_SCHED_PARAMS];
+  load_thread_sched_params(sgw_app_sched_params_cfg, cfg.sgw_app_sched_params);
 
   const Setting& async_cmd_sched_params_cfg = itti_cfg[SGWC_CONFIG_STRING_ASYNC_CMD_SCHED_PARAMS];
   load_thread_sched_params(async_cmd_sched_params_cfg, cfg.async_cmd_sched_params);
@@ -201,7 +201,7 @@ void sgwc_config::display ()
 {
 
   Logger::sgwc_app().info("==== EURECOM %s v%s ====", PACKAGE_NAME, PACKAGE_VERSION);
-  Logger::sgwc_app().info( "Configuration:");
+  Logger::sgwc_app().info( "Configuration SGW-C:");
   //Logger::sgwc_app().info( "- Instance ..............: %s", instance);
   //Logger::sgwc_app().info( "- PID dir ...............: %s", pid_dir.c_str());
   Logger::sgwc_app().info( "- S5_S8-C:");

src/sgwc/sgwc_config.hpp

@@ -55,7 +55,7 @@ namespace sgwc {
 #define SGWC_CONFIG_STRING_S11_SCHED_PARAMS                      "S11_SCHED_PARAMS"
 #define SGWC_CONFIG_STRING_S5S8_SCHED_PARAMS                     "S5S8_SCHED_PARAMS"
 #define SGWC_CONFIG_STRING_SX_SCHED_PARAMS                       "SX_SCHED_PARAMS"
-#define SGWC_CONFIG_STRING_SPGWC_APP_SCHED_PARAMS                "SPGWC_APP_SCHED_PARAMS"
+#define SGWC_CONFIG_STRING_SGW_APP_SCHED_PARAMS                  "SGW_APP_SCHED_PARAMS"
 #define SGWC_CONFIG_STRING_ASYNC_CMD_SCHED_PARAMS                "ASYNC_CMD_SCHED_PARAMS"
 
 #define SGWC_CONFIG_STRING_SCHED_PARAMS                          "SCHED_PARAMS"
@@ -81,7 +81,7 @@ typedef struct itti_cfg_s {
   util::thread_sched_params s11_sched_params;
   util::thread_sched_params s5s8_sched_params;
   util::thread_sched_params sx_sched_params;
-  util::thread_sched_params spgwc_app_sched_params;
+  util::thread_sched_params sgw_app_sched_params;
   util::thread_sched_params async_cmd_sched_params;
 } itti_cfg_t;