From 61f643b080234115a0d3cfc1323ff29f8a33f23e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Mon, 12 Oct 2009 17:29:47 +0200
Subject: enhanced immark to support non-cancel input module termination

---
 plugins/immark/immark.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'plugins/immark/immark.c')

diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c
index 8504f872..19f43456 100644
--- a/plugins/immark/immark.c
+++ b/plugins/immark/immark.c
@@ -42,6 +42,7 @@
 #include "module-template.h"
 #include "errmsg.h"
 #include "msg.h"
+#include "glbl.h"
 
 MODULE_TYPE_INPUT
 
@@ -50,8 +51,16 @@ MODULE_TYPE_INPUT
 
 /* Module static data */
 DEF_IMOD_STATIC_DATA
+DEFobjCurrIf(glbl)
 static int iMarkMessagePeriod = DEFAULT_MARK_PERIOD;
 
+BEGINisCompatibleWithFeature
+CODESTARTisCompatibleWithFeature
+	if(eFeat == sFEATURENonCancelInputTermination)
+		iRet = RS_RET_OK;
+ENDisCompatibleWithFeature
+
+
 /* This function is called to gather input. It must terminate only
  * a) on failure (iRet set accordingly)
  * b) on termination of the input module (as part of the unload process)
@@ -77,6 +86,10 @@ CODESTARTrunInput
 	   	 * rgerhards, 2007-12-17
 	   	 */
 		CHKiRet(thrdSleep(pThrd, iMarkMessagePeriod, 0)); /* seconds, micro seconds */
+
+		if(glbl.GetGlobalInputTermState() == 1)
+			break; /* terminate input! */
+
 		logmsgInternal(NO_ERRCODE, LOG_INFO, (uchar*)"-- MARK --", MARK);
 	}
 finalize_it:
@@ -106,6 +119,7 @@ ENDmodExit
 BEGINqueryEtryPt
 CODESTARTqueryEtryPt
 CODEqueryEtryPt_STD_IMOD_QUERIES
+CODEqueryEtryPt_IsCompatibleWithFeature_IF_OMOD_QUERIES
 ENDqueryEtryPt
 
 static rsRetVal resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unused)) *pVal)
@@ -119,9 +133,9 @@ BEGINmodInit()
 CODESTARTmodInit
 	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
 CODEmodInit_QueryRegCFSLineHdlr
+	CHKiRet(objUse(glbl, CORE_COMPONENT));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"markmessageperiod", 0, eCmdHdlrInt, NULL, &iMarkMessagePeriod, STD_LOADABLE_MODULE_ID));
 	CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler, resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
 ENDmodInit
-/*
- * vi:set ai:
+/* vi:set ai:
  */
-- 
cgit v1.2.3


From e005c5569c3e0c7c9a098036b7ec3596c3c722b4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Fri, 16 Oct 2009 09:42:36 +0200
Subject: some minor cleanup,  consolidated some code

---
 plugins/immark/immark.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'plugins/immark/immark.c')

diff --git a/plugins/immark/immark.c b/plugins/immark/immark.c
index 19f43456..5d48369e 100644
--- a/plugins/immark/immark.c
+++ b/plugins/immark/immark.c
@@ -42,6 +42,7 @@
 #include "module-template.h"
 #include "errmsg.h"
 #include "msg.h"
+#include "srUtils.h"
 #include "glbl.h"
 
 MODULE_TYPE_INPUT
@@ -80,20 +81,13 @@ CODESTARTrunInput
 	 * right into the sleep below.
 	 */
 	while(1) {
-		/* we do not need to handle the RS_RET_TERMINATE_NOW case any
-	   	 * special because we just need to terminate. This may be different
-	   	 * if a cleanup is needed. But for now, we can just use CHKiRet().
-	   	 * rgerhards, 2007-12-17
-	   	 */
-		CHKiRet(thrdSleep(pThrd, iMarkMessagePeriod, 0)); /* seconds, micro seconds */
+		srSleep(iMarkMessagePeriod, 0); /* seconds, micro seconds */
 
 		if(glbl.GetGlobalInputTermState() == 1)
 			break; /* terminate input! */
 
 		logmsgInternal(NO_ERRCODE, LOG_INFO, (uchar*)"-- MARK --", MARK);
 	}
-finalize_it:
-	return iRet;
 ENDrunInput
 
 
-- 
cgit v1.2.3