refactor: remove no longer needed elements from batch_t

2 files changed, 1 insertions, 5 deletions

diff --git a/runtime/batch.h b/runtime/batch.h
index a7f62aa4..e8268b1c 100644
--- a/runtime/batch.h
+++ b/runtime/batch.h
@@ -69,7 +69,6 @@ struct batch_s {
 	int iDoneUpTo;		/* all messages below this index have state other than RDY */
 	qDeqID	deqID;		/* ID of dequeue operation that generated this batch */
 	int *pbShutdownImmediate;/* end processing of this batch immediately if set to 1 */
-	sbool *active;		/* which messages are active for processing, NULL=all */
 	batch_obj_t *pElem;	/* batch elements */
 	batch_state_t *eltState;/* state (array!) for individual objects.
 	   			   NOTE: we have moved this out of batch_obj_t because we
@@ -104,8 +103,7 @@ batchSetElemState(batch_t *pBatch, int i, batch_state_t newState) {
  */
 static inline int
 batchIsValidElem(batch_t *pBatch, int i) {
-	return(   (pBatch->eltState[i] != BATCH_STATE_DISC)
-	       && (pBatch->active == NULL || pBatch->active[i]));
+	return(pBatch->eltState[i] != BATCH_STATE_DISC);
 }
 
 
diff --git a/runtime/queue.c b/runtime/queue.c
index 93661e41..18f62ffa 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -964,7 +964,6 @@ static rsRetVal qAddDirect(qqueue_t *pThis, msg_t* pMsg, wti_t *pWti)
 	batch_t singleBatch;
 	batch_obj_t batchObj;
 	batch_state_t batchState = BATCH_STATE_RDY;
-	sbool active = 1;
 	int i;
 	DEFiRet;
 
@@ -985,7 +984,6 @@ static rsRetVal qAddDirect(qqueue_t *pThis, msg_t* pMsg, wti_t *pWti)
 	singleBatch.nElem = 1; /* there always is only one in direct mode */
 	singleBatch.pElem = &batchObj;
 	singleBatch.eltState = &batchState;
-	singleBatch.active = &active;
 	iRet = pThis->pConsumer(pThis->pAction, &singleBatch, pWti, &pThis->bShutdownImmediate);
 	msgDestruct(&pMsg);