diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-19 16:53:05 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-19 16:53:05 +0100 |
| commit | 014c1818e6d103342199157c341d609741a24f42 (patch) | |
| tree | d379234786d380e59a768f97615d46273923d358 /runtime/queue.h | |
| parent | eb659a82ded377db65c3878d7170b7be1542d926 (diff) | |
| parent | c563914d6f96efc1c4da02a7f49409297b20f656 (diff) | |
| download | rsyslog-014c1818e6d103342199157c341d609741a24f42.tar.gz rsyslog-014c1818e6d103342199157c341d609741a24f42.tar.bz2 rsyslog-014c1818e6d103342199157c341d609741a24f42.zip | |
Merge branch 'master-newqueue'
Diffstat (limited to 'runtime/queue.h')
| -rw-r--r-- | runtime/queue.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/queue.h b/runtime/queue.h index e6ccdcdb..7db2d90d 100644 --- a/runtime/queue.h +++ b/runtime/queue.h @@ -147,7 +147,8 @@ struct queue_s { struct queue_s *pqParent;/* pointer to the parent (if this is a child queue) */ int bDAEnqOnly; /* EnqOnly setting for DA queue */ /* now follow queueing mode specific data elements */ - union { /* different data elements based on queue type (qType) */ + //union { /* different data elements based on queue type (qType) */ + struct { /* different data elements based on queue type (qType) */ struct { long deqhead, head, tail; void** pBuf; /* the queued user data structure */ @@ -159,7 +160,9 @@ struct queue_s { } linklist; struct { int64 sizeOnDisk; /* current amount of disk space used */ - int64 bytesRead; /* number of bytes read from current (undeleted!) file */ + int64 deqOffs; /* offset after dequeue batch - used for file deleter */ + int deqFileNumIn; /* same for the circular file numbers, mainly for */ + int deqFileNumOut;/* deleting finished files */ strm_t *pWrite; /* current file to be written */ strm_t *pReadDeq; /* current file for dequeueing */ strm_t *pReadDel; /* current file for deleting */ |