diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 13:27:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-03 13:27:27 +0100 |
| commit | c28d92259b27eebca3892b9ad18d467691e5aacc (patch) | |
| tree | a6dd9a87131aa17f8b82d2285691bc196118f49a /runtime/queue.c | |
| parent | f88d4f76f69f52918726eb91a2ce06a163cbf0c6 (diff) | |
| download | rsyslog-c28d92259b27eebca3892b9ad18d467691e5aacc.tar.gz rsyslog-c28d92259b27eebca3892b9ad18d467691e5aacc.tar.bz2 rsyslog-c28d92259b27eebca3892b9ad18d467691e5aacc.zip | |
queue: use specific deserializer for msg object
spares lengthy table lookups
Diffstat (limited to 'runtime/queue.c')
| -rw-r--r-- | runtime/queue.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/runtime/queue.c b/runtime/queue.c index bdca61eb..c42b18ad 100644 --- a/runtime/queue.c +++ b/runtime/queue.c @@ -59,7 +59,6 @@ #include "datetime.h" #include "unicode-helper.h" #include "statsobj.h" -#include "msg.h" /* TODO: remove once we remove MsgAddRef() call */ #ifdef OS_SOLARIS # include <sched.h> @@ -919,7 +918,7 @@ finalize_it: static rsRetVal qDeqDisk(qqueue_t *pThis, msg_t **ppMsg) { DEFiRet; - iRet = obj.Deserialize(ppMsg, (uchar*) "msg", pThis->tVars.disk.pReadDeq, NULL, NULL); + iRet = objDeserializeWithMethods(ppMsg, (uchar*) "msg", pThis->tVars.disk.pReadDeq, NULL, NULL, msgConstruct, msgConstructFinalizer, MsgSetProperty); RETiRet; } @@ -933,7 +932,7 @@ static rsRetVal qDelDisk(qqueue_t *pThis) int64 offsOut; CHKiRet(strm.GetCurrOffset(pThis->tVars.disk.pReadDel, &offsIn)); - CHKiRet(obj.Deserialize(&pDummyObj, (uchar*) "msg", pThis->tVars.disk.pReadDel, NULL, NULL)); + CHKiRet(objDeserializeWithMethods(&pDummyObj, (uchar*) "msg", pThis->tVars.disk.pReadDel, NULL, NULL, msgConstruct, msgConstructFinalizer, MsgSetProperty)); objDestruct(pDummyObj); CHKiRet(strm.GetCurrOffset(pThis->tVars.disk.pReadDel, &offsOut)); |