Update of /cvsroot/freenet/freenet/src/freenet/thread
In directory sc8-pr-cvs1:/tmp/cvs-serv14016/src/freenet/thread

Modified Files:
        QThreadFactory.java YThreadFactory.java 
Log Message:
6290: don't show the request box either when in simple mode.

Index: QThreadFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/thread/QThreadFactory.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -w -r1.42 -r1.43
--- QThreadFactory.java 28 Oct 2003 03:02:50 -0000      1.42
+++ QThreadFactory.java 31 Oct 2003 19:21:22 -0000      1.43
@@ -82,7 +82,7 @@
                                                                        ", available: 
" + snap.available + 
                                                                        ", required: " 
+ required + 
                                                                        ", active: " + 
snap.active,
-                                                                       
Core.logger.DEBUG);
+                                                                       Logger.DEBUG);
                                doLog = false;
                 int allowed;
                                countLock.snap(snap);
@@ -113,7 +113,7 @@
                                                                        ", available: 
" + snap.available + 
                                                                        ", allowed: " 
+ allowed + 
                                                                        ", active: " + 
snap.active,
-                                                                       
Core.logger.DEBUG);
+                                                                       Logger.DEBUG);
                                
             } catch (Throwable e) {
                 if (lastEx == null || !lastEx.getClass().equals(e.getClass())) {
@@ -122,11 +122,11 @@
                                                                        + 
snap.available + " threads available ," 
                                                                        + snap.active 
+ " running. "
                                                                        + "Top: " + 
headLock.headerThread, 
-                                                                       e, 
Core.logger.ERROR);
+                                                                       e, 
Logger.ERROR);
                                }
                 lastEx = e;
                 try {
-                    Thread.currentThread().sleep(20); // avoid runaway loop.
+                    Thread.sleep(20); // avoid runaway loop.
                 } catch (InterruptedException e2) {}
             }
                        countLock.waitForNotify(1000); 
@@ -237,12 +237,12 @@
                         Core.logger.log(this, "Got out of memory error, " +
                                         "decreasing maximum threads by 5 from ~"+
                                                                                
maxLock.desiredMax()+".", 
-                                                                               e, 
Core.logger.ERROR);
+                                                                               e, 
Logger.ERROR);
                                                
freenet.node.Main.dumpInterestingObjects();
                         maxLock.decrementDesiredMax(5);
                     } catch (Throwable e) {
                         Core.logger.log(this, "Unhandled throw in job: "+e,
-                                        e, Core.logger.ERROR);
+                                        e, Logger.ERROR);
                     } finally {
                         jobsDone++;
                         job = null;
@@ -262,7 +262,7 @@
                                Core.logger.log(this, getName() + " ended. " + 
                                                                snap.available + 
"threads available." +
                                                                snap.active + "threads 
active.",
-                                                               Core.logger.DEBUG);
+                                                               Logger.DEBUG);
         }
                
         /**

Index: YThreadFactory.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/thread/YThreadFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- YThreadFactory.java 30 Oct 2003 01:34:07 -0000      1.4
+++ YThreadFactory.java 31 Oct 2003 19:21:22 -0000      1.5
@@ -167,7 +167,7 @@
                                             jobsDone + " jobs done. " +
                                             maxQueueDelay + " max queue delay. " +
                                             avgQueueDelay + " avg queue delay.",
-                                            Core.logger.DEBUG);
+                                            Logger.DEBUG);
                         return;
                     }
                     // (result.job == null && ! result.exit) means we
@@ -194,7 +194,7 @@
                         job.run();
                     } catch (Throwable e) {
                         Core.logger.log(this, "Unhandled exception " + e + " in job " 
+ job,
-                                        e, Core.logger.ERROR);
+                                        e, Logger.ERROR);
                         freenet.node.Main.dumpInterestingObjects();
                     } finally {
                         jobsDone++;

_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to