performance-enhanced imtcp

...by now using lowres time and thus saving many time() calls. This needs
some performance testing and must be made configurable if it works out.

3 files changed, 40 insertions, 4 deletions

diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index a486b818..50e8efaf 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -68,6 +68,7 @@ static uchar *pRcvBuf = NULL;		/* receive buffer (for a single packet). We use a
 					 * it so that we can check available memory in willRun() and request
 					 * termination if we can not get it. -- rgerhards, 2007-12-27
 					 */
+// 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 */
 
@@ -97,7 +98,7 @@ static rsRetVal addListner(void __attribute__((unused)) *pVal, uchar *pNewVal)
 	else
 		bindAddr = pszBindAddr;
 
-	dbgprintf("Trying to open syslog UDP ports at %s:%s.\n",
+	DBGPRINTF("Trying to open syslog UDP ports at %s:%s.\n",
 		  (bindAddr == NULL) ? (uchar*)"*" : bindAddr, pNewVal);
 
 	newSocks = net.create_udp_socket(bindAddr, (pNewVal == NULL || *pNewVal == '\0') ? (uchar*) "514" : pNewVal, 1);
@@ -137,6 +138,30 @@ finalize_it:
 }
 
 
+#if 0 /* TODO: implement when tehre is time, requires restructure of socket array! */
+/* accept a new ruleset to bind. Checks if it exists and complains, if not */
+static rsRetVal
+setRuleset(void __attribute__((unused)) *pVal, uchar *pszName)
+{
+	ruleset_t *pRuleset;
+	rsRetVal localRet;
+	DEFiRet;
+
+	localRet = ruleset.GetRuleset(&pRuleset, pszName);
+	if(localRet == RS_RET_NOT_FOUND) {
+		errmsg.LogError(0, NO_ERRCODE, "error: ruleset '%s' not found - ignored", pszName);
+	}
+	CHKiRet(localRet);
+	pBindRuleset = pRuleset;
+	DBGPRINTF("imudp current bind ruleset %p: '%s'\n", pRuleset, pszName);
+
+finalize_it:
+	free(pszName); /* no longer needed */
+	RETiRet;
+}
+#endif
+
+
 /* This function is a helper to runInput. I have extracted it
  * from the main loop just so that we do not have that large amount of code
  * in a single place. This function takes a socket and pulls messages from
@@ -386,6 +411,10 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(net, LM_NET_FILENAME));
 
 	/* register config file handlers */
+	/* TODO: add - but this requires more changes, no time right now...
+	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpserverbindruleset", 0, eCmdHdlrGetWord,
+		setRuleset, NULL, STD_LOADABLE_MODULE_ID));
+	*/
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpserverrun", 0, eCmdHdlrGetWord,
 		addListner, NULL, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"udpserveraddress", 0, eCmdHdlrGetWord,
diff --git a/tcps_sess.c b/tcps_sess.c
index d6bcd51b..8ba5cbec 100644
--- a/tcps_sess.c
+++ b/tcps_sess.c
@@ -56,6 +56,11 @@ DEFobjCurrIf(datetime)
 
 static int iMaxLine; /* maximum size of a single message */
 
+#define TIME_REQUERY_DFLT 16 // TODO change back! 2
+static int iTimeRequery = TIME_REQUERY_DFLT;/* how often is time to be queried inside tight recv loop? 0=always */
+static int iNbrTimeUsed = 0;		    /* how often has previous time been used so far? */
+
+
 /* forward definitions */
 static rsRetVal Close(tcps_sess_t *pThis);
 
@@ -240,9 +245,10 @@ defaultDoSubmitMessage(tcps_sess_t *pThis)
 		FINALIZE;
 	}
 
-	//TODO: if((iTimeRequery == 0) || (iNbrTimeUsed++ % iTimeRequery) == 0) {
+	if((iTimeRequery == 0) || (iNbrTimeUsed++ % iTimeRequery) == 0) {
+RUNLOG_STR("XXX: quering time!");
 		datetime.getCurrTime(&stTime, &ttGenTime);
-	//}
+	}
 	/* we now create our own message object and submit it to the queue */
 	CHKiRet(msgConstructWithTime(&pMsg, &stTime, ttGenTime));
 	/* first trim the buffer to what we have actually received */
@@ -307,6 +313,7 @@ PrepareClose(tcps_sess_t *pThis)
 		 * this case.
 		 */
 		dbgprintf("Extra data at end of stream in legacy syslog/tcp message - processing\n");
+		iNbrTimeUsed = 0; /* full time query */
 		defaultDoSubmitMessage(pThis);
 	}
 
@@ -451,6 +458,7 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen)
 	 /* We now copy the message to the session buffer. */
 	pEnd = pData + iLen; /* this is one off, which is intensional */
 
+	iNbrTimeUsed = 0; /* full time query */
 	while(pData < pEnd) {
 		CHKiRet(processDataRcvd(pThis, *pData++));
 	}
diff --git a/tcpsrv.c b/tcpsrv.c
index 95409d2f..5e2bd530 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -106,7 +106,6 @@ addNewLstnPort(tcpsrv_t *pThis, uchar *pszPort)
 	CHKmalloc(pEntry = malloc(sizeof(tcpLstnPortList_t)));
 	pEntry->pszPort = pszPort;
 	pEntry->pSrv = pThis;
-RUNLOG_VAR("%p", pThis->pRuleset);
 	pEntry->pRuleset = pThis->pRuleset;
 	CHKmalloc(pEntry->pszInputName = ustrdup(pThis->pszInputName));