added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings

3 files changed, 44 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index caa53b8c..740ed3c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---------------------------------------------------------------------------
 Version 4.7.4  [v4-???] (rgerhards), 2010-11-??
+- added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings
 - added $LocalHostName config directive
 - bugfix: local hostname was pulled too-early, so that some config 
   directives (namely FQDN settings) did not have any effect
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index d76f3544..fea789ec 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -72,6 +72,8 @@ static uchar *pRcvBuf = NULL;		/* receive buffer (for a single packet). We use a
 					 * termination if we can not get it. -- rgerhards, 2007-12-27
 					 */
 static prop_t *pInputName = NULL;	/* our inputName currently is always "imudp", and this will hold it */
+static uchar *pszSchedPolicy = NULL;	/**< scheduling policy (string) */
+static int iSchedPrio = -1;		/**< scheduling priority (must not be negative) */
 // TODO: static ruleset_t *pBindRuleset = NULL; /* ruleset to bind listener to (use system default if unspecified) */
 #define TIME_REQUERY_DFLT 2
 static int iTimeRequery = TIME_REQUERY_DFLT;/* how often is time to be queried inside tight recv loop? 0=always */
@@ -357,6 +359,7 @@ ENDrunInput
 
 /* initialize and return if will run or not */
 BEGINwillRun
+	struct sched_param sparam;
 CODESTARTwillRun
 	/* we need to create the inputName property (only once during our lifetime) */
 	CHKiRet(prop.Construct(&pInputName));
@@ -364,6 +367,41 @@ CODESTARTwillRun
 	CHKiRet(prop.ConstructFinalize(pInputName));
 
 	net.PrintAllowedSenders(1); /* UDP */
+	
+	if(pszSchedPolicy == NULL) {
+		if(iSchedPrio != -1) {
+			errmsg.LogError(errno, NO_ERRCODE, "imudp: scheduling policy not set, but "
+				"priority - ignoring settings");
+		}
+	} else {
+		if(iSchedPrio == -1) {
+			errmsg.LogError(errno, NO_ERRCODE, "imudp: scheduling policy set, but no "
+				"priority - ignoring settings");
+		}
+		sparam.sched_priority = iSchedPrio;
+		dbgprintf("imudp trying to set sched policy to '%s', prio %d\n", 
+			  pszSchedPolicy, iSchedPrio);
+		if(0) { /* trick to use conditional compilation */
+#		ifdef SCHED_FIFO
+		} else if(!strcasecmp((char*)pszSchedPolicy, "fifo")) {
+			pthread_setschedparam(pthread_self(), SCHED_FIFO, &sparam);
+#		endif
+#		ifdef SCHED_RR
+		} else if(!strcasecmp((char*)pszSchedPolicy, "rr")) {
+			pthread_setschedparam(pthread_self(), SCHED_RR, &sparam);
+#		endif
+#		ifdef SCHED_OTHER
+		} else if(!strcasecmp((char*)pszSchedPolicy, "other")) {
+			pthread_setschedparam(pthread_self(), SCHED_OTHER, &sparam);
+#		endif
+		} else {
+			errmsg.LogError(errno, NO_ERRCODE, "imudp: invliad scheduling policy '%s' "
+				"ignoring settings", pszSchedPolicy);
+		}
+		free(pszSchedPolicy);
+		pszSchedPolicy = NULL;
+	}
+
 
 	/* if we could not set up any listners, there is no point in running... */
 	if(udpLstnSocks == NULL)
@@ -445,6 +483,10 @@ CODEmodInit_QueryRegCFSLineHdlr
 		addListner, NULL, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpserveraddress", 0, eCmdHdlrGetWord,
 		NULL, &pszBindAddr, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"imudpschedulingpolicy", 0, eCmdHdlrGetWord,
+		NULL, &pszSchedPolicy, STD_LOADABLE_MODULE_ID));
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"imudpschedulingpriority", 0, eCmdHdlrInt,
+		NULL, &iSchedPrio, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpservertimerequery", 0, eCmdHdlrInt,
 		NULL, &iTimeRequery, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
diff --git a/runtime/glbl.c b/runtime/glbl.c
index b396ed7c..59d1fb0f 100644
--- a/runtime/glbl.c
+++ b/runtime/glbl.c
@@ -154,6 +154,7 @@ GenerateLocalHostNameProperty(void)
 	uchar *pszName;
 
 	if(propLocalHostName != NULL)
+		prop.Destruct(&propLocalHostName);
 
 	CHKiRet(prop.Construct(&propLocalHostName));
 	if(LocalHostNameOverride == NULL) {