Remove Logger.OSThread-based PID logging that was always disabled

The PID logging is always disabled and there is no API for enabling it. Remove the entire implementation and all the calls to its logPID method, but keep the interface for plugin compatibility.
hyphanet · Dec 1, 2024 · 59f0b6c · 59f0b6c
1 parent fcc6e92
commit 59f0b6c
Show file tree

Hide file tree

Showing 25 changed files with 34 additions and 197 deletions.
diff --git a/src/freenet/clients/fcp/FCPConnectionInputHandler.java b/src/freenet/clients/fcp/FCPConnectionInputHandler.java
@@ -45,7 +45,6 @@ void start() {
 
 	@Override
 	public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
 		try {
 			realRun();
 		} catch (TooLongException e) {

diff --git a/src/freenet/clients/fcp/FCPConnectionOutputHandler.java b/src/freenet/clients/fcp/FCPConnectionOutputHandler.java
@@ -46,7 +46,6 @@ void start() {
 
 	@Override
 	public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
 		try {
 			realRun();
 		} catch (IOException e) {

diff --git a/src/freenet/clients/fcp/FCPServer.java b/src/freenet/clients/fcp/FCPServer.java
@@ -192,7 +192,6 @@ public void maybeStart() {
 
 	@Override
 	public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
 		while(true) {
 			try {
 				networkInterface.waitBound();

diff --git a/src/freenet/clients/http/SimpleToadletServer.java b/src/freenet/clients/http/SimpleToadletServer.java
@@ -1070,7 +1070,6 @@ void start() {
 
 		@Override
 		public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
 			if(logMINOR) Logger.minor(this, "Handling connection");
 			try {
 				ToadletContextImpl.handle(sock, SimpleToadletServer.this, pageMaker, getUserAlertManager(), bookmarkManager);

diff --git a/src/freenet/io/NetworkInterface.java b/src/freenet/io/NetworkInterface.java
@@ -383,7 +383,6 @@ public void close() throws IOException {
 		 */
 		@Override
 		public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
 			while (!closed) {
 				try {
 					Socket clientSocket = serverSocket.accept();

diff --git a/src/freenet/node/CHKInsertHandler.java b/src/freenet/node/CHKInsertHandler.java
@@ -90,7 +90,6 @@ public String toString() {
 
     @Override
     public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
         try {
             realRun();
         } catch (Throwable t) {
@@ -573,7 +572,6 @@ public class DataReceiver implements PrioRunnable {
 
         @Override
         public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
         	if(logMINOR) Logger.minor(this, "Receiving data for "+CHKInsertHandler.this);
         	// Don't log whether the transfer succeeded or failed as the transfer was initiated by the source therefore could be unreliable evidence.
         	br.receive(new BlockReceiverCompletion() {

diff --git a/src/freenet/node/CHKInsertSender.java b/src/freenet/node/CHKInsertSender.java
@@ -116,7 +116,6 @@ void start() {
 
 		@Override
 		public void run() {
-			freenet.support.Logger.OSThread.logPID(this);
 			try {
 				this.realRun();
 			} catch (Throwable t) {
@@ -395,7 +394,6 @@ public String toString() {
 
     @Override
     public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
     	origTag.startedSender();
         try {
             routeRequests();
@@ -917,7 +915,6 @@ public synchronized boolean sentRequest() {
 
 		private void waitForBackgroundTransferCompletions() {
 			try {
-				freenet.support.Logger.OSThread.logPID(this);
 				if(logMINOR) Logger.minor(this, "Waiting for background transfer completions: "+this);
 
 				// We must presently be at such a stage that no more background transfers will be added.

diff --git a/src/freenet/node/DNSRequester.java b/src/freenet/node/DNSRequester.java
@@ -51,7 +51,6 @@ void start() {
 
     @Override
     public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
         while(true) {
             try {
                 realRun();

diff --git a/src/freenet/node/IPDetectorPluginManager.java b/src/freenet/node/IPDetectorPluginManager.java
@@ -372,7 +372,6 @@ private void tryMaybeRun() {
 		node.getTicker().queueTimedJob(new Runnable() {
 			@Override
 			public void run() {
-				freenet.support.Logger.OSThread.logPID(this);
 				tryMaybeRun();
 			}
 		}, MINUTES.toMillis(1));
@@ -718,7 +717,6 @@ public void kill() {
 
 		@Override
 		public void run() {
-			freenet.support.Logger.OSThread.logPID(this);
 			try {
 				realRun();
 			} catch (Throwable t) {

diff --git a/src/freenet/node/LocationManager.java b/src/freenet/node/LocationManager.java
@@ -428,7 +428,6 @@ public class SwapRequestSender implements Runnable {
 
         @Override
         public void run() {
-            freenet.support.Logger.OSThread.logPID(this);
 		    Thread.currentThread().setName("SwapRequestSender");
             while(true) {
                 try {
@@ -556,7 +555,6 @@ public class IncomingSwapRequestHandler implements Runnable {
 
         @Override
         public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
             MessageDigest md = SHA256.getMessageDigest();
 
             boolean reachedEnd = false;
@@ -716,7 +714,6 @@ public class OutgoingSwapRequestHandler implements Runnable {
 
         @Override
         public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
             long uid = r.nextLong();
             if(!lock()) return;
             boolean reachedEnd = false;

diff --git a/src/freenet/node/LoggingConfigHandler.java b/src/freenet/node/LoggingConfigHandler.java
@@ -357,7 +357,6 @@ void start() {
 
 		@Override
 		public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
 			fileLoggerHook.waitForSwitch();
 			delete(logDir);
 		}

diff --git a/src/freenet/node/Node.java b/src/freenet/node/Node.java
@@ -3438,7 +3438,6 @@ private void scheduleVersionTransition() {
 
 				@Override
 				public void run() {
-					freenet.support.Logger.OSThread.logPID(this);
 					for(PeerNode pn: peers.myPeers()) {
 						pn.updateVersionRoutablity();
 					}

diff --git a/src/freenet/node/PacketSender.java b/src/freenet/node/PacketSender.java
@@ -112,7 +112,6 @@ public void run() {
 	@Override
 	public void run() {
 		if(logMINOR) Logger.minor(this, "In PacketSender.run()");
-		freenet.support.Logger.OSThread.logPID(this);
 
                 schedulePeriodicJob();
 		/*

diff --git a/src/freenet/node/Persister.java b/src/freenet/node/Persister.java
@@ -48,7 +48,6 @@ void interrupt() {
 
 	@Override
 	public void run() {
-		freenet.support.Logger.OSThread.logPID(this);
 		try {
 			persistThrottle();
 		} catch (Throwable t) {

diff --git a/src/freenet/node/RequestHandler.java b/src/freenet/node/RequestHandler.java
@@ -102,7 +102,6 @@ public RequestHandler(PeerNode source, long id, Node n, short htl, Key key, Requ
 
 	@Override
 	public void run() {
-		freenet.support.Logger.OSThread.logPID(this);
 		try {
 			realRun();
 		//The last thing that realRun() does is register as a request-sender listener, so any exception here is the end.

diff --git a/src/freenet/node/RequestSender.java b/src/freenet/node/RequestSender.java
@@ -228,7 +228,6 @@ public void run() {
 	static final int MAX_HIGH_HTL_FAILURES = 5;
 
     private void realRun() {
-	    freenet.support.Logger.OSThread.logPID(this);
         if(isSSK && (pubKey == null)) {
         	pubKey = ((NodeSSK)key).getPubKey();
         }

diff --git a/src/freenet/node/RequestStarter.java b/src/freenet/node/RequestStarter.java
@@ -226,7 +226,6 @@ private boolean startRequest(ChosenBlock req, boolean logMINOR) {
 
 	@Override
 	public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
             while(true) {
                 try {
                     realRun();
@@ -248,7 +247,6 @@ public SenderThread(ChosenBlock req, Key key) {
 
 		@Override
 		public void run() {
-		    freenet.support.Logger.OSThread.logPID(this);
 		    // FIXME ? key is not known for inserts here
 		    if (key != null)
 		    	stats.reportOutgoingLocalRequestLocation(key.toNormalizedDouble());

diff --git a/src/freenet/node/SSKInsertHandler.java b/src/freenet/node/SSKInsertHandler.java
@@ -81,7 +81,6 @@ public String toString() {
 
     @Override
     public void run() {
-        freenet.support.Logger.OSThread.logPID(this);
         try {
             realRun();
         } catch (Throwable t) {

diff --git a/src/freenet/node/SSKInsertSender.java b/src/freenet/node/SSKInsertSender.java
@@ -107,7 +107,6 @@ void start() {
 
 	@Override
 	public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
         origTag.startedSender();
         try {
             routeRequests();

diff --git a/src/freenet/node/TextModeClientInterface.java b/src/freenet/node/TextModeClientInterface.java
@@ -116,7 +116,6 @@ public TextModeClientInterface(Node n, NodeClientCore core, HighLevelSimpleClien
 
     @Override
     public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
     	try {
     		realRun();
     	} catch (IOException e) {
@@ -426,7 +425,6 @@ private boolean processLine(BufferedReader reader) throws IOException {
     	n.getTicker().queueTimedJob(new Runnable() {
     		@Override
     		public void run() {
-    		    freenet.support.Logger.OSThread.logPID(this);
     			n.getNodeUpdater().arm();
     		}
     	}, 0);

diff --git a/src/freenet/node/TextModeClientInterfaceServer.java b/src/freenet/node/TextModeClientInterfaceServer.java
@@ -267,7 +267,6 @@ public void set(Integer val) throws InvalidConfigValueException {
      */
     @Override
     public void run() {
-	    freenet.support.Logger.OSThread.logPID(this);
     	while(true) {
     		int curPort = port;
     		String tempBindTo = this.bindTo;