diff --git a/roxie/ccd/ccd.hpp b/roxie/ccd/ccd.hpp index 0b0c8bc9349..f8d3c0ae9a7 100644 --- a/roxie/ccd/ccd.hpp +++ b/roxie/ccd/ccd.hpp @@ -102,8 +102,6 @@ void setMulticastEndpoints(unsigned numChannels); #define SUBCHANNEL_BITS 2 // allows for up to 7-way redundancy in a 16-bit short retries flag, high bits used for indicators/flags #define MAX_SUBCHANNEL 7 // (16-2) / SUBCHANNEL_BITS -//#define TIME_PACKETS - #define ROXIE_FASTLANE 0x8000u // mask in retries indicating agent reply goes on the fast queue #define ROXIE_BROADCAST 0x4000u // mask in retries indicating original request was a broadcast #define ROXIE_RETRIES_MASK (~(ROXIE_FASTLANE|ROXIE_BROADCAST)) // retries bits mask @@ -166,11 +164,7 @@ class RoxiePacketHeader #ifdef SUBCHANNELS_IN_HEADER ServerIdentifier subChannels[MAX_SUBCHANNEL]; #endif -#ifdef TIME_PACKETS - unsigned tick = 0; -#else unsigned filler = 0; // keeps valgrind happy -#endif RoxiePacketHeader() = default; diff --git a/roxie/ccd/ccdactivities.cpp b/roxie/ccd/ccdactivities.cpp index 23564e431c0..3f91de618c6 100644 --- a/roxie/ccd/ccdactivities.cpp +++ b/roxie/ccd/ccdactivities.cpp @@ -967,7 +967,6 @@ class CRoxieDiskReadBaseActivity : public CRoxieAgentActivity, implements IIndex virtual IMessagePacker *process() { MTIME_SECTION(queryActiveTimer(), "CRoxieDiskReadBaseActivity::process"); - diskReadStarted++; Owned output = ROQ->createOutputStream(packet->queryHeader(), false, logctx); doProcess(output); helper->setCallback(NULL); @@ -975,7 +974,6 @@ class CRoxieDiskReadBaseActivity : public CRoxieAgentActivity, implements IIndex return NULL; else { - diskReadCompleted++; return output.getClear(); } } @@ -1919,7 +1917,6 @@ class CParallelRoxieActivity : public CRoxieAgentActivity else { MTIME_SECTION(queryActiveTimer(), "CParallelRoxieActivity::process"); - diskReadStarted++; Owned output = ROQ->createOutputStream(packet->queryHeader(), false, logctx); class casyncfor: public CAsyncFor { @@ -1955,7 +1952,6 @@ class CParallelRoxieActivity : public CRoxieAgentActivity else { doProcess(output); - diskReadCompleted++; return output.getClear(); } } @@ -2887,8 +2883,6 @@ class CRoxieIndexReadActivity : public CRoxieIndexActivity, implements IIndexRea if (steppingRow) rawSeek = steppingRow; bool continuationNeeded = false; - ScopedAtomic indexRecordsRead(::indexRecordsRead); - ScopedAtomic postFiltered(::postFiltered); while (!aborted && inputsDone < inputCount) { if (!resent || !steppingOffset) // Bit of a hack... In the resent case, we have already set up the tlk, and all keys are processed at once in the steppingOffset case (which makes checkPartChanged gives a false positive in this case) @@ -2911,7 +2905,6 @@ class CRoxieIndexReadActivity : public CRoxieIndexActivity, implements IIndexRea break; } - indexRecordsRead++; size32_t transformedSize; const byte * keyRow = tlk->queryKeyBuffer(); int diff = 0; @@ -2996,7 +2989,6 @@ class CRoxieIndexReadActivity : public CRoxieIndexActivity, implements IIndexRea } else { - postFiltered++; skipped++; } } @@ -3155,8 +3147,6 @@ class CRoxieIndexNormalizeActivity : public CRoxieIndexActivity unsigned skipped = 0; unsigned processedBefore = processed; - ScopedAtomic indexRecordsRead(::indexRecordsRead); - ScopedAtomic postFiltered(::postFiltered); bool continuationFailed = false; while (!aborted && inputsDone < inputCount) { @@ -3178,7 +3168,6 @@ class CRoxieIndexNormalizeActivity : public CRoxieIndexActivity break; } - indexRecordsRead++; bool firstMatch = normalizeHelper->first(tlk->queryKeyBuffer()); callback.finishedRow(); if (firstMatch) // first() can lookup blobs @@ -3218,7 +3207,6 @@ class CRoxieIndexNormalizeActivity : public CRoxieIndexActivity } else { - postFiltered++; skipped++; } } @@ -3305,7 +3293,6 @@ class CRoxieIndexCountActivity : public CRoxieIndexActivity } } - ScopedAtomic indexRecordsRead(::indexRecordsRead); while (!aborted && inputsDone < inputCount && count < choosenLimit) { checkPartChanged(inputData[inputsDone]); @@ -3319,7 +3306,6 @@ class CRoxieIndexCountActivity : public CRoxieIndexActivity while (!aborted && (count < choosenLimit) && tlk->lookup(true)) { keyprocessed++; - indexRecordsRead++; count += countHelper->numValid(tlk->queryKeyBuffer()); if (count > rowLimit) limitExceeded(false); @@ -3428,7 +3414,6 @@ class CRoxieIndexAggregateActivity : public CRoxieIndexActivity unsigned skipped = 0; unsigned processedBefore = processed; - ScopedAtomic indexRecordsRead(::indexRecordsRead); while (!aborted && inputsDone < inputCount) { checkPartChanged(inputData[inputsDone]); @@ -3440,7 +3425,6 @@ class CRoxieIndexAggregateActivity : public CRoxieIndexActivity while (!aborted && tlk->lookup(true)) { keyprocessed++; - indexRecordsRead++; aggregateHelper->processRow(rowBuilder, tlk->queryKeyBuffer()); callback.finishedRow(); } @@ -3549,7 +3533,6 @@ class CRoxieIndexGroupAggregateActivity : public CRoxieIndexActivity, implements Owned output = ROQ->createOutputStream(packet->queryHeader(), false, logctx); unsigned processedBefore = processed; - ScopedAtomic indexRecordsRead(::indexRecordsRead); try { while (!aborted && inputsDone < inputCount) @@ -3577,7 +3560,6 @@ class CRoxieIndexGroupAggregateActivity : public CRoxieIndexActivity, implements else { keyprocessed++; - indexRecordsRead++; aggregateHelper->processRow(tlk->queryKeyBuffer(), this); callback.finishedRow(); } @@ -4327,14 +4309,11 @@ IMessagePacker *CRoxieKeyedJoinIndexActivity::process() else tlk->reset(resent); resent = false; - ScopedAtomic indexRecordsRead(::indexRecordsRead); - ScopedAtomic postFiltered(::postFiltered); while (candidateCount <= atmost) { if (tlk->lookup(true)) { candidateCount++; - indexRecordsRead++; KLBlobProviderAdapter adapter(tlk, &logctx); const byte *indexRow = tlk->queryKeyBuffer(); size_t fposOffset = tlk->queryRowSize() - sizeof(offset_t); @@ -4385,7 +4364,6 @@ IMessagePacker *CRoxieKeyedJoinIndexActivity::process() else { rejected++; - postFiltered++; } } else diff --git a/roxie/ccd/ccdcontext.cpp b/roxie/ccd/ccdcontext.cpp index c52a0546538..6cd9f641852 100644 --- a/roxie/ccd/ccdcontext.cpp +++ b/roxie/ccd/ccdcontext.cpp @@ -1011,7 +1011,6 @@ class RawDataReader : public WorkUnitRowReaderBase size32_t size = rowDeserializer->deserialize(rowBuilder, rowSource); if (isGrouped) rowSource.read(sizeof(bool), &eogPending); - rowsIn++; return rowBuilder.finalizeRowClear(size); } }; diff --git a/roxie/ccd/ccdlistener.cpp b/roxie/ccd/ccdlistener.cpp index b3334a85069..c15731f29d7 100644 --- a/roxie/ccd/ccdlistener.cpp +++ b/roxie/ccd/ccdlistener.cpp @@ -115,7 +115,6 @@ class CascadeManager : public CInterface if (doTrace(traceRoxieLock)) DBGLOG("globalLock released"); globalLock.signal(); - globalSignals++; } } @@ -284,7 +283,6 @@ class CascadeManager : public CInterface DBGLOG("in getGlobalLock"); if (!globalLock.wait(2000)) // since all lock in the same order it's ok to block for a bit here throw MakeStringException(ROXIE_LOCK_ERROR, "lock failed"); - globalLocks++; entered = true; if (doTrace(traceRoxieLock)) DBGLOG("globalLock locked"); @@ -303,7 +301,6 @@ class CascadeManager : public CInterface assertex(entered); entered = false; globalLock.signal(); - globalSignals++; if (doTrace(traceRoxieLock)) DBGLOG("globalLock released"); throw; @@ -1140,13 +1137,6 @@ class RoxieWorkUnitWorker : public RoxieQueryWorker { void noteQuery(bool failed, unsigned elapsedTime, unsigned priority) { - Owned now = createDateTimeNow(); - unsigned y,mo,d,h,m,s,n; - now->getLocalTime(h, m, s, n); - now->getLocalDate(y, mo, d); - lastQueryTime = h*10000 + m * 100 + s; - lastQueryDate = y*10000 + mo * 100 + d; - switch(priority) { case 0: loQueryStats.noteQuery(failed, elapsedTime); break; @@ -1582,12 +1572,6 @@ class RoxieProtocolMsgContext : implements IHpccProtocolMsgContext, public CInte } void noteQueryStats(bool failed, unsigned elapsedTime) { - Owned now = createDateTimeNow(); - unsigned y,mo,d,h,m,s,n; - now->getLocalTime(h, m, s, n); - now->getLocalDate(y, mo, d); - lastQueryTime = h*10000 + m * 100 + s; - lastQueryDate = y*10000 + mo * 100 + d; if (!notedActive) { unknownQueryStats.noteQuery(failed, elapsedTime); diff --git a/roxie/ccd/ccdqueue.cpp b/roxie/ccd/ccdqueue.cpp index cfcfa9c84c4..b3732328099 100644 --- a/roxie/ccd/ccdqueue.cpp +++ b/roxie/ccd/ccdqueue.cpp @@ -49,9 +49,6 @@ using roxiemem::DataBuffer; RoxiePacketHeader::RoxiePacketHeader(const RemoteActivityId &_remoteId, ruid_t _uid, unsigned _channel, unsigned _overflowSequence) { packetlength = sizeof(RoxiePacketHeader); -#ifdef TIME_PACKETS - tick = 0; -#endif init(_remoteId, _uid, _channel, _overflowSequence); } @@ -67,9 +64,6 @@ RoxiePacketHeader::RoxiePacketHeader(const RoxiePacketHeader &source, unsigned _ if (_activityId >= ROXIE_ACTIVITY_SPECIAL_FIRST && _activityId <= ROXIE_ACTIVITY_SPECIAL_LAST) overflowSequence |= OUTOFBAND_SEQUENCE; // Need to make sure it is not treated as dup of actual reply in the udp layer retries = getSubChannelMask(subChannel) | (source.retries & ~ROXIE_RETRIES_MASK); -#ifdef TIME_PACKETS - tick = source.tick; -#endif #ifdef SUBCHANNELS_IN_HEADER memcpy(subChannels, source.subChannels, sizeof(subChannels)); #endif @@ -128,11 +122,7 @@ void RoxiePacketHeader::init(const RemoteActivityId &_remoteId, ruid_t _uid, uns #ifdef SUBCHANNELS_IN_HEADER clearSubChannels(); #endif -#ifdef TIME_PACKETS - tick = 0; -#else filler = 0; // keeps valgrind happy -#endif } #ifdef SUBCHANNELS_IN_HEADER @@ -1215,9 +1205,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory void enqueue(ISerializedRoxieQueryPacket *x, unsigned __int64 IBYTIdelay) { { -#ifdef TIME_PACKETS - x->queryHeader().tick = msTick(); -#endif CriticalBlock qc(qcrit); x->noteQueued(IBYTIdelay); waiting.enqueue(x); @@ -1229,9 +1216,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory void enqueueUnique(ISerializedRoxieQueryPacket *x, unsigned subChannel, unsigned __int64 IBYTIdelay) { RoxiePacketHeader &header = x->queryHeader(); -#ifdef TIME_PACKETS - header.tick = msTick(); -#endif bool found = false; { CriticalBlock qc(qcrit); @@ -1260,10 +1244,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory AgentContextLogger l(x); l.CTXLOG("Ignored retry on subchannel %u for queued activity %s", subChannel, header.toString(xx).str()); } - if (!subChannel) - retriesIgnoredPrm.fastInc(); - else - retriesIgnoredSec.fastInc(); x->Release(); } else @@ -1312,10 +1292,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory #endif found->Release(); queueLength--; - if (scanLength > maxScanLength) - maxScanLength = scanLength; - totScanLength += scanLength; - totScans++; return true; } else @@ -1657,12 +1633,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread } else { -#ifndef NO_IBYTI_DELAYS_COUNT - if (!mySubChannel) - ibytiNoDelaysPrm.fastInc(); - else - ibytiNoDelaysSec.fastInc(); -#endif if (doTrace(traceIBYTI)) { StringBuffer x; @@ -1704,7 +1674,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread return; } - activitiesStarted++; unsigned activityId = packet->queryHeader().activityId & ~ROXIE_PRIORITY_MASK; Owned factory = queryFactory->getAgentActivityFactory(activityId); assertex(factory); @@ -1721,7 +1690,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread } if (output) { - activitiesCompleted++; if (doTrace(traceRoxiePackets)) DBGLOG("Activity completed successfully"); @@ -1781,16 +1749,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread next.clear(); queueLength--; RoxiePacketHeader &header = packet->queryHeader(); -#ifdef TIME_PACKETS - { - unsigned now = msTick(); - unsigned packetWait = now-header.tick; - header.tick = now; - packetWaitMax.store_max(packetWait); - packetWaitElapsed += packetWait; - packetWaitCount++; - } -#endif #ifndef SUBCHANNELS_IN_HEADER topology.setown(getTopology()); #endif @@ -1817,16 +1775,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread doActivity(); else throwUnexpected(); // channel 0 requests translated earlier now - -#ifdef TIME_PACKETS - { - unsigned now = msTick(); - unsigned packetRun = now-header.tick; - packetRunMax.store_max(packetRun); - packetRunElapsed += packetRun; - packetRunCount++; - } -#endif } workerThreadBusy = false; { @@ -2126,7 +2074,6 @@ class RoxieThrottledPacketSender : public Thread if (!channelWrite(serialized->queryHeader(), true)) DBGLOG("Roxie packet write wrote too little"); packet->noteTimeSent(); - packetsSent++; } catch (StoppedException *E) { @@ -2521,7 +2468,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase Owned serialized = x->serialize(); if (!channelWrite(serialized->queryHeader(), true)) logctx.CTXLOG("Roxie packet write wrote too little"); - packetsSent++; } } @@ -2539,7 +2485,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase StringBuffer s; logctx.CTXLOG("Sending IBYTI packet %s", ibytiHeader.toString(s).str()); } channelWrite(ibytiHeader, false); // don't send to self - ibytiPacketsSent++; } virtual void sendAbort(RoxiePacketHeader &header, const IRoxieContextLogger &logctx) override @@ -2561,7 +2506,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase EXCLOG(E); E->Release(); } - abortsSent++; } virtual void sendAbortCallback(const RoxiePacketHeader &header, const char *lfn, const IRoxieContextLogger &logctx) override @@ -2580,7 +2524,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase Owned serialized = packet->serialize(); if (!channelWrite(serialized->queryHeader(), true)) logctx.CTXLOG("sendAbortCallback wrote too little"); - abortsSent++; } virtual IMessagePacker *createOutputStream(RoxiePacketHeader &header, bool outOfBand, const IRoxieContextLogger &logctx) @@ -2661,13 +2604,11 @@ class RoxieSocketQueueManager : public RoxieReceiverBase } else { - ibytiPacketsReceived.fastInc(); unsigned subChannel = header.getRespondingSubChannel(); if (subChannel == mySubChannel) { if (doTrace(traceRoxiePackets)) DBGLOG("doIBYTI packet was from self"); - ibytiPacketsFromSelf.fastInc(); } else { @@ -2689,7 +2630,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase StringBuffer s; DBGLOG("Removed activity from Q : %s", header.toString(s).str()); } - ibytiPacketsWorked.fastInc(); return; } if (abortRunning(header, queue, true, preActivity)) @@ -2699,10 +2639,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase StringBuffer s; DBGLOG("Aborted running activity : %s", header.toString(s).str()); } - if (preActivity) - ibytiPacketsWorked.fastInc(); - else - ibytiPacketsHalfWorked.fastInc(); return; } if (doTrace(traceRoxiePackets)) @@ -2710,7 +2646,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase StringBuffer s; DBGLOG("doIBYTI packet was too late (or too early, or too low priority) : %s", header.toString(s).str()); } - ibytiPacketsTooLate.fastInc(); // meaning either I started and reserve the right to finish, or I finished already if (IBYTIbufferSize) queue.noteOrphanIBYTI(header); } @@ -2760,8 +2695,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase StringBuffer s; DBGLOG("doIBYTI packet was too early : %s", header.toString(s).str()); } - ibytiPacketsTooLate.fastDec(); - ibytiPacketsTooEarly.fastInc(); } else { @@ -2808,10 +2741,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase // If it's a retry, look it up against already running, or output stream, or input queue // if found, send an IBYTI and discard retry request - if (!mySubchannel) - retriesReceivedPrm.fastInc(); - else - retriesReceivedSec.fastInc(); bool alreadyRunning = false; Owned wi = queue.running(); ForEach(*wi) @@ -2820,10 +2749,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase if (w.match(header)) { alreadyRunning = true; - if (!mySubchannel) - retriesIgnoredPrm.fastInc(); - else - retriesIgnoredSec.fastInc(); ROQ->sendIbyti(header, logctx, mySubchannel); if (doTrace(traceRoxiePackets, TraceFlags::Max)) { @@ -2835,10 +2760,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase if (!alreadyRunning && checkCompleted && ROQ->replyPending(header)) { alreadyRunning = true; - if (!mySubchannel) - retriesIgnoredPrm.fastInc(); - else - retriesIgnoredSec.fastInc(); ROQ->sendIbyti(header, logctx, mySubchannel); if (doTrace(traceRoxiePackets, TraceFlags::Max)) { @@ -2910,7 +2831,6 @@ class RoxieSocketQueueManager : public RoxieReceiverBase unsigned l; multicastSocket->readtms(mb.reserve(maxPacketSize), sizeof(RoxiePacketHeader), maxPacketSize, l, timeout); mb.setLength(l); - packetsReceived.fastInc(); // Only incremented from this thread RoxiePacketHeader &header = *(RoxiePacketHeader *) mb.toByteArray(); if (l != header.packetlength) DBGLOG("sock->read returned %d but packetlength was %d", l, header.packetlength); @@ -3398,7 +3318,6 @@ class RoxieLocalQueueManager : public RoxieReceiverBase data.append(sizeof(abortHeader), &abortHeader); Owned packet = createRoxiePacket(data); sendPacket(packet, logctx); - abortsSent++; } virtual void sendAbortCallback(const RoxiePacketHeader &header, const char *lfn, const IRoxieContextLogger &logctx) override @@ -3414,7 +3333,6 @@ class RoxieLocalQueueManager : public RoxieReceiverBase } Owned packet = createRoxiePacket(data); sendPacket(packet, logctx); - abortsSent++; } virtual IMessagePacker *createOutputStream(RoxiePacketHeader &header, bool outOfBand, const IRoxieContextLogger &logctx) override diff --git a/roxie/ccd/ccdserver.cpp b/roxie/ccd/ccdserver.cpp index 2f860f137e2..de9c05bad3b 100644 --- a/roxie/ccd/ccdserver.cpp +++ b/roxie/ccd/ccdserver.cpp @@ -4117,10 +4117,7 @@ class CRemoteResultAdaptor : implements IEngineRowStream, implements IFinalRoxie throw E; } if (!localAgent) - { ROQ->sendPacket(i, activity.queryLogCtx()); - retriesSent++; - } } } } @@ -5020,7 +5017,6 @@ class CRemoteResultAdaptor : implements IEngineRowStream, implements IFinalRoxie } else { - resultsReceived++; switch (header.activityId) { case ROXIE_DEBUGCALLBACK: @@ -5177,8 +5173,6 @@ class CRemoteResultAdaptor : implements IEngineRowStream, implements IFinalRoxie break; default: - if (header.retries & ROXIE_RETRIES_MASK) - retriesNeeded++; unsigned metaLen; const void *metaData = mr->getMessageMetadata(metaLen); if (metaLen) @@ -6921,7 +6915,6 @@ class CRoxieServerLocalResultReadActivity : public CRoxieServerActivity if (next) { processed++; - rowsIn++; } return next; } @@ -6984,7 +6977,6 @@ class CRoxieServerLocalResultStreamReadActivity : public CRoxieServerActivity if (next) { processed++; - rowsIn++; } return next; } @@ -7261,7 +7253,6 @@ class CRoxieServerGraphLoopResultReadActivity : public CRoxieServerActivity if (next) { processed++; - rowsIn++; } return next; } @@ -26175,12 +26166,9 @@ class CRoxieServerFullKeyedJoinHead: public CRoxieServerActivity, implements IRe Owned result = new CRowArrayMessageResult(); jg->notePending(); unsigned candidateCount = 0; - ScopedAtomic indexRecordsRead(::indexRecordsRead); - ScopedAtomic postFiltered(::postFiltered); while (tlk->lookup(true)) { candidateCount++; - indexRecordsRead++; KLBlobProviderAdapter adapter(tlk, this); const byte *indexRow = tlk->queryKeyBuffer(); size_t fposOffset = tlk->queryRowSize() - sizeof(offset_t); @@ -26196,7 +26184,6 @@ class CRoxieServerFullKeyedJoinHead: public CRoxieServerActivity, implements IRe else { rejected++; - postFiltered++; } } // output an end marker for the matches to this group @@ -27027,12 +27014,9 @@ class CRoxieServerHalfKeyedJoinActivity : public CRoxieServerKeyedJoinBase // MORE - This code seems to be duplicated in keyedJoinHead jg->notePending(); unsigned candidateCount = 0; - ScopedAtomic indexRecordsRead(::indexRecordsRead); - ScopedAtomic postFiltered(::postFiltered); while (tlk->lookup(true)) { candidateCount++; - indexRecordsRead++; KLBlobProviderAdapter adapter(tlk, this); const byte *indexRow = tlk->queryKeyBuffer(); size_t fposOffset = tlk->queryRowSize() - sizeof(offset_t); @@ -27056,7 +27040,6 @@ class CRoxieServerHalfKeyedJoinActivity : public CRoxieServerKeyedJoinBase else { rejected++; - postFiltered++; } } diff --git a/roxie/ccd/ccdsnmp.cpp b/roxie/ccd/ccdsnmp.cpp index dfcc69ac1c2..c99998a6fe6 100644 --- a/roxie/ccd/ccdsnmp.cpp +++ b/roxie/ccd/ccdsnmp.cpp @@ -37,54 +37,11 @@ RoxieQueryStats loQueryStats; RoxieQueryStats hiQueryStats; RoxieQueryStats slaQueryStats; RoxieQueryStats combinedQueryStats; -RelaxedAtomic retriesIgnoredPrm; -RelaxedAtomic retriesIgnoredSec; -RelaxedAtomic retriesNeeded; -RelaxedAtomic retriesReceivedPrm; -RelaxedAtomic retriesReceivedSec; -RelaxedAtomic retriesSent; -RelaxedAtomic rowsIn; -RelaxedAtomic ibytiPacketsFromSelf; -RelaxedAtomic ibytiPacketsSent; -RelaxedAtomic ibytiPacketsWorked; -RelaxedAtomic ibytiPacketsHalfWorked; -RelaxedAtomic ibytiPacketsReceived; -RelaxedAtomic ibytiPacketsTooLate; -RelaxedAtomic ibytiPacketsTooEarly; -RelaxedAtomic ibytiNoDelaysPrm; -RelaxedAtomic ibytiNoDelaysSec; -RelaxedAtomic packetsSent; -RelaxedAtomic packetsReceived; -RelaxedAtomic resultsReceived; -RelaxedAtomic indexRecordsRead; -RelaxedAtomic postFiltered; -RelaxedAtomic abortsSent; -RelaxedAtomic activitiesStarted; -RelaxedAtomic activitiesCompleted; -RelaxedAtomic diskReadStarted; -RelaxedAtomic diskReadCompleted; -RelaxedAtomic globalSignals; -RelaxedAtomic globalLocks; -RelaxedAtomic numFilesToProcess; +RelaxedAtomic numFilesToProcess; RelaxedAtomic queueLength; RelaxedAtomic maxQueueLength; -RelaxedAtomic rowsOut; -RelaxedAtomic maxScanLength; -RelaxedAtomic totScanLength; -RelaxedAtomic totScans; - -#ifdef TIME_PACKETS -RelaxedAtomic packetWaitElapsed; -RelaxedAtomic packetWaitMax; -RelaxedAtomic packetWaitCount; -RelaxedAtomic packetRunElapsed; -RelaxedAtomic packetRunMax; -RelaxedAtomic packetRunCount; -#endif -RelaxedAtomic lastQueryDate; -RelaxedAtomic lastQueryTime; RelaxedAtomic agentsActive; RelaxedAtomic maxAgentsActive; @@ -346,39 +303,8 @@ CRoxieMetricsManager::CRoxieMetricsManager() hiQueryStats.addMetrics(this, "hi", 1000); slaQueryStats.addMetrics(this, "sla", 1000); combinedQueryStats.addMetrics(this, "all", 1000); - addMetric(retriesIgnoredPrm, 1000); - addMetric(retriesIgnoredSec, 1000); - addMetric(retriesNeeded, 1000); - addMetric(retriesReceivedPrm, 1000); - addMetric(retriesReceivedSec, 1000); - addMetric(retriesSent, 1000); - addMetric(rowsIn, 1000); - addMetric(rowsOut, 1000); - addMetric(ibytiPacketsFromSelf, 1000); - addMetric(ibytiPacketsSent, 1000); - addMetric(ibytiPacketsWorked, 1000); - addMetric(ibytiPacketsHalfWorked, 1000); - addMetric(ibytiPacketsReceived, 1000); - addMetric(ibytiPacketsTooLate, 1000); - addMetric(ibytiPacketsTooEarly, 1000); -#ifndef NO_IBYTI_DELAYS_COUNT - addMetric(ibytiNoDelaysPrm, 1000); - addMetric(ibytiNoDelaysSec, 1000); -#endif - addMetric(packetsReceived, 1000); - addMetric(packetsSent, 1000); - addMetric(resultsReceived, 1000); addMetric(agentsActive, 0); addMetric(maxAgentsActive, 0); - addMetric(indexRecordsRead, 1000); - addMetric(postFiltered, 1000); - addMetric(abortsSent, 0); - addMetric(activitiesStarted, 1000); - addMetric(activitiesCompleted, 1000); - addMetric(diskReadStarted, 0); - addMetric(diskReadCompleted, 0); - addMetric(globalSignals, 0); - addMetric(globalLocks, 0); addMetric(restarts, 0); addMetric(nodesLoaded, 1000); @@ -402,12 +328,6 @@ CRoxieMetricsManager::CRoxieMetricsManager() addMetric(getDataBufferPages, 0); addMetric(getDataBuffersActive, 0); - addMetric(maxScanLength, 0); - addMetric(totScanLength, 0); - addMetric(totScans, 0); - addMetric(lastQueryDate, 0); - addMetric(lastQueryTime, 0); - addMetric(packetsResent, 1000); addMetric(flowPermitsSent, 1000); addMetric(flowRequestsReceived, 1000); @@ -416,12 +336,6 @@ CRoxieMetricsManager::CRoxieMetricsManager() addMetric(flowPermitsReceived, 1000); addMetric(dataPacketsSent, 1000); -#ifdef TIME_PACKETS - addMetric(packetWaitMax, 0); - addMetric(packetRunMax, 0); - addRatioMetric(packetRunCount, "packetRunAverage", packetRunElapsed); - addRatioMetric(packetWaitCount, "packetWaitAverage", packetWaitElapsed); -#endif addMetric(numFilesToProcess, 0); ticker.start(); } diff --git a/roxie/ccd/ccdsnmp.hpp b/roxie/ccd/ccdsnmp.hpp index 1e9128de016..aa111b9c6de 100644 --- a/roxie/ccd/ccdsnmp.hpp +++ b/roxie/ccd/ccdsnmp.hpp @@ -84,57 +84,13 @@ extern RoxieQueryStats loQueryStats; extern RoxieQueryStats hiQueryStats; extern RoxieQueryStats slaQueryStats; extern RoxieQueryStats combinedQueryStats; -extern RelaxedAtomic retriesIgnoredPrm; -extern RelaxedAtomic retriesIgnoredSec; -extern RelaxedAtomic retriesNeeded; -extern RelaxedAtomic retriesReceivedPrm; -extern RelaxedAtomic retriesReceivedSec; -extern RelaxedAtomic retriesSent; -extern RelaxedAtomic rowsIn; -extern RelaxedAtomic ibytiPacketsFromSelf; -extern RelaxedAtomic ibytiPacketsSent; -extern RelaxedAtomic ibytiPacketsWorked; -extern RelaxedAtomic ibytiPacketsHalfWorked; -extern RelaxedAtomic ibytiPacketsReceived; -extern RelaxedAtomic ibytiPacketsTooLate; -extern RelaxedAtomic ibytiPacketsTooEarly; -extern RelaxedAtomic ibytiNoDelaysPrm; -extern RelaxedAtomic ibytiNoDelaysSec; -extern RelaxedAtomic packetsReceived; -extern RelaxedAtomic packetsSent; -extern RelaxedAtomic resultsReceived; -extern RelaxedAtomic indexRecordsRead; -extern RelaxedAtomic postFiltered; -extern RelaxedAtomic abortsSent; -extern RelaxedAtomic activitiesStarted; -extern RelaxedAtomic activitiesCompleted; -extern RelaxedAtomic diskReadStarted; -extern RelaxedAtomic diskReadCompleted; -extern RelaxedAtomic globalSignals; -extern RelaxedAtomic globalLocks; extern RelaxedAtomic maxAgentsActive; extern RelaxedAtomic agentsActive; -extern RelaxedAtomic rowsOut; extern RelaxedAtomic queueLength; extern RelaxedAtomic maxQueueLength; -extern RelaxedAtomic maxScanLength; -extern RelaxedAtomic totScanLength; -extern RelaxedAtomic totScans; extern RelaxedAtomic numFilesToProcess; -#ifdef TIME_PACKETS -extern RelaxedAtomic packetWaitElapsed; -extern RelaxedAtomic packetWaitMax; -extern RelaxedAtomic packetWaitCount; -extern RelaxedAtomic packetRunElapsed; -extern RelaxedAtomic packetRunMax; -extern RelaxedAtomic packetRunCount; -#endif - -extern RelaxedAtomic lastQueryDate; -extern RelaxedAtomic lastQueryTime; - interface IRoxieMetricsManager : extends IInterface { virtual void dumpMetrics() = 0;