1 files changed, 44 insertions, 9 deletions

diff --git a/runtime/vmop.c b/runtime/vmop.c
index a343481e..3e001d27 100644
--- a/runtime/vmop.c
+++ b/runtime/vmop.c
@@ -32,10 +32,12 @@
 #include "rsyslog.h"
 #include "obj.h"
 #include "vmop.h"
+#include "vm.h"
 
 /* static data */
 DEFobjStaticHelpers
 DEFobjCurrIf(var)
+DEFobjCurrIf(vm)
 
 
 /* forward definitions */
@@ -61,8 +63,10 @@ rsRetVal vmopConstructFinalize(vmop_t __attribute__((unused)) *pThis)
 /* destructor for the vmop object */
 BEGINobjDestruct(vmop) /* be sure to specify the object type also in END and CODESTART macros! */
 CODESTARTobjDestruct(vmop)
-	if(pThis->operand.pVar != NULL)
-		var.Destruct(&pThis->operand.pVar);
+	if(pThis->opcode != opcode_FUNC_CALL) {
+		if(pThis->operand.pVar != NULL)
+			var.Destruct(&pThis->operand.pVar);
+	}
 ENDobjDestruct(vmop)
 
 
@@ -72,13 +76,19 @@ BEGINobjDebugPrint(vmop) /* be sure to specify the object type also in END and C
 	cstr_t *pStrVar;
 CODESTARTobjDebugPrint(vmop)
 	vmopOpcode2Str(pThis, &pOpcodeName);
-	CHKiRet(rsCStrConstruct(&pStrVar));
-	CHKiRet(rsCStrFinish(&pStrVar));
-	if(pThis->operand.pVar != NULL) {
-		CHKiRet(var.Obj2Str(pThis->operand.pVar, pStrVar));
+	if(pThis->opcode == opcode_FUNC_CALL) {
+		CHKiRet(vm.FindRSFunctionName(pThis->operand.rsf, &pStrVar));
+		assert(pStrVar != NULL);
+	} else {
+		CHKiRet(rsCStrConstruct(&pStrVar));
+		if(pThis->operand.pVar != NULL) {
+			CHKiRet(var.Obj2Str(pThis->operand.pVar, pStrVar));
+		}
 	}
+	CHKiRet(rsCStrFinish(&pStrVar));
 	dbgoprint((obj_t*) pThis, "%.12s\t%s\n", pOpcodeName, rsCStrGetSzStrNoNULL(pStrVar));
-	rsCStrDestruct(&pStrVar);
+	if(pThis->opcode != opcode_FUNC_CALL)
+		rsCStrDestruct(&pStrVar);
 finalize_it:
 ENDobjDebugPrint(vmop)
 
@@ -98,6 +108,7 @@ static rsRetVal
 Obj2Str(vmop_t *pThis, cstr_t *pstrPrg)
 {
 	uchar *pOpcodeName;
+	cstr_t *pcsFuncName;
 	uchar szBuf[2048];
 	size_t lenBuf;
 	DEFiRet;
@@ -107,8 +118,13 @@ Obj2Str(vmop_t *pThis, cstr_t *pstrPrg)
 	vmopOpcode2Str(pThis, &pOpcodeName);
 	lenBuf = snprintf((char*) szBuf, sizeof(szBuf), "%s\t", pOpcodeName);
 	CHKiRet(rsCStrAppendStrWithLen(pstrPrg, szBuf, lenBuf));
-	if(pThis->operand.pVar != NULL)
-		CHKiRet(var.Obj2Str(pThis->operand.pVar, pstrPrg));
+	if(pThis->opcode == opcode_FUNC_CALL) {
+		CHKiRet(vm.FindRSFunctionName(pThis->operand.rsf, &pcsFuncName));
+		CHKiRet(rsCStrAppendCStr(pstrPrg, pcsFuncName));
+	} else {
+		if(pThis->operand.pVar != NULL)
+			CHKiRet(var.Obj2Str(pThis->operand.pVar, pstrPrg));
+	}
 	CHKiRet(rsCStrAppendChar(pstrPrg, '\n'));
 
 finalize_it:
@@ -116,6 +132,23 @@ finalize_it:
 }
 
 
+/* set function
+ * rgerhards, 2009-04-06
+ */
+static rsRetVal
+vmopSetFunc(vmop_t *pThis, cstr_t *pcsFuncName)
+{
+	prsf_t rsf;	/* pointer to function */
+	DEFiRet;
+	ISOBJ_TYPE_assert(pThis, vmop);
+	CHKiRet(vm.FindRSFunction(pcsFuncName, &rsf)); /* check if function exists and obtain pointer to it */
+	assert(rsf != NULL);	/* just double-check, would be very hard to find! */
+	pThis->operand.rsf = rsf;
+finalize_it:
+	RETiRet;
+}
+
+
 /* set operand (variant case)
  * rgerhards, 2008-02-20
  */
@@ -248,6 +281,7 @@ CODESTARTobjQueryInterface(vmop)
 	pIf->ConstructFinalize = vmopConstructFinalize;
 	pIf->Destruct = vmopDestruct;
 	pIf->DebugPrint = vmopDebugPrint;
+	pIf->SetFunc = vmopSetFunc;
 	pIf->SetOpcode = vmopSetOpcode;
 	pIf->SetVar = vmopSetVar;
 	pIf->Opcode2Str = vmopOpcode2Str;
@@ -263,6 +297,7 @@ ENDobjQueryInterface(vmop)
 BEGINObjClassInit(vmop, 1, OBJ_IS_CORE_MODULE) /* class, version */
 	/* request objects we use */
 	CHKiRet(objUse(var, CORE_COMPONENT));
+	CHKiRet(objUse(vm, CORE_COMPONENT));
 
 	OBJSetMethodHandler(objMethod_DEBUGPRINT, vmopDebugPrint);
 	OBJSetMethodHandler(objMethod_CONSTRUCTION_FINALIZER, vmopConstructFinalize);