Changeset 4c72c08

Timestamp:

Nov 18, 2015 1:43:14 PM (5 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

1e89fac

Parents:

679fe9b

Message:

i2psnark: Add skipped length on details page
reorder some logging
volatile

Location:

apps/i2psnark/java/src/org/klomp/snark

Files:

• Peer.java (modified) (1 diff)
• PeerConnectionIn.java (modified) (9 diffs)
• Snark.java (modified) (1 diff)
• Storage.java (modified) (1 diff)
• web/I2PSnarkServlet.java (modified) (1 diff)

apps/i2psnark/java/src/org/klomp/snark/Peer.java

@@ -63 +63 @@
   // Keeps state for in/out connections.  Non-null when the handshake
   // was successful, the connection setup and runs
-  PeerState state;
+  volatile PeerState state;
 
   /** shared across all peers on this torrent */

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionIn.java

@@ -40 +40 @@
                                                    MagnetState.CHUNK_SIZE + 100);  // 100 for the ext msg dictionary
 
-  private Thread thread;
+  private volatile Thread thread;
   private volatile boolean quit;
 
@@ -76 +76 @@
     try
       {
-        PeerState ps = peer.state;
-        while (!quit && ps != null)
+        while (!quit)
           {
+            final PeerState ps = peer.state;
+            if (ps == null)
+                break;
+
             // Common variables used for some messages.
             int piece;
@@ -92 +95 @@
             if (i == 0)
               {
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received keepalive from " + peer);
                 ps.keepAliveMessage();
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received keepalive from " + peer);
                 continue;
               }
@@ -102 +105 @@
               {
               case Message.CHOKE:
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received choke from " + peer);
                 ps.chokeMessage(true);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received choke from " + peer);
                 break;
 
               case Message.UNCHOKE:
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received unchoke from " + peer);
                 ps.chokeMessage(false);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received unchoke from " + peer);
                 break;
 
               case Message.INTERESTED:
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received interested from " + peer);
                 ps.interestedMessage(true);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received interested from " + peer);
                 break;
 
               case Message.UNINTERESTED:
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received not interested from " + peer);
                 ps.interestedMessage(false);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received not interested from " + peer);
                 break;
 
               case Message.HAVE:
                 piece = din.readInt();
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received havePiece(" + piece + ") from " + peer);
                 ps.haveMessage(piece);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received havePiece(" + piece + ") from " + peer);
                 break;
 
@@ -135 +138 @@
                 byte[] bitmap = new byte[i-1];
                 din.readFully(bitmap);
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received bitmap from " + peer  + ": size=" + (i-1) /* + ": " + ps.bitfield */ );
                 ps.bitfieldMessage(bitmap);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received bitmap from " + peer  + ": size=" + (i-1) /* + ": " + ps.bitfield */ );
                 break;
 
@@ -144 +147 @@
                 begin = din.readInt();
                 len = din.readInt();
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received request(" + piece + "," + begin + ") from " + peer);
                 ps.requestMessage(piece, begin, len);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received request(" + piece + "," + begin + ") from " + peer);
                 break;
 
@@ -157 +160 @@
                   {
                     req.read(din);
-                    ps.pieceMessage(req);
                     if (_log.shouldLog(Log.DEBUG)) 
                         _log.debug("Received data(" + piece + "," + begin + ") from " + peer);
+                    ps.pieceMessage(req);
                   }
                 else
@@ -176 +179 @@
                 begin = din.readInt();
                 len = din.readInt();
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received cancel(" + piece + "," + begin + ") from " + peer);
                 ps.cancelMessage(piece, begin, len);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received cancel(" + piece + "," + begin + ") from " + peer);
                 break;
 
               case Message.PORT:
                 int port = din.readUnsignedShort();
+                if (_log.shouldLog(Log.DEBUG)) 
+                    _log.debug("Received port message from " + peer);
                 ps.portMessage(port);
-                if (_log.shouldLog(Log.DEBUG)) 
-                    _log.debug("Received port message from " + peer);
                 break;
 
@@ -248 +251 @@
             _log.info("IOError talking with " + peer, ioe);
       }
-    catch (Throwable t)
+    catch (RuntimeException t)
       {
         _log.error("Error talking with " + peer, t);
-        if (t instanceof OutOfMemoryError)
-            throw (OutOfMemoryError)t;
       }
     finally

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -913 +913 @@
 
     /**
+     *  Bytes not received and set to skipped.
+     *  This is not the same as the total of all skipped files,
+     *  since pieces may span multiple files.
+     *
+     *  @return exact value. or 0 if no storage yet.
+     *  @since 0.9.24
+     */
+    public long getSkippedLength() {
+        PeerCoordinator coord = coordinator;
+        if (coord != null) {
+            // fast way
+            long r = getRemainingLength();
+            if (r <= 0)
+                return 0;
+            long n = coord.getNeededLength();
+            return r - n;
+        } else if (storage != null) {
+            // slow way
+            return storage.getSkippedLength();
+        }
+        return 0;
+    }
+
+    /**
      *  Does not account (i.e. includes) for skipped files.
      *  @return number of pieces still needed (magnet mode or not), or -1 if unknown

apps/i2psnark/java/src/org/klomp/snark/Storage.java

@@ -515 +515 @@
           }
           rv[i] = pri;
+      }
+      return rv;
+  }
+
+  /**
+   *  Call setPriority() for all changed files first,
+   *  then call this.
+   *  The length of all the pieces that are not yet downloaded,
+   *  and are set to skipped.
+   *  This is not the same as the total of all skipped files,
+   *  since pieces may span multiple files.
+   *
+   *  @return 0 on error, if complete, or if only one file
+   *  @since 0.9.24
+   */
+  public long getSkippedLength() {
+      int[] pri = getPiecePriorities();
+      if (pri == null)
+          return 0;
+      long rv = 0;
+      final int end = pri.length - 1;
+      for (int i = 0; i <= end; i++) {
+          if (pri[i] <= -9 && !bitfield.get(i)) {
+              rv += (i != end) ? piece_size : metainfo.getPieceLength(i);
+          }
       }
       return rv;

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -2917 +2917 @@
                    .append(formatSize(needed));
             }
+            long skipped = snark.getSkippedLength();
+            if (skipped > 0) {
+                buf.append(" ");
+                toThemeImg(buf, "head_rx");
+                buf.append("&nbsp;<b>")
+                   .append(_t("Skipped"))
+                   .append(":</b> ")
+                   .append(formatSize(skipped));
+            }
             if (meta != null) {
                 List<List<String>> files = meta.getFiles();