Skip to content

Commit 59f0b6c

Browse files
committed
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.
1 parent fcc6e92 commit 59f0b6c

25 files changed

+34
-197
lines changed

src/freenet/clients/fcp/FCPConnectionInputHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ void start() {
4545

4646
@Override
4747
public void run() {
48-
freenet.support.Logger.OSThread.logPID(this);
4948
try {
5049
realRun();
5150
} catch (TooLongException e) {

src/freenet/clients/fcp/FCPConnectionOutputHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ void start() {
4646

4747
@Override
4848
public void run() {
49-
freenet.support.Logger.OSThread.logPID(this);
5049
try {
5150
realRun();
5251
} catch (IOException e) {

src/freenet/clients/fcp/FCPServer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ public void maybeStart() {
192192

193193
@Override
194194
public void run() {
195-
freenet.support.Logger.OSThread.logPID(this);
196195
while(true) {
197196
try {
198197
networkInterface.waitBound();

src/freenet/clients/http/SimpleToadletServer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,6 @@ void start() {
10701070

10711071
@Override
10721072
public void run() {
1073-
freenet.support.Logger.OSThread.logPID(this);
10741073
if(logMINOR) Logger.minor(this, "Handling connection");
10751074
try {
10761075
ToadletContextImpl.handle(sock, SimpleToadletServer.this, pageMaker, getUserAlertManager(), bookmarkManager);

src/freenet/io/NetworkInterface.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,6 @@ public void close() throws IOException {
383383
*/
384384
@Override
385385
public void run() {
386-
freenet.support.Logger.OSThread.logPID(this);
387386
while (!closed) {
388387
try {
389388
Socket clientSocket = serverSocket.accept();

src/freenet/node/CHKInsertHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ public String toString() {
9090

9191
@Override
9292
public void run() {
93-
freenet.support.Logger.OSThread.logPID(this);
9493
try {
9594
realRun();
9695
} catch (Throwable t) {
@@ -573,7 +572,6 @@ public class DataReceiver implements PrioRunnable {
573572

574573
@Override
575574
public void run() {
576-
freenet.support.Logger.OSThread.logPID(this);
577575
if(logMINOR) Logger.minor(this, "Receiving data for "+CHKInsertHandler.this);
578576
// Don't log whether the transfer succeeded or failed as the transfer was initiated by the source therefore could be unreliable evidence.
579577
br.receive(new BlockReceiverCompletion() {

src/freenet/node/CHKInsertSender.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ void start() {
116116

117117
@Override
118118
public void run() {
119-
freenet.support.Logger.OSThread.logPID(this);
120119
try {
121120
this.realRun();
122121
} catch (Throwable t) {
@@ -395,7 +394,6 @@ public String toString() {
395394

396395
@Override
397396
public void run() {
398-
freenet.support.Logger.OSThread.logPID(this);
399397
origTag.startedSender();
400398
try {
401399
routeRequests();
@@ -917,7 +915,6 @@ public synchronized boolean sentRequest() {
917915

918916
private void waitForBackgroundTransferCompletions() {
919917
try {
920-
freenet.support.Logger.OSThread.logPID(this);
921918
if(logMINOR) Logger.minor(this, "Waiting for background transfer completions: "+this);
922919

923920
// We must presently be at such a stage that no more background transfers will be added.

src/freenet/node/DNSRequester.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ void start() {
5151

5252
@Override
5353
public void run() {
54-
freenet.support.Logger.OSThread.logPID(this);
5554
while(true) {
5655
try {
5756
realRun();

src/freenet/node/IPDetectorPluginManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,6 @@ private void tryMaybeRun() {
372372
node.getTicker().queueTimedJob(new Runnable() {
373373
@Override
374374
public void run() {
375-
freenet.support.Logger.OSThread.logPID(this);
376375
tryMaybeRun();
377376
}
378377
}, MINUTES.toMillis(1));
@@ -718,7 +717,6 @@ public void kill() {
718717

719718
@Override
720719
public void run() {
721-
freenet.support.Logger.OSThread.logPID(this);
722720
try {
723721
realRun();
724722
} catch (Throwable t) {

src/freenet/node/LocationManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ public class SwapRequestSender implements Runnable {
428428

429429
@Override
430430
public void run() {
431-
freenet.support.Logger.OSThread.logPID(this);
432431
Thread.currentThread().setName("SwapRequestSender");
433432
while(true) {
434433
try {
@@ -556,7 +555,6 @@ public class IncomingSwapRequestHandler implements Runnable {
556555

557556
@Override
558557
public void run() {
559-
freenet.support.Logger.OSThread.logPID(this);
560558
MessageDigest md = SHA256.getMessageDigest();
561559

562560
boolean reachedEnd = false;
@@ -716,7 +714,6 @@ public class OutgoingSwapRequestHandler implements Runnable {
716714

717715
@Override
718716
public void run() {
719-
freenet.support.Logger.OSThread.logPID(this);
720717
long uid = r.nextLong();
721718
if(!lock()) return;
722719
boolean reachedEnd = false;

0 commit comments

Comments
 (0)