Update of /cvsroot/freenet/freenet/src/freenet/node/states/request In directory sc8-pr-cvs1:/tmp/cvs-serv15769/src/freenet/node/states/request
Modified Files: Pending.java Log Message: get rid of some yellowies Index: Pending.java =================================================================== RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/request/Pending.java,v retrieving revision 1.80 retrieving revision 1.81 diff -u -w -r1.80 -r1.81 --- Pending.java 31 Oct 2003 19:21:17 -0000 1.80 +++ Pending.java 31 Oct 2003 19:26:52 -0000 1.81 @@ -271,7 +271,7 @@ receivedTime = 0; } else { long x = gotTime - receivedTime; - n.diagnostics.occurrenceContinuous("preRoutingTime", x); + Core.diagnostics.occurrenceContinuous("preRoutingTime", x); if(x > 500 && logDEBUG) Core.logger.log(this, "Got long preRoutingTime ("+x+ " = "+gotTime+"-"+receivedTime+ @@ -279,7 +279,7 @@ Logger.DEBUG); } long regotTime = System.currentTimeMillis(); - n.diagnostics.occurrenceContinuous("regotTime", regotTime - gotTime); + Core.diagnostics.occurrenceContinuous("regotTime", regotTime - gotTime); // is this the first time? if (routes == null) { if(logDEBUG) @@ -302,7 +302,7 @@ searchKey.getExpectedTransmissionLength(), false, isInsert()); gotRouteTime = System.currentTimeMillis(); - n.diagnostics.occurrenceContinuous("getRouteTime", gotRouteTime - searchDataTime); + Core.diagnostics.occurrenceContinuous("getRouteTime", gotRouteTime - searchDataTime); if((gotRouteTime - searchDataTime) > 1000) if(logMINOR) Core.logger.log(this, "getting routing object took "+ @@ -324,7 +324,7 @@ ri.initException, Logger.DEBUG); } - n.diagnostics.occurrenceBinomial("restartedRequestAccepted", + Core.diagnostics.occurrenceBinomial("restartedRequestAccepted", 1, accepted ? 1 : 0); @@ -547,7 +547,7 @@ Logger.DEBUG); long stillInSendOnTime = System.currentTimeMillis(); if(isFirst && attemptCount == 0) { - n.diagnostics.occurrenceContinuous("stillInSendOnTime", + Core.diagnostics.occurrenceContinuous("stillInSendOnTime", stillInSendOnTime - gotRouteTime); if(logDEBUG) Core.logger.log(this, "stillInSendOnTime="+ @@ -574,7 +574,7 @@ Logger.DEBUG); long stillStillInSendOnTime = System.currentTimeMillis(); if(isFirst && attemptCount == 0) { - n.diagnostics.occurrenceContinuous("stillStillInSendOnTime", + Core.diagnostics.occurrenceContinuous("stillStillInSendOnTime", stillStillInSendOnTime - stillInSendOnTime); } @@ -609,16 +609,16 @@ if (attemptCount == 0 && receivedTime > 0 && receivedTime < routedTime) { // sanity long rt = routedTime - receivedTime; - n.diagnostics.occurrenceContinuous("routingTime", rt); + Core.diagnostics.occurrenceContinuous("routingTime", rt); if(rt > 1000 && logDEBUG) Core.logger.log(this, "routingTime "+rt+" for "+ this, new Exception("debug"), Logger.DEBUG); - n.diagnostics.occurrenceContinuous("subRoutingTime", + Core.diagnostics.occurrenceContinuous("subRoutingTime", routedTime - stillStillInSendOnTime); if(searchDataRoutingTime > 0) - n.diagnostics.occurrenceContinuous("searchDataRoutingTime", + Core.diagnostics.occurrenceContinuous("searchDataRoutingTime", searchDataRoutingTime); receivedTime = -2; // make sure we aren't called twice } @@ -859,7 +859,7 @@ doc = null; thrownTime = System.currentTimeMillis(); if(origPeer != null) - n.diagnostics.occurrenceContinuous("sendingReplyHTL", + Core.diagnostics.occurrenceContinuous("sendingReplyHTL", hopsToLive); throw new RequestAbortException(new SendingReply(this)); } @@ -890,12 +890,12 @@ } catch (RequestAbortException e) { long endTime = System.currentTimeMillis(); long length = endTime - startTime; - n.diagnostics.occurrenceContinuous("searchFoundDataTime", length); + Core.diagnostics.occurrenceContinuous("searchFoundDataTime", length); throw e; } long endTime = System.currentTimeMillis(); long length = endTime - startTime; - n.diagnostics.occurrenceContinuous("searchNotFoundDataTime", length); + Core.diagnostics.occurrenceContinuous("searchNotFoundDataTime", length); } // Helpers for NGrouting stats _______________________________________________ cvs mailing list [EMAIL PROTECTED] http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs