|
@@ -16164,14 +16164,6 @@ public:
|
|
|
{
|
|
|
}
|
|
|
|
|
|
- virtual void stop()
|
|
|
- {
|
|
|
- ForEachItemIn(i2, selectedStreams)
|
|
|
- selectedStreams.item(i2)->stop();
|
|
|
-
|
|
|
- CRoxieServerMultiInputBaseActivity::stop();
|
|
|
- }
|
|
|
-
|
|
|
virtual unsigned __int64 queryLocalCycles() const
|
|
|
{
|
|
|
__int64 localCycles = totalCycles.totalCycles;
|
|
@@ -16285,14 +16277,11 @@ public:
|
|
|
selectedJunctions.append(junctionArray[nextIndex-1]);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
// NB: Whatever pulls this nwayinput activity, starts and stops the selectedInputs and selectedJunctions
|
|
|
+ // But the N-Way input itself is now done with processing, and can stop itself/dependencies.
|
|
|
+ stop();
|
|
|
}
|
|
|
|
|
|
- virtual void stop()
|
|
|
- {
|
|
|
- // NB: Whatever pulls this nwayinput activity, starts and stops the selectedInputs
|
|
|
- }
|
|
|
};
|
|
|
|
|
|
class CRoxieServerNWayInputActivityFactory : public CRoxieServerMultiInputFactory
|
|
@@ -16364,6 +16353,8 @@ public:
|
|
|
selectedJunctions.append(resultJunctions[i]);
|
|
|
}
|
|
|
}
|
|
|
+ // I have done with my processing - note that this won't stop my inputs
|
|
|
+ stop();
|
|
|
}
|
|
|
|
|
|
virtual void reset()
|