From 9b4a225c5993f96466ac568933c6ad9b819c235b Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 10 Oct 2012 19:20:19 +0200
Subject: refactor tpl processor so that date is queried once per template

Things like $YEAR, $MONTH required a time() call each.
---
 runtime/msg.c | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index d3c814e2..2ffd4900 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2373,40 +2373,38 @@ char *textpri(char *pRes, size_t pResLen, int pri)
  */
 typedef enum ENOWType { NOW_NOW, NOW_YEAR, NOW_MONTH, NOW_DAY, NOW_HOUR, NOW_HHOUR, NOW_QHOUR, NOW_MINUTE } eNOWType;
 #define tmpBUFSIZE 16	/* size of formatting buffer */
-static uchar *getNOW(eNOWType eNow)
+static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
 {
 	uchar *pBuf;
-	struct syslogTime t;
 
 	if((pBuf = (uchar*) MALLOC(sizeof(uchar) * tmpBUFSIZE)) == NULL) {
 		return NULL;
 	}
 
-	datetime.getCurrTime(&t, NULL);
 	switch(eNow) {
 	case NOW_NOW:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d-%2.2d-%2.2d", t.year, t.month, t.day);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d-%2.2d-%2.2d", t->year, t->month, t->day);
 		break;
 	case NOW_YEAR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d", t.year);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d", t->year);
 		break;
 	case NOW_MONTH:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.month);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->month);
 		break;
 	case NOW_DAY:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.day);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->day);
 		break;
 	case NOW_HOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.hour);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->hour);
 		break;
 	case NOW_HHOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute / 30);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute / 30);
 		break;
 	case NOW_QHOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute / 15);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute / 15);
 		break;
 	case NOW_MINUTE:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t.minute);
+		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute);
 		break;
 	}
 
@@ -2673,7 +2671,7 @@ finalize_it:
  * Parameter "bMustBeFreed" is set by this function. It tells the
  * caller whether or not the string returned must be freed by the
  * caller itself. It is is 0, the caller MUST NOT free it. If it is
- * 1, the caller MUST free 1. Handling this wrongly leads to either
+ * 1, the caller MUST free it. Handling this wrongly leads to either
  * a memory leak of a program abort (do to double-frees or frees on
  * the constant memory pool). So be careful to do it right.
  * rgerhards 2004-11-23
@@ -2690,7 +2688,7 @@ finalize_it:
 	return(UCHAR_CONSTANT("**OUT OF MEMORY**"));}
 uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
                  propid_t propid, es_str_t *propName, rs_size_t *pPropLen,
-		 unsigned short *pbMustBeFreed)
+		 unsigned short *pbMustBeFreed, struct syslogTime *ttNow)
 {
 	uchar *pRes; /* result pointer */
 	rs_size_t bufLen = -1; /* length of string or -1, if not known */
@@ -2794,49 +2792,50 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			pRes = (uchar*)getParseSuccess(pMsg);
 			break;
 		case PROP_SYS_NOW:
-			if((pRes = getNOW(NOW_NOW)) == NULL) {
+			if((pRes = getNOW(NOW_NOW, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_YEAR:
-			if((pRes = getNOW(NOW_YEAR)) == NULL) {
+			if((pRes = getNOW(NOW_YEAR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
+//TODO set pPropLen!
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_MONTH:
-			if((pRes = getNOW(NOW_MONTH)) == NULL) {
+			if((pRes = getNOW(NOW_MONTH, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_DAY:
-			if((pRes = getNOW(NOW_DAY)) == NULL) {
+			if((pRes = getNOW(NOW_DAY, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_HOUR:
-			if((pRes = getNOW(NOW_HOUR)) == NULL) {
+			if((pRes = getNOW(NOW_HOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_HHOUR:
-			if((pRes = getNOW(NOW_HHOUR)) == NULL) {
+			if((pRes = getNOW(NOW_HHOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_QHOUR:
-			if((pRes = getNOW(NOW_QHOUR)) == NULL) {
+			if((pRes = getNOW(NOW_QHOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
 			break;
 		case PROP_SYS_MINUTE:
-			if((pRes = getNOW(NOW_MINUTE)) == NULL) {
+			if((pRes = getNOW(NOW_MINUTE, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			} else
 				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
@@ -3544,7 +3543,7 @@ msgGetMsgVarNew(msg_t *pThis, uchar *name)
 	/* always call MsgGetProp() without a template specifier */
 	/* TODO: optimize propNameToID() call -- rgerhards, 2009-06-26 */
 	propNameStrToID(name, &propid);
-	pszProp = (uchar*) MsgGetProp(pThis, NULL, propid, NULL, &propLen, &bMustBeFreed);
+	pszProp = (uchar*) MsgGetProp(pThis, NULL, propid, NULL, &propLen, &bMustBeFreed, NULL);
 
 	estr = es_newStrFromCStr((char*)pszProp, propLen);
 	if(bMustBeFreed)
-- 
cgit v1.2.3


From 398704183200adea592bf17059b3c443160efcf6 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 11 Oct 2012 09:57:39 +0200
Subject: slightly improve performance for $NOW family of system properties

---
 runtime/msg.c | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 2ffd4900..473246e6 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2794,51 +2794,66 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 		case PROP_SYS_NOW:
 			if((pRes = getNOW(NOW_NOW, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 10;
+			}
 			break;
 		case PROP_SYS_YEAR:
 			if((pRes = getNOW(NOW_YEAR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-//TODO set pPropLen!
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 4;
+			}
 			break;
 		case PROP_SYS_MONTH:
 			if((pRes = getNOW(NOW_MONTH, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_DAY:
 			if((pRes = getNOW(NOW_DAY, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_HOUR:
 			if((pRes = getNOW(NOW_HOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_HHOUR:
 			if((pRes = getNOW(NOW_HHOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_QHOUR:
 			if((pRes = getNOW(NOW_QHOUR, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_MINUTE:
 			if((pRes = getNOW(NOW_MINUTE, ttNow)) == NULL) {
 				RET_OUT_OF_MEMORY;
-			} else
-				*pbMustBeFreed = 1;	/* all of these functions allocate dyn. memory */
+			} else {
+				*pbMustBeFreed = 1;
+				*pPropLen = 2;
+			}
 			break;
 		case PROP_SYS_MYHOSTNAME:
 			pRes = glbl.GetLocalHostName();
-- 
cgit v1.2.3


From 71a14055adfaa2a43cb1cf0c6d3c05acb6ed1ef0 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 11 Oct 2012 11:25:25 +0200
Subject: fix: wrong variable was populated in MsgGetProp()

problem in this morning's change, never released
---
 runtime/msg.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 473246e6..09ee59e2 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2796,7 +2796,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 10;
+				bufLen = 10;
 			}
 			break;
 		case PROP_SYS_YEAR:
@@ -2804,7 +2804,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 4;
+				bufLen = 4;
 			}
 			break;
 		case PROP_SYS_MONTH:
@@ -2812,7 +2812,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_DAY:
@@ -2820,7 +2820,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_HOUR:
@@ -2828,7 +2828,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_HHOUR:
@@ -2836,7 +2836,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_QHOUR:
@@ -2844,7 +2844,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_MINUTE:
@@ -2852,7 +2852,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				*pPropLen = 2;
+				bufLen = 2;
 			}
 			break;
 		case PROP_SYS_MYHOSTNAME:
-- 
cgit v1.2.3


From 3421209cd550b9470c218a4cda578b7aad42529f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 11 Oct 2012 11:33:16 +0200
Subject: optimize property replacer: reduce runtime for simple processing

---
 runtime/msg.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 09ee59e2..b79e4756 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2912,7 +2912,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 	}
 
 	/* If we did not receive a template pointer, we are already done... */
-	if(pTpe == NULL) {
+	if(pTpe == NULL || !pTpe->bComplexProcessing) {
 		*pPropLen = (bufLen == -1) ? ustrlen(pRes) : bufLen;
 		return pRes;
 	}
@@ -3499,9 +3499,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 		jsonField(pTpe, &pRes, pbMustBeFreed, &bufLen);
 	}
 
-	if(bufLen == -1)
-		bufLen = ustrlen(pRes);
-	*pPropLen = bufLen;
+	*pPropLen = (bufLen == -1) ? ustrlen(pRes) : bufLen;
 
 	ENDfunc
 	return(pRes);
-- 
cgit v1.2.3


From 3b5e2ec7b2d21cc145b62e8e6bcf5e58eb94918c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Tue, 25 Sep 2012 13:52:41 +0200
Subject: Fix crash when date properties are used without a template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

E.g. in
> set $!time = $timereported;
> set $!time_rcvd = $timegenerated;
pTpe is set to NULL by the caller.

(Is "default" the correct format to use?)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 runtime/msg.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index b79e4756..b0b93f98 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2696,6 +2696,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 	uchar *pBuf;
 	int iLen;
 	short iOffs;
+	enum tplFormatTypes datefmt;
 
 	BEGINfunc
 	assert(pMsg != NULL);
@@ -2715,7 +2716,11 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			bufLen = getMSGLen(pMsg);
 			break;
 		case PROP_TIMESTAMP:
-			pRes = (uchar*)getTimeReported(pMsg, pTpe->data.field.eDateFormat);
+			if (pTpe != NULL)
+				datefmt = pTpe->data.field.eDateFormat;
+			else
+				datefmt = tplFmtDefault;
+			pRes = (uchar*)getTimeReported(pMsg, datefmt);
 			break;
 		case PROP_HOSTNAME:
 			pRes = (uchar*)getHOSTNAME(pMsg);
@@ -2765,7 +2770,11 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			pRes = (uchar*)getSeverityStr(pMsg);
 			break;
 		case PROP_TIMEGENERATED:
-			pRes = (uchar*)getTimeGenerated(pMsg, pTpe->data.field.eDateFormat);
+			if (pTpe != NULL)
+				datefmt = pTpe->data.field.eDateFormat;
+			else
+				datefmt = tplFmtDefault;
+			pRes = (uchar*)getTimeGenerated(pMsg, datefmt);
 			break;
 		case PROP_PROGRAMNAME:
 			pRes = getProgramName(pMsg, LOCK_MUTEX);
-- 
cgit v1.2.3


From f88d4f76f69f52918726eb91a2ce06a163cbf0c6 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sat, 3 Nov 2012 12:51:19 +0100
Subject: queue: remove unnecessary (obj_t*) redirection from msg ptrs

---
 runtime/msg.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index b0b93f98..781743ae 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3676,12 +3676,10 @@ static rsRetVal msgConstructFinalizer(msg_t *pThis)
  * satisfies the base object class getSeverity semantics.
  * rgerhards, 2008-01-14
  */
-static rsRetVal
-MsgGetSeverity(obj_t_ptr pThis, int *piSeverity)
+rsRetVal
+MsgGetSeverity(msg_t *pMsg, int *piSeverity)
 {
-	ISOBJ_TYPE_assert(pThis, msg);
-	assert(piSeverity != NULL);
-	*piSeverity = ((msg_t*) pThis)->iSeverity;
+	*piSeverity = pMsg->iSeverity;
 	return RS_RET_OK;
 }
 
@@ -3982,7 +3980,6 @@ BEGINObjClassInit(msg, 1, OBJ_IS_CORE_MODULE)
 	OBJSetMethodHandler(objMethod_SERIALIZE, MsgSerialize);
 	OBJSetMethodHandler(objMethod_SETPROPERTY, MsgSetProperty);
 	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, msgConstructFinalizer);
-	OBJSetMethodHandler(objMethod_GETSEVERITY, MsgGetSeverity);
 	/* initially, we have no need to lock message objects */
 	funcLock = MsgLockingDummy;
 	funcUnlock = MsgLockingDummy;
-- 
cgit v1.2.3


From c28d92259b27eebca3892b9ad18d467691e5aacc Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sat, 3 Nov 2012 13:27:27 +0100
Subject: queue: use specific deserializer for msg object

spares lengthy table lookups
---
 runtime/msg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 781743ae..b34adca3 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3665,7 +3665,8 @@ finalize_it:
  * is done, the object is considered ready for full processing.
  * rgerhards, 2008-07-08
  */
-static rsRetVal msgConstructFinalizer(msg_t *pThis)
+rsRetVal
+msgConstructFinalizer(msg_t *pThis)
 {
 	MsgPrepareEnqueue(pThis);
 	return RS_RET_OK;
-- 
cgit v1.2.3


From 5a643669221363a49fb36cfb2acc64dc29b53a14 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sat, 3 Nov 2012 17:07:22 +0100
Subject: queue: remove time() calls from msg deserialization

---
 runtime/msg.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index b34adca3..dca49a6d 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -814,6 +814,19 @@ finalize_it:
 }
 
 
+/* Special msg constructor, to be used when an object is deserialized.
+ * we do only the base init as we know the properties will be set in
+ * any case by the deserializer. We still do the "inexpensive" inits
+ * just to be on the safe side. The whole process needs to be
+ * refactored together with the msg serialization subsystem.
+ */
+rsRetVal
+msgConstructForDeserializer(msg_t **ppThis)
+{
+	return msgBaseConstruct(ppThis);
+}
+
+
 /* some free handlers for (slightly) complicated cases... All of them may be called
  * with an empty element.
  */
-- 
cgit v1.2.3


From 6a61b91815b7be2320daa86b4392fda39aeb7be5 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 5 Nov 2012 13:02:30 +0100
Subject: very minimal improvement in reconstructing persisted queue entries

---
 runtime/msg.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index dca49a6d..5c6d199f 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3619,8 +3619,6 @@ rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp)
 		MsgSetMSGoffs(pThis, pProp->val.num);
 	} else if(isProp("pszRawMsg")) {
 		MsgSetRawMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr));
-	} else if(isProp("pszUxTradMsg")) {
-		/*IGNORE*/; /* this *was* a property, but does no longer exist */
 	} else if(isProp("pszTAG")) {
 		MsgSetTAG(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr));
 	} else if(isProp("pszInputName")) {
@@ -3654,14 +3652,16 @@ rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp)
 		memcpy(&pThis->tTIMESTAMP, &pProp->val.vSyslogTime, sizeof(struct syslogTime));
 	} else if(isProp("pszRuleset")) {
 		MsgSetRulesetByName(pThis, pProp->val.pStr);
-	} else if(isProp("pszMSG")) {
-		dbgprintf("no longer supported property pszMSG silently ignored\n");
 	} else if(isProp("json")) {
 		tokener = json_tokener_new();
 		json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pProp->val.pStr),
 					     cstrLen(pProp->val.pStr));
 		json_tokener_free(tokener);
 		msgAddJSON(pThis, (uchar*)"!", json);
+	} else if(isProp("pszMSG")) {
+		dbgprintf("no longer supported property pszMSG silently ignored\n");
+	} else if(isProp("pszUxTradMsg")) {
+		/*IGNORE*/; /* this *was* a property, but does no longer exist */
 	} else {
 		dbgprintf("unknown supported property '%s' silently ignored\n",
 			  rsCStrGetSzStrNoNULL(pProp->pcsName));
@@ -3992,8 +3992,6 @@ BEGINObjClassInit(msg, 1, OBJ_IS_CORE_MODULE)
 
 	/* set our own handlers */
 	OBJSetMethodHandler(objMethod_SERIALIZE, MsgSerialize);
-	OBJSetMethodHandler(objMethod_SETPROPERTY, MsgSetProperty);
-	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, msgConstructFinalizer);
 	/* initially, we have no need to lock message objects */
 	funcLock = MsgLockingDummy;
 	funcUnlock = MsgLockingDummy;
-- 
cgit v1.2.3


From 94f6326237404545877c3d3df0edef44e28bcda9 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 6 Nov 2012 17:48:35 +0100
Subject: queue: reduce CPU load for deserializing message properties

Linear runtime due to message order. Was quadratic before. However, not
a big overall improvement.
---
 runtime/msg.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 181 insertions(+), 16 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 5c6d199f..e52d2c14 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -59,6 +59,7 @@
 #include "ruleset.h"
 #include "prop.h"
 #include "net.h"
+#include "var.h"
 #include "rsconf.h"
 
 /* static data */
@@ -68,6 +69,7 @@ DEFobjCurrIf(glbl)
 DEFobjCurrIf(regexp)
 DEFobjCurrIf(prop)
 DEFobjCurrIf(net)
+DEFobjCurrIf(var)
 
 static struct {
 	uchar *pszName;
@@ -413,6 +415,16 @@ rsRetVal MsgEnableThreadSafety(void)
 /* end locking functions */
 
 
+/* rgerhards 2012-04-18: set associated ruleset (by ruleset name)
+ * If ruleset cannot be found, no update is done.
+ */
+static void
+MsgSetRulesetByName(msg_t *pMsg, cstr_t *rulesetName)
+{
+	rulesetGetRuleset(runConf, &(pMsg->pRuleset), rsCStrGetSzStrNoNULL(rulesetName));
+}
+
+
 static inline int getProtocolVersion(msg_t *pM)
 {
 	return(pM->iProtocolVersion);
@@ -1133,6 +1145,167 @@ finalize_it:
 }
 
 
+/* This is a helper for MsgDeserialize that re-inits the var object. This
+ * whole construct should be replaced, var is really ready to be retired.
+ * But as an interim help during refactoring let's introduce this function
+ * here (and thus NOT as method of var object!). -- rgerhads, 2012-11-06
+ */
+static inline void
+reinitVar(var_t *pVar)
+{
+	rsCStrDestruct(&pVar->pcsName); /* no longer needed */
+	if(pVar->varType == VARTYPE_STR) {
+		if(pVar->val.pStr != NULL)
+			rsCStrDestruct(&pVar->val.pStr);
+	}
+}
+/* deserialize the message again 
+ * we deserialize the properties in the same order that we serialized them. Except
+ * for some checks to cover downlevel version, we do not need to do all these
+ * CPU intense name checkings.
+ */
+#define isProp(name) !rsCStrSzStrCmp(pVar->pcsName, (uchar*) name, sizeof(name) - 1)
+rsRetVal
+MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
+{
+	prop_t *myProp;
+	prop_t *propRcvFrom = NULL;
+	prop_t *propRcvFromIP = NULL;
+	struct json_tokener *tokener;
+	struct json_object *json;
+	var_t *pVar = NULL;
+	DEFiRet;
+
+	ISOBJ_TYPE_assert(pStrm, strm);
+
+	CHKiRet(var.Construct(&pVar));
+	CHKiRet(var.ConstructFinalize(pVar));
+
+	CHKiRet(objDeserializeProperty(pVar, pStrm));
+	if(isProp("iProtocolVersion")) {
+		setProtocolVersion(pMsg, pVar->val.num);
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("iSeverity")) {
+		pMsg->iSeverity = pVar->val.num;
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("iFacility")) {
+		pMsg->iFacility = pVar->val.num;
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("msgFlags")) {
+		pMsg->msgFlags = pVar->val.num;
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("ttGenTime")) {
+		pMsg->ttGenTime = pVar->val.num;
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("tRcvdAt")) {
+		memcpy(&pMsg->tRcvdAt, &pVar->val.vSyslogTime, sizeof(struct syslogTime));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("tTIMESTAMP")) {
+		memcpy(&pMsg->tRcvdAt, &pVar->val.vSyslogTime, sizeof(struct syslogTime));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszTAG")) {
+		MsgSetTAG(pMsg, rsCStrGetSzStrNoNULL(pVar->val.pStr), cstrLen(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszRawMsg")) {
+		MsgSetRawMsg(pMsg, (char*) rsCStrGetSzStrNoNULL(pVar->val.pStr), cstrLen(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszHOSTNAME")) {
+		MsgSetHOSTNAME(pMsg, rsCStrGetSzStrNoNULL(pVar->val.pStr), rsCStrLen(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszInputName")) {
+		/* we need to create a property */ 
+		CHKiRet(prop.Construct(&myProp));
+		CHKiRet(prop.SetString(myProp, rsCStrGetSzStrNoNULL(pVar->val.pStr), rsCStrLen(pVar->val.pStr)));
+		CHKiRet(prop.ConstructFinalize(myProp));
+		MsgSetInputName(pMsg, myProp);
+		prop.Destruct(&myProp);
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszRcvFrom")) {
+		MsgSetRcvFromStr(pMsg, rsCStrGetSzStrNoNULL(pVar->val.pStr), rsCStrLen(pVar->val.pStr), &propRcvFrom);
+		prop.Destruct(&propRcvFrom);
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszRcvFromIP")) {
+		MsgSetRcvFromIPStr(pMsg, rsCStrGetSzStrNoNULL(pVar->val.pStr), rsCStrLen(pVar->val.pStr), &propRcvFromIP);
+		prop.Destruct(&propRcvFromIP);
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("json")) {
+		tokener = json_tokener_new();
+		json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr),
+					     cstrLen(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pCSStrucData")) {
+		MsgSetStructuredData(pMsg, (char*) rsCStrGetSzStrNoNULL(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pCSAPPNAME")) {
+		MsgSetAPPNAME(pMsg, (char*) rsCStrGetSzStrNoNULL(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pCSPROCID")) {
+		MsgSetPROCID(pMsg, (char*) rsCStrGetSzStrNoNULL(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pCSMSGID")) {
+		MsgSetMSGID(pMsg, (char*) rsCStrGetSzStrNoNULL(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszUUID")) {
+		pMsg->pszUUID = ustrdup(rsCStrGetSzStrNoNULL(pVar->val.pStr));
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	if(isProp("pszRuleset")) {
+		MsgSetRulesetByName(pMsg, pVar->val.pStr);
+		reinitVar(pVar);
+		CHKiRet(objDeserializeProperty(pVar, pStrm));
+	}
+	/* "offMSG" must always be our last field, so we use this as an
+	 * indicator if the sequence is correct. This is a bit questionable,
+	 * but on the other hand it works decently AND we will probably replace
+	 * the whole persisted format soon in any case. -- rgerhards, 2012-11-06
+	 */
+	if(!isProp("offMSG"))
+		ABORT_FINALIZE(RS_RET_DS_PROP_SEQ_ERR);
+	MsgSetMSGoffs(pMsg, pVar->val.num);
+finalize_it:
+	if(pVar != NULL)
+		var.Destruct(&pVar);
+	RETiRet;
+}
+
+
 /* Increment reference count - see description of the "msg"
  * structure for details. As a convenience to developers,
  * this method returns the msg pointer that is passed to it.
@@ -1799,16 +1972,6 @@ void MsgSetRuleset(msg_t *pMsg, ruleset_t *pRuleset)
 }
 
 
-/* rgerhards 2012-04-18: set associated ruleset (by ruleset name)
- * If ruleset cannot be found, no update is done.
- */
-static void
-MsgSetRulesetByName(msg_t *pMsg, cstr_t *rulesetName)
-{
-	rulesetGetRuleset(runConf, &(pMsg->pRuleset), rsCStrGetSzStrNoNULL(rulesetName));
-}
-
-
 /* set TAG in msg object
  * (rewritten 2009-06-18 rgerhards)
  */
@@ -3594,6 +3757,7 @@ msgGetMsgVarNew(msg_t *pThis, uchar *name)
  * change over time).
  * rgerhards, 2008-01-07
  */
+#undef isProp
 #define isProp(name) !rsCStrSzStrCmp(pProp->pcsName, (uchar*) name, sizeof(name) - 1)
 rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp)
 {
@@ -3951,25 +4115,25 @@ done:	return dst;
 
 
 rsRetVal
-msgSetJSONFromVar(msg_t *pMsg, uchar *varname, struct var *var)
+msgSetJSONFromVar(msg_t *pMsg, uchar *varname, struct var *v)
 {
 	struct json_object *json = NULL;
 	char *cstr;
 	DEFiRet;
-	switch(var->datatype) {
+	switch(v->datatype) {
 	case 'S':/* string */
-		cstr = es_str2cstr(var->d.estr, NULL);
+		cstr = es_str2cstr(v->d.estr, NULL);
 		json = json_object_new_string(cstr);
 		free(cstr);
 		break;
 	case 'N':/* number (integer) */
-		json = json_object_new_int((int) var->d.n);
+		json = json_object_new_int((int) v->d.n);
 		break;
 	case 'J':/* native JSON */
-		json = jsonDeepCopy(var->d.json);
+		json = jsonDeepCopy(v->d.json);
 		break;
 	default:DBGPRINTF("msgSetJSONFromVar: unsupported datatype %c\n",
-		var->datatype);
+		v->datatype);
 		ABORT_FINALIZE(RS_RET_ERR);
 	}
 	msgAddJSON(pMsg, varname+1, json);
@@ -3989,6 +4153,7 @@ BEGINObjClassInit(msg, 1, OBJ_IS_CORE_MODULE)
 	CHKiRet(objUse(datetime, CORE_COMPONENT));
 	CHKiRet(objUse(glbl, CORE_COMPONENT));
 	CHKiRet(objUse(prop, CORE_COMPONENT));
+	CHKiRet(objUse(var, CORE_COMPONENT));
 
 	/* set our own handlers */
 	OBJSetMethodHandler(objMethod_SERIALIZE, MsgSerialize);
-- 
cgit v1.2.3


From 479657a04531e3d654e2cce932789cf1888eaa3f Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 6 Nov 2012 18:18:16 +0100
Subject: cleanup: remove no longer needed function

---
 runtime/msg.c | 86 -----------------------------------------------------------
 1 file changed, 86 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index e52d2c14..34f7ba76 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3751,92 +3751,6 @@ msgGetMsgVarNew(msg_t *pThis, uchar *name)
 }
 
 
-/* This function can be used as a generic way to set properties.
- * We have to handle a lot of legacy, so our return value is not always
- * 100% correct (called functions do not always provide one, should
- * change over time).
- * rgerhards, 2008-01-07
- */
-#undef isProp
-#define isProp(name) !rsCStrSzStrCmp(pProp->pcsName, (uchar*) name, sizeof(name) - 1)
-rsRetVal MsgSetProperty(msg_t *pThis, var_t *pProp)
-{
-	prop_t *myProp;
-	prop_t *propRcvFrom = NULL;
-	prop_t *propRcvFromIP = NULL;
-	struct json_tokener *tokener;
-	struct json_object *json;
-	DEFiRet;
-
-	ISOBJ_TYPE_assert(pThis, msg);
-	assert(pProp != NULL);
-
- 	if(isProp("iProtocolVersion")) {
-		setProtocolVersion(pThis, pProp->val.num);
- 	} else if(isProp("iSeverity")) {
-		pThis->iSeverity = pProp->val.num;
- 	} else if(isProp("iFacility")) {
-		pThis->iFacility = pProp->val.num;
- 	} else if(isProp("msgFlags")) {
-		pThis->msgFlags = pProp->val.num;
- 	} else if(isProp("offMSG")) {
-		MsgSetMSGoffs(pThis, pProp->val.num);
-	} else if(isProp("pszRawMsg")) {
-		MsgSetRawMsg(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr));
-	} else if(isProp("pszTAG")) {
-		MsgSetTAG(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), cstrLen(pProp->val.pStr));
-	} else if(isProp("pszInputName")) {
-		/* we need to create a property */ 
-		CHKiRet(prop.Construct(&myProp));
-		CHKiRet(prop.SetString(myProp, rsCStrGetSzStrNoNULL(pProp->val.pStr), rsCStrLen(pProp->val.pStr)));
-		CHKiRet(prop.ConstructFinalize(myProp));
-		MsgSetInputName(pThis, myProp);
-		prop.Destruct(&myProp);
-	} else if(isProp("pszRcvFromIP")) {
-		MsgSetRcvFromIPStr(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), rsCStrLen(pProp->val.pStr), &propRcvFromIP);
-		prop.Destruct(&propRcvFromIP);
-	} else if(isProp("pszRcvFrom")) {
-		MsgSetRcvFromStr(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), rsCStrLen(pProp->val.pStr), &propRcvFrom);
-		prop.Destruct(&propRcvFrom);
-	} else if(isProp("pszHOSTNAME")) {
-		MsgSetHOSTNAME(pThis, rsCStrGetSzStrNoNULL(pProp->val.pStr), rsCStrLen(pProp->val.pStr));
-	} else if(isProp("pCSStrucData")) {
-		MsgSetStructuredData(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr));
-	} else if(isProp("pCSAPPNAME")) {
-		MsgSetAPPNAME(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr));
-	} else if(isProp("pCSPROCID")) {
-		MsgSetPROCID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr));
-	} else if(isProp("pCSMSGID")) {
-		MsgSetMSGID(pThis, (char*) rsCStrGetSzStrNoNULL(pProp->val.pStr));
- 	} else if(isProp("ttGenTime")) {
-		pThis->ttGenTime = pProp->val.num;
-	} else if(isProp("tRcvdAt")) {
-		memcpy(&pThis->tRcvdAt, &pProp->val.vSyslogTime, sizeof(struct syslogTime));
-	} else if(isProp("tTIMESTAMP")) {
-		memcpy(&pThis->tTIMESTAMP, &pProp->val.vSyslogTime, sizeof(struct syslogTime));
-	} else if(isProp("pszRuleset")) {
-		MsgSetRulesetByName(pThis, pProp->val.pStr);
-	} else if(isProp("json")) {
-		tokener = json_tokener_new();
-		json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pProp->val.pStr),
-					     cstrLen(pProp->val.pStr));
-		json_tokener_free(tokener);
-		msgAddJSON(pThis, (uchar*)"!", json);
-	} else if(isProp("pszMSG")) {
-		dbgprintf("no longer supported property pszMSG silently ignored\n");
-	} else if(isProp("pszUxTradMsg")) {
-		/*IGNORE*/; /* this *was* a property, but does no longer exist */
-	} else {
-		dbgprintf("unknown supported property '%s' silently ignored\n",
-			  rsCStrGetSzStrNoNULL(pProp->pcsName));
-	}
-
-finalize_it:
-	RETiRet;
-}
-#undef	isProp
-
-
 /* This is a construction finalizer that must be called after all properties
  * have been set. It does some final work on the message object. After this
  * is done, the object is considered ready for full processing.
-- 
cgit v1.2.3


From a31321b80dc2221d34a0b170da482e51ac5c1fa3 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 7 Nov 2012 11:04:51 +0100
Subject: bugfix: property tTIMESTAMP was incorrectly restored

in msg deserializer
---
 runtime/msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 34f7ba76..de0ca553 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1213,7 +1213,7 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
 		CHKiRet(objDeserializeProperty(pVar, pStrm));
 	}
 	if(isProp("tTIMESTAMP")) {
-		memcpy(&pMsg->tRcvdAt, &pVar->val.vSyslogTime, sizeof(struct syslogTime));
+		memcpy(&pMsg->tTIMESTAMP, &pVar->val.vSyslogTime, sizeof(struct syslogTime));
 		reinitVar(pVar);
 		CHKiRet(objDeserializeProperty(pVar, pStrm));
 	}
-- 
cgit v1.2.3


From 3352d2c605567c29840cc93a358d60881c865cb7 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 14 Dec 2012 09:20:51 +0100
Subject: minor cleanup

---
 runtime/msg.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index ce863299..86805af1 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1198,6 +1198,7 @@ finalize_it:
 		var.Destruct(&pVar);
 	RETiRet;
 }
+#undef isProp
 
 
 /* Increment reference count - see description of the "msg"
-- 
cgit v1.2.3


From 8339d54ddcbc93771fb6eb550cbf2d9ade988fb8 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Sun, 13 Jan 2013 14:40:17 +0100
Subject: optimize: do date() call in template processing only if actually
 needed

---
 runtime/msg.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 37df5bd0..d16bbb75 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2456,6 +2456,10 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
 		return NULL;
 	}
 
+	if(t->year == 0) { /* not yet set! */
+		datetime.getCurrTime(t, NULL);
+	}
+
 	switch(eNow) {
 	case NOW_NOW:
 		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d-%2.2d-%2.2d", t->year, t->month, t->day);
-- 
cgit v1.2.3


From 262d05999029892e0550459a6361e74fed5a15fc Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 14 Jan 2013 11:49:27 +0100
Subject: optimize msg.c/textpri

remove snprintf() in favor for quicker code
---
 runtime/msg.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index d16bbb75..1ee7dcd8 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -281,9 +281,15 @@ static char *syslog_fac_names[24] = { "kern", "user", "mail", "daemon", "auth",
 			    	      "news", "uucp", "cron", "authpriv", "ftp", "ntp", "audit",
 			    	      "alert", "clock", "local0", "local1", "local2", "local3",
 			    	      "local4", "local5", "local6", "local7" };
+/* length of the facility names string (for optimizatiions) */
+static short len_syslog_fac_names[24] = { 4, 4, 4, 6, 4, 6, 3,
+			    	          4, 4, 4, 8, 3, 3, 5,
+			    	          5, 5, 6, 6, 6, 6,
+			    	          6, 6, 6, 6 };
 
 /* table of severity names (in numerical order)*/
 static char *syslog_severity_names[8] = { "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug" };
+static short len_syslog_severity_names[8] = { 5, 5, 4, 3, 7, 6, 4, 5 };
 
 /* numerical values as string - this is the most efficient approach to convert severity
  * and facility values to a numerical string... -- rgerhars, 2009-06-17
@@ -2420,21 +2426,19 @@ void MsgSetRawMsgWOSize(msg_t *pMsg, char* pszRawMsg)
 
 
 /* Decode a priority into textual information like auth.emerg.
- * The variable pRes must point to a user-supplied buffer and
- * pResLen must contain its size. The pointer to the buffer
+ * The variable pRes must point to a user-supplied buffer.
+ * The pointer to the buffer
  * is also returned, what makes this functiona suitable for
  * use in printf-like functions.
  * Note: a buffer size of 20 characters is always sufficient.
- * Interface to this function changed 2007-06-15 by RGerhards
  */
-char *textpri(char *pRes, size_t pResLen, int pri)
+char *textpri(char *pRes, int pri)
 {
 	assert(pRes != NULL);
-	assert(pResLen > 0);
-
-	snprintf(pRes, pResLen, "%s.%s", syslog_fac_names[LOG_FAC(pri)],
-		 syslog_severity_names[LOG_PRI(pri)]);
-
+	memcpy(pRes, syslog_fac_names[LOG_FAC(pri)], len_syslog_fac_names[LOG_FAC(pri)]);
+	pRes[len_syslog_fac_names[LOG_FAC(pri)]] = '.';
+	memcpy(pRes+len_syslog_fac_names[LOG_FAC(pri)]+1,
+	       syslog_severity_names[LOG_PRI(pri)], len_syslog_severity_names[LOG_PRI(pri)]);
 	return pRes;
 }
 
@@ -2829,7 +2833,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 				RET_OUT_OF_MEMORY;
 			} else {
 				*pbMustBeFreed = 1;
-				pRes = (uchar*)textpri((char*)pBuf, 20, getPRIi(pMsg));
+				pRes = (uchar*)textpri((char*)pBuf, getPRIi(pMsg));
 			}
 			break;
 		case PROP_IUT:
-- 
cgit v1.2.3


From e5b8c0262139270632a34d43bcd41fe6179b014d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 14 Jan 2013 12:08:32 +0100
Subject: optimzize: msg/getNow() - remove snprintf

instead, we use a lookup table for the values.
---
 runtime/msg.c | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 1ee7dcd8..204d338c 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -75,6 +75,18 @@ DEFobjCurrIf(prop)
 DEFobjCurrIf(net)
 DEFobjCurrIf(var)
 
+static char *two_digits[100] = {
+	"00", "01", "02", "03", "04", "05", "06", "07", "08", "09",
+	"10", "11", "12", "13", "14", "15", "16", "17", "18", "19",
+	"20", "21", "22", "23", "24", "25", "26", "27", "28", "29",
+	"30", "31", "32", "33", "34", "35", "36", "37", "38", "39",
+	"40", "41", "42", "43", "44", "45", "46", "47", "48", "49",
+	"50", "51", "52", "53", "54", "55", "56", "57", "58", "59",
+	"60", "61", "62", "63", "64", "65", "66", "67", "68", "69",
+	"70", "71", "72", "73", "74", "75", "76", "77", "78", "79",
+	"80", "81", "82", "83", "84", "85", "86", "87", "88", "89",
+	"90", "91", "92", "93", "94", "95", "96", "97", "98", "99"};
+
 static struct {
 	uchar *pszName;
 	short lenName;
@@ -2466,28 +2478,34 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
 
 	switch(eNow) {
 	case NOW_NOW:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d-%2.2d-%2.2d", t->year, t->month, t->day);
+		memcpy(pBuf, two_digits[t->year/100], 2);
+		memcpy(pBuf+2, two_digits[t->year%100], 2);
+		pBuf[4] = '-';
+		memcpy(pBuf+5, two_digits[(int)t->month], 2);
+		pBuf[7] = '-';
+		memcpy(pBuf+8, two_digits[(int)t->day], 3);
 		break;
 	case NOW_YEAR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%4.4d", t->year);
+		memcpy(pBuf, two_digits[t->year/100], 2);
+		memcpy(pBuf+2, two_digits[t->year%100], 3);
 		break;
 	case NOW_MONTH:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->month);
+		memcpy(pBuf, two_digits[(int)t->month], 3);
 		break;
 	case NOW_DAY:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->day);
+		memcpy(pBuf, two_digits[(int)t->day], 3);
 		break;
 	case NOW_HOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->hour);
+		memcpy(pBuf, two_digits[(int)t->hour], 3);
 		break;
 	case NOW_HHOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute / 30);
+		memcpy(pBuf, two_digits[t->hour/30], 3);
 		break;
 	case NOW_QHOUR:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute / 15);
+		memcpy(pBuf, two_digits[t->hour/15], 3);
 		break;
 	case NOW_MINUTE:
-		snprintf((char*) pBuf, tmpBUFSIZE, "%2.2d", t->minute);
+		memcpy(pBuf, two_digits[(int)t->minute], 3);
 		break;
 	}
 
-- 
cgit v1.2.3


From 47e11d68b2378540a4333d885cb019aad366c46d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 14 Jan 2013 13:44:36 +0100
Subject: optimize: obtaining programname

included some additional refactoring for cleaner code
---
 runtime/msg.c | 91 +++++++++++++++++++----------------------------------------
 1 file changed, 29 insertions(+), 62 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 204d338c..0a19c73b 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -652,6 +652,7 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
 	pM->iRefCount = 1;
 	pM->iSeverity = -1;
 	pM->iFacility = -1;
+	pM->iLenPROGNAME = -1;
 	pM->offAfterPRI = 0;
 	pM->offMSG = -1;
 	pM->iProtocolVersion = 0;
@@ -670,7 +671,6 @@ static inline rsRetVal msgBaseConstruct(msg_t **ppThis)
 	pM->pszTIMESTAMP3339 = NULL;
 	pM->pszTIMESTAMP_MySQL = NULL;
         pM->pszTIMESTAMP_PgSQL = NULL;
-	pM->pCSProgName = NULL;
 	pM->pCSStrucData = NULL;
 	pM->pCSAPPNAME = NULL;
 	pM->pCSPROCID = NULL;
@@ -813,8 +813,8 @@ CODESTARTobjDestruct(msg)
 		free(pThis->pszRcvdAt_PgSQL);
 		free(pThis->pszTIMESTAMP_MySQL);
 		free(pThis->pszTIMESTAMP_PgSQL);
-		if(pThis->pCSProgName != NULL)
-			rsCStrDestruct(&pThis->pCSProgName);
+		if(pThis->iLenPROGNAME >= CONF_PROGNAME_BUFSIZE)
+			free(pThis->PROGNAME.ptr);
 		if(pThis->pCSStrucData != NULL)
 			rsCStrDestruct(&pThis->pCSStrucData);
 		if(pThis->pCSAPPNAME != NULL)
@@ -967,7 +967,6 @@ msg_t* MsgDup(msg_t* pOld)
 		}
 	}
 
-	tmpCOPYCSTR(ProgName);
 	tmpCOPYCSTR(StrucData);
 	tmpCOPYCSTR(APPNAME);
 	tmpCOPYCSTR(PROCID);
@@ -1315,32 +1314,33 @@ finalize_it:
  * The above definition has been taken from the FreeBSD syslogd sources.
  * 
  * The program name is not parsed by default, because it is infrequently-used.
- * If it is needed, this function should be called first. It checks if it is
- * already set and extracts it, if not.
- *
  * IMPORTANT: A locked message object must be provided, else a crash will occur.
  * rgerhards, 2005-10-19
  */
-static rsRetVal aquireProgramName(msg_t *pM)
+static inline rsRetVal
+aquireProgramName(msg_t *pM)
 {
-	register int i;
-	uchar *pszTag;
+	int i;
+	uchar *pszTag, *pszProgName;
 	DEFiRet;
 
 	assert(pM != NULL);
-	if(pM->pCSProgName == NULL) {
-		/* ok, we do not yet have it. So let's parse the TAG to obtain it.  */
-		pszTag = (uchar*) ((pM->iLenTAG < CONF_TAG_BUFSIZE) ? pM->TAG.szBuf : pM->TAG.pszTAG);
-		CHKiRet(cstrConstruct(&pM->pCSProgName));
-		for(  i = 0
-		    ; (i < pM->iLenTAG) && isprint((int) pszTag[i])
-		      && (pszTag[i] != '\0') && (pszTag[i] != ':')
-		      && (pszTag[i] != '[')  && (pszTag[i] != '/')
-		    ; ++i) {
-			CHKiRet(cstrAppendChar(pM->pCSProgName, pszTag[i]));
-		}
-		CHKiRet(cstrFinalize(pM->pCSProgName));
+	pszTag = (uchar*) ((pM->iLenTAG < CONF_TAG_BUFSIZE) ? pM->TAG.szBuf : pM->TAG.pszTAG);
+	for(  i = 0
+	    ; (i < pM->iLenTAG) && isprint((int) pszTag[i])
+	      && (pszTag[i] != '\0') && (pszTag[i] != ':')
+	      && (pszTag[i] != '[')  && (pszTag[i] != '/')
+	    ; ++i)
+		; /* just search end of PROGNAME */
+	if(i < CONF_PROGNAME_BUFSIZE) {
+		pszProgName = pM->PROGNAME.szBuf;
+	} else {
+		CHKmalloc(pM->PROGNAME.ptr = malloc(i+1));
+		pszProgName = pM->PROGNAME.ptr;
 	}
+	memcpy((char*)pszProgName, (char*)pszTag, i);
+	pszProgName[i] = '\0';
+	pM->iLenPROGNAME = i;
 finalize_it:
 	RETiRet;
 }
@@ -2077,53 +2077,20 @@ static inline char *getStructuredData(msg_t *pM)
 	return (char*) pszRet;
 }
 
-/* check if we have a ProgramName, and, if not, try to aquire/emulate it.
- * rgerhards, 2009-06-26
- */
-static inline void prepareProgramName(msg_t *pM, sbool bLockMutex)
-{
-	if(pM->pCSProgName == NULL) {
-		if(bLockMutex == LOCK_MUTEX)
-			MsgLock(pM);
-
-		/* re-query as things might have changed during locking */
-		if(pM->pCSProgName == NULL)
-			aquireProgramName(pM);
-
-		if(bLockMutex == LOCK_MUTEX)
-			MsgUnlock(pM);
-	}
-}
-
-
-/* get the length of the "programname" sz string
- * rgerhards, 2005-10-19
- */
-int getProgramNameLen(msg_t *pM, sbool bLockMutex)
-{
-	assert(pM != NULL);
-	prepareProgramName(pM, bLockMutex);
-	return (pM->pCSProgName == NULL) ? 0 : rsCStrLen(pM->pCSProgName);
-}
-
-
 /* get the "programname" as sz string
  * rgerhards, 2005-10-19
  */
 uchar *getProgramName(msg_t *pM, sbool bLockMutex)
 {
-	uchar *pszRet;
-
-	if(bLockMutex == LOCK_MUTEX)
+	if(pM->iLenPROGNAME == -1 && bLockMutex == LOCK_MUTEX) {
 		MsgLock(pM);
-	prepareProgramName(pM, MUTEX_ALREADY_LOCKED);
-	if(pM->pCSProgName == NULL)
-		pszRet = UCHAR_CONSTANT("");
-	else 
-		pszRet = rsCStrGetSzStrNoNULL(pM->pCSProgName);
-	if(bLockMutex == LOCK_MUTEX)
+		/* need to re-check, things may have change in between! */
+		if(pM->iLenPROGNAME == -1)
+			aquireProgramName(pM);
 		MsgUnlock(pM);
-	return pszRet;
+	}
+	return (pM->iLenPROGNAME < CONF_PROGNAME_BUFSIZE) ? pM->PROGNAME.szBuf
+						       : pM->PROGNAME.ptr;
 }
 
 
-- 
cgit v1.2.3


From c3cc001a4f6c5a10a00091cd9c3d6e90e1a765c4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 15 Jan 2013 12:30:03 +0100
Subject: bugfix: regression from textpri() optimization

---
 runtime/msg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 0a19c73b..390dd565 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2417,7 +2417,8 @@ char *textpri(char *pRes, int pri)
 	memcpy(pRes, syslog_fac_names[LOG_FAC(pri)], len_syslog_fac_names[LOG_FAC(pri)]);
 	pRes[len_syslog_fac_names[LOG_FAC(pri)]] = '.';
 	memcpy(pRes+len_syslog_fac_names[LOG_FAC(pri)]+1,
-	       syslog_severity_names[LOG_PRI(pri)], len_syslog_severity_names[LOG_PRI(pri)]);
+	       syslog_severity_names[LOG_PRI(pri)],
+	       len_syslog_severity_names[LOG_PRI(pri)]+1 /* for \0! */);
 	return pRes;
 }
 
-- 
cgit v1.2.3


From eb5c7a04199028703a328d199c36ac6f5b631ccd Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 18 Jan 2013 14:40:41 +0100
Subject: optimize: reduce nbr of strcpy() in FROMHOST processing

---
 runtime/msg.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 390dd565..0b9e9665 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -362,17 +362,19 @@ resolveDNS(msg_t *pMsg) {
 	prop_t *propFromHost = NULL;
 	prop_t *propFromHostIP = NULL;
 	uchar fromHost[NI_MAXHOST];
-	uchar fromHostIP[NI_MAXHOST];
 	uchar fromHostFQDN[NI_MAXHOST];
+	uchar *fromHostIP;
+	rs_size_t lenIP;
 	DEFiRet;
 
 	MsgLock(pMsg);
 	CHKiRet(objUse(net, CORE_COMPONENT));
 	if(pMsg->msgFlags & NEEDS_DNSRESOL) {
-		localRet = net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN, fromHostIP);
+		localRet = net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN,
+				        &fromHostIP, &lenIP);
 		if(localRet == RS_RET_OK) {
 			MsgSetRcvFromStr(pMsg, fromHost, ustrlen(fromHost), &propFromHost);
-			CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, ustrlen(fromHostIP), &propFromHostIP));
+			CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, lenIP, &propFromHostIP));
 		}
 	}
 finalize_it:
-- 
cgit v1.2.3


From 0d71694fb3cbff71d504769e0e70a58ebe5f9a0d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 24 Jan 2013 06:19:13 +0100
Subject: optimize: have dns cache pre-create rsyslog prop_t's

---
 runtime/msg.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 0b9e9665..3ead8c93 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -360,21 +360,19 @@ static inline rsRetVal
 resolveDNS(msg_t *pMsg) {
 	rsRetVal localRet;
 	prop_t *propFromHost = NULL;
-	prop_t *propFromHostIP = NULL;
+	prop_t *ip;
 	uchar fromHost[NI_MAXHOST];
 	uchar fromHostFQDN[NI_MAXHOST];
-	uchar *fromHostIP;
-	rs_size_t lenIP;
 	DEFiRet;
 
 	MsgLock(pMsg);
 	CHKiRet(objUse(net, CORE_COMPONENT));
 	if(pMsg->msgFlags & NEEDS_DNSRESOL) {
 		localRet = net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN,
-				        &fromHostIP, &lenIP);
+				        &ip);
 		if(localRet == RS_RET_OK) {
 			MsgSetRcvFromStr(pMsg, fromHost, ustrlen(fromHost), &propFromHost);
-			CHKiRet(MsgSetRcvFromIPStr(pMsg, fromHostIP, lenIP, &propFromHostIP));
+			CHKiRet(MsgSetRcvFromIP(pMsg, ip));
 		}
 	}
 finalize_it:
@@ -386,8 +384,6 @@ finalize_it:
 	MsgUnlock(pMsg);
 	if(propFromHost != NULL)
 		prop.Destruct(&propFromHost);
-	if(propFromHostIP != NULL)
-		prop.Destruct(&propFromHostIP);
 	RETiRet;
 }
 
-- 
cgit v1.2.3


From 2cde5ec4769f203e59413f8152008c712913bbf0 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 24 Jan 2013 06:36:42 +0100
Subject: regression fix: programname was not properly handled

Regression from recent refactoring - never released.
---
 runtime/msg.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 0b9e9665..98600cdd 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -7,7 +7,7 @@
  * of the "old" message code without any modifications. However, it
  * helps to have things at the right place one we go to the meat of it.
  *
- * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH.
+ * Copyright 2007-2013 Rainer Gerhards and Adiscon GmbH.
  *
  * This file is part of the rsyslog runtime library.
  *
@@ -2084,12 +2084,16 @@ static inline char *getStructuredData(msg_t *pM)
  */
 uchar *getProgramName(msg_t *pM, sbool bLockMutex)
 {
-	if(pM->iLenPROGNAME == -1 && bLockMutex == LOCK_MUTEX) {
-		MsgLock(pM);
-		/* need to re-check, things may have change in between! */
-		if(pM->iLenPROGNAME == -1)
+	if(pM->iLenPROGNAME == -1) {
+		if(bLockMutex == LOCK_MUTEX) {
+			MsgLock(pM);
+			/* need to re-check, things may have change in between! */
+			if(pM->iLenPROGNAME == -1)
+				aquireProgramName(pM);
+			MsgUnlock(pM);
+		} else {
 			aquireProgramName(pM);
-		MsgUnlock(pM);
+		}
 	}
 	return (pM->iLenPROGNAME < CONF_PROGNAME_BUFSIZE) ? pM->PROGNAME.szBuf
 						       : pM->PROGNAME.ptr;
-- 
cgit v1.2.3


From 35bec820b601bfcf9eff314fbfc718bb8949bda1 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 22 Jan 2013 16:55:21 +0100
Subject: optimze: reduce memory operations during dns resolution/hostname
 setting

previously, hostname and ip strings were shuffled to the msg object, which
created a property out of them. Now the cache holds the property, and it
is resused (almost) everywhere, what saves a lot of memory operations.

The only exception is imtcp session setup, where different handling
of the hostname is done, which we need to sort out (but that's another
story).
---
 runtime/msg.c | 58 ++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 20 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 86c2e68c..68577ad0 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -337,6 +337,37 @@ MsgUnlock(msg_t *pThis)
 }
 
 
+/* set RcvFromIP name in msg object WITHOUT calling AddRef.
+ * rgerhards, 2013-01-22
+ */
+static inline void
+MsgSetRcvFromIPWithoutAddRef(msg_t *pThis, prop_t *new)
+{
+	if(pThis->pRcvFromIP != NULL)
+		prop.Destruct(&pThis->pRcvFromIP);
+	pThis->pRcvFromIP = new;
+}
+
+
+/* set RcvFrom name in msg object WITHOUT calling AddRef.
+ * rgerhards, 2013-01-22
+ */
+void MsgSetRcvFromWithoutAddRef(msg_t *pThis, prop_t *new)
+{
+	assert(pThis != NULL);
+
+	if(pThis->msgFlags & NEEDS_DNSRESOL) {
+		if(pThis->rcvFrom.pfrominet != NULL)
+			free(pThis->rcvFrom.pfrominet);
+		pThis->msgFlags &= ~NEEDS_DNSRESOL;
+	} else {
+		if(pThis->rcvFrom.pRcvFrom != NULL)
+			prop.Destruct(&pThis->rcvFrom.pRcvFrom);
+	}
+	pThis->rcvFrom.pRcvFrom = new;
+}
+
+
 /* rgerhards 2012-04-18: set associated ruleset (by ruleset name)
  * If ruleset cannot be found, no update is done.
  */
@@ -361,18 +392,17 @@ resolveDNS(msg_t *pMsg) {
 	rsRetVal localRet;
 	prop_t *propFromHost = NULL;
 	prop_t *ip;
-	uchar fromHost[NI_MAXHOST];
-	uchar fromHostFQDN[NI_MAXHOST];
+	prop_t *localName;
 	DEFiRet;
 
 	MsgLock(pMsg);
 	CHKiRet(objUse(net, CORE_COMPONENT));
 	if(pMsg->msgFlags & NEEDS_DNSRESOL) {
-		localRet = net.cvthname(pMsg->rcvFrom.pfrominet, fromHost, fromHostFQDN,
-				        &ip);
+		localRet = net.cvthname(pMsg->rcvFrom.pfrominet, &localName, NULL, &ip);
 		if(localRet == RS_RET_OK) {
-			MsgSetRcvFromStr(pMsg, fromHost, ustrlen(fromHost), &propFromHost);
-			CHKiRet(MsgSetRcvFromIP(pMsg, ip));
+			/* we pass down the props, so no need for AddRef */
+			MsgSetRcvFromWithoutAddRef(pMsg, localName);
+			MsgSetRcvFromIPWithoutAddRef(pMsg, ip);
 		}
 	}
 finalize_it:
@@ -2207,18 +2237,8 @@ finalize_it:
  */
 void MsgSetRcvFrom(msg_t *pThis, prop_t *new)
 {
-	assert(pThis != NULL);
-
 	prop.AddRef(new);
-	if(pThis->msgFlags & NEEDS_DNSRESOL) {
-		if(pThis->rcvFrom.pfrominet != NULL)
-		free(pThis->rcvFrom.pfrominet);
-		pThis->msgFlags &= ~NEEDS_DNSRESOL;
-	} else {
-		if(pThis->rcvFrom.pRcvFrom != NULL)
-			prop.Destruct(&pThis->rcvFrom.pRcvFrom);
-	}
-	pThis->rcvFrom.pRcvFrom = new;
+	MsgSetRcvFromWithoutAddRef(pThis, new);
 }
 
 
@@ -2251,9 +2271,7 @@ rsRetVal MsgSetRcvFromIP(msg_t *pThis, prop_t *new)
 
 	BEGINfunc
 	prop.AddRef(new);
-	if(pThis->pRcvFromIP != NULL)
-		prop.Destruct(&pThis->pRcvFromIP);
-	pThis->pRcvFromIP = new;
+	MsgSetRcvFromIPWithoutAddRef(pThis, new);
 	ENDfunc
 	return RS_RET_OK;
 }
-- 
cgit v1.2.3


From a6aa2b75ee9da97a6d2d98701af8bff01064afe4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 4 Mar 2013 12:59:53 +0100
Subject: mmanon: complete ipv4 functionality

---
 runtime/msg.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 68577ad0..c302a050 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1468,6 +1468,14 @@ getRawMsg(msg_t *pM, uchar **pBuf, int *piLen)
 }
 
 
+/* note: setMSGLen() is only for friends who really know what they
+ * do. Setting an invalid length can be desasterous!
+ */
+void setMSGLen(msg_t *pM, int lenMsg)
+{
+	pM->iLenMSG = lenMsg;
+}
+
 int getMSGLen(msg_t *pM)
 {
 	return((pM == NULL) ? 0 : pM->iLenMSG);
-- 
cgit v1.2.3


From 474877b9d7912a3d2abc2a350dbc41e4c3b050e4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 29 Mar 2013 16:04:21 +0100
Subject: permit substring extraction relative to end-of-string in templates

---
 runtime/msg.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 32a02424..9afd46cf 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3017,13 +3017,20 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 		uchar *pSb;
 		iFrom = pTpe->data.field.iFromPos;
 		iTo = pTpe->data.field.iToPos;
-		/* need to zero-base to and from (they are 1-based!) */
-		if(iFrom > 0)
-			--iFrom;
-		if(iTo > 0)
-			--iTo;
 		if(bufLen == -1)
 			bufLen = ustrlen(pRes);
+dbgprintf("DDDD: orginal iFrom %u, iTo %u, len %u\n", iFrom, iTo, bufLen);
+		if(pTpe->data.field.options.bFromPosEndRelative) {
+			iFrom = (bufLen < iFrom) ? 0 : bufLen - iFrom;
+			iTo = (bufLen < iTo)? 0 : bufLen - iTo;
+dbgprintf("DDDD: now iFrom %u, iTo %u\n", iFrom, iTo);
+		} else {
+			/* need to zero-base to and from (they are 1-based!) */
+			if(iFrom > 0)
+				--iFrom;
+			if(iTo > 0)
+				--iTo;
+		}
 		if(iFrom == 0 && iTo >=  bufLen) { 
 			/* in this case, the requested string is a superset of what we already have,
 			 * so there is no need to do any processing. This is a frequent case for size-limited
-- 
cgit v1.2.3


From f6da383e1c9d3ccfc5742d972c23dc3c718a0b88 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 29 Mar 2013 16:10:50 +0100
Subject: cleanup

---
 runtime/msg.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 1e61e632..a5c52810 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -3232,11 +3232,9 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 		iTo = pTpe->data.field.iToPos;
 		if(bufLen == -1)
 			bufLen = ustrlen(pRes);
-dbgprintf("DDDD: orginal iFrom %u, iTo %u, len %u\n", iFrom, iTo, bufLen);
 		if(pTpe->data.field.options.bFromPosEndRelative) {
 			iFrom = (bufLen < iFrom) ? 0 : bufLen - iFrom;
 			iTo = (bufLen < iTo)? 0 : bufLen - iTo;
-dbgprintf("DDDD: now iFrom %u, iTo %u\n", iFrom, iTo);
 		} else {
 			/* need to zero-base to and from (they are 1-based!) */
 			if(iFrom > 0)
-- 
cgit v1.2.3


From aa2408f825cd46091af0a8976dc2c14b1b797206 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 24 Jun 2013 12:18:40 +0200
Subject: $uptime property: fix mem leak and build problems on FreeBSD

---
 runtime/msg.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index a5c52810..8c50b7b3 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2989,15 +2989,39 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			break;
 		case PROP_SYS_UPTIME:
 #			ifndef HAVE_SYSINFO_UPTIME
-            /* An alternative on some systems (eg Solaris) is to scan
-             * /var/adm/utmpx for last boot time.
-             */
+			/* An alternative on some systems (eg Solaris) is to scan
+			* /var/adm/utmpx for last boot time.
+			*/
 			pRes = (uchar*) "UPTIME NOT available on this system";
 			*pbMustBeFreed = 0;
+
+#			elseif defined(__FreeBSD__)
+
+			{
+			struct timespec tp;
+
+			if(*pbMustBeFreed == 1)
+				free(pRes);
+			if((pRes = (uchar*) MALLOC(sizeof(uchar) * 32)) == NULL) {
+				RET_OUT_OF_MEMORY;
+			}
+			*pbMustBeFreed = 1;
+ 
+			if(clock_gettime(CLOCK_UPTIME, &tp) == -1) {
+ 				*pPropLen = sizeof("**SYSCALL FAILED**") - 1;
+ 				return(UCHAR_CONSTANT("**SYSCALL FAILED**"));
+ 			}
+ 
+			snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", tp.tv_sec);
+ 			}
+
 #			else
+
 			{
 			struct sysinfo s_info;
 
+			if(*pbMustBeFreed == 1)
+				free(pRes);
 			if((pRes = (uchar*) MALLOC(sizeof(uchar) * 32)) == NULL) {
 				RET_OUT_OF_MEMORY;
 			}
-- 
cgit v1.2.3


From 5941ce7720393d28f04fac817ebcd21936c1ec8d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 25 Jun 2013 10:05:19 +0200
Subject: build: fix issues on FreeBSD

The last fix was incomplete. Thanks to Christiano for testing
and suggestions.
---
 runtime/msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 8c50b7b3..9d5fa883 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2995,7 +2995,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe,
 			pRes = (uchar*) "UPTIME NOT available on this system";
 			*pbMustBeFreed = 0;
 
-#			elseif defined(__FreeBSD__)
+#			elif defined(__FreeBSD__)
 
 			{
 			struct timespec tp;
-- 
cgit v1.2.3


From b6d843ab50b4a84beebfc3474cc8b1b1dabc6f26 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 17 Jul 2013 12:52:47 +0200
Subject: bugfix: CEE/json data was lost during disk queue operation

---
 runtime/msg.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 9d5fa883..9d8bc0f6 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1113,7 +1113,6 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
 	prop_t *propRcvFrom = NULL;
 	prop_t *propRcvFromIP = NULL;
 	struct json_tokener *tokener;
-	struct json_object *json;
 	var_t *pVar = NULL;
 	DEFiRet;
 
@@ -1197,7 +1196,7 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
 	}
 	if(isProp("json")) {
 		tokener = json_tokener_new();
-		json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr),
+		pMsg->json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr),
 					     cstrLen(pVar->val.pStr));
 		reinitVar(pVar);
 		CHKiRet(objDeserializeProperty(pVar, pStrm));
-- 
cgit v1.2.3


From 44699a0d15f57e3d9e1408dc802a78d286f7813d Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 17 Jul 2013 13:28:17 +0200
Subject: bugfix: memory leak if disk queues were used and json data present

---
 runtime/msg.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 9d8bc0f6..a227567e 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -1198,6 +1198,7 @@ MsgDeserialize(msg_t *pMsg, strm_t *pStrm)
 		tokener = json_tokener_new();
 		pMsg->json = json_tokener_parse_ex(tokener, (char*)rsCStrGetSzStrNoNULL(pVar->val.pStr),
 					     cstrLen(pVar->val.pStr));
+		json_tokener_free(tokener);
 		reinitVar(pVar);
 		CHKiRet(objDeserializeProperty(pVar, pStrm));
 	}
-- 
cgit v1.2.3


From e53c387e765011b71ea7de61addab4d5b1bb36d2 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 19 Jul 2013 11:28:13 +0200
Subject: bugfix: $QHOUR/$HHOUR were always "00" or "01"

regression some time between v5 and here
Thanks to forum user rjmcinty for reporting this bug
---
 runtime/msg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index a227567e..67d957d1 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -2495,10 +2495,10 @@ static uchar *getNOW(eNOWType eNow, struct syslogTime *t)
 		memcpy(pBuf, two_digits[(int)t->hour], 3);
 		break;
 	case NOW_HHOUR:
-		memcpy(pBuf, two_digits[t->hour/30], 3);
+		memcpy(pBuf, two_digits[t->minute/30], 3);
 		break;
 	case NOW_QHOUR:
-		memcpy(pBuf, two_digits[t->hour/15], 3);
+		memcpy(pBuf, two_digits[t->minute/15], 3);
 		break;
 	case NOW_MINUTE:
 		memcpy(pBuf, two_digits[(int)t->minute], 3);
-- 
cgit v1.2.3


From 1c71b9628b08cfe867f94a7f35e6bd74db5a9673 Mon Sep 17 00:00:00 2001
From: hwoarang <hwoarang@gentoo.org>
Date: Tue, 3 Sep 2013 11:38:01 +0200
Subject: make rsyslog use the new json-c pkgconfig file if available

---
 runtime/msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 67d957d1..36cbd261 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -41,7 +41,7 @@
 #endif
 #include <netdb.h>
 #include <libestr.h>
-#include <json/json.h>
+#include <json.h>
 /* For struct json_object_iter, should not be necessary in future versions */
 #include <json/json_object_private.h>
 #if HAVE_MALLOC_H
-- 
cgit v1.2.3


From dd9bdb5566c56a2bb67b09a67410b16e29004568 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 4 Sep 2013 10:07:16 +0200
Subject: bugfix: some more build problems with newer json-c versions

Thanks to Michael Biebl for mentioning the problem.
---
 runtime/msg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'runtime/msg.c')

diff --git a/runtime/msg.c b/runtime/msg.c
index 36cbd261..03906070 100644
--- a/runtime/msg.c
+++ b/runtime/msg.c
@@ -43,7 +43,7 @@
 #include <libestr.h>
 #include <json.h>
 /* For struct json_object_iter, should not be necessary in future versions */
-#include <json/json_object_private.h>
+#include <json_object_private.h>
 #if HAVE_MALLOC_H
 #  include <malloc.h>
 #endif
-- 
cgit v1.2.3