- simplify request containers

- statistics bugs
- fix missing annotation in consensus api
- work on voting

14 files changed, 65 insertions, 67 deletions

diff --git a/src/main/java/org/gnunet/util/AbsoluteTime.java b/src/main/java/org/gnunet/util/AbsoluteTime.java
index 07dd816..b6ab811 100644
--- a/src/main/java/org/gnunet/util/AbsoluteTime.java
+++ b/src/main/java/org/gnunet/util/AbsoluteTime.java
@@ -278,7 +278,7 @@ public class AbsoluteTime implements Comparable<AbsoluteTime> {
     }
 
     public String toFancyString() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return sdf.format(new Date(getMilliseconds()));
     }
 
diff --git a/src/main/java/org/gnunet/util/Client.java b/src/main/java/org/gnunet/util/Client.java
index 02e59aa..5ca60ce 100644
--- a/src/main/java/org/gnunet/util/Client.java
+++ b/src/main/java/org/gnunet/util/Client.java
@@ -77,7 +77,7 @@ public class Client extends MessageQueue {
     private boolean notifyTransmitReadyDelayed;
 
     /**
-     * When notifyTransmitReadyDelayed is true, This can be used to cancel the task
+     * When notifyTransmitReadyDelayed is true, This can be used to onCancel the task
      * waiting for the connection to be established.
      */
     private Cancelable delayedNotifyTransmitHandle;
@@ -91,7 +91,7 @@ public class Client extends MessageQueue {
     private boolean receiverActive;
 
     /**
-     * Handle to cancel the message currently submitted in the queue,
+     * Handle to onCancel the message currently submitted in the queue,
      */
     private Cancelable currentSubmit;
     private Scheduler.TaskIdentifier receiverLifenessTask;
@@ -163,9 +163,9 @@ public class Client extends MessageQueue {
      *                    for example because the protocol is stateless
      * @param size        size of the message we want to transmit, can be an upper bound
      * @param transmitter the MessageTransmitter object to call once the client is ready to transmit or
-     *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.  @return a handle that can be used to cancel the transmit request
+     *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.  @return a handle that can be used to onCancel the transmit getRequestIdentifier
      *
-     * @return a handle to cancel the notification
+     * @return a handle to onCancel the notification
      */
     public Cancelable notifyTransmitReady(final RelativeTime timeout,
                                           final boolean autoRetry, int size, final MessageTransmitter transmitter) {
@@ -230,7 +230,7 @@ public class Client extends MessageQueue {
      * @param timeout when should we give up sending the message, and call cont.cont(false)
      * @param message the message to send
      * @param cont called when the message has been sent successfully or on error
-     * @return a handle to cancel sending the message
+     * @return a handle to onCancel sending the message
      */
     public Cancelable transmitWhenReady(final RelativeTime timeout, final GnunetMessage.Body message, final Continuation cont) {
         return notifyTransmitReady(timeout, false, 0, new MessageTransmitter() {
@@ -256,7 +256,7 @@ public class Client extends MessageQueue {
      *
      * @param message the message to send
      * @param cont called when the message has been sent successfully or on error
-     * @return a handle to cancel sending the message
+     * @return a handle to onCancel sending the message
      */
     public Cancelable transmitWhenReady(final GnunetMessage.Body message, final Continuation cont) {
         return transmitWhenReady(RelativeTime.FOREVER, message, cont);
@@ -270,12 +270,9 @@ public class Client extends MessageQueue {
     }
 
     /**
-     * Disconnect from the service. Cancel all pending receive/transmit requests.
+     * Disconnect from the service. Cancels all pending receive/transmit requests.
      */
     public void disconnect() {
-        if (notifyTransmitReadyDelayed) {
-            logger.error("disconnecting while notifyTransmitReady is pending");
-        }
         connection.disconnect();
         connection = null;
         if (receiverLifenessTask != null) {
diff --git a/src/main/java/org/gnunet/util/Connection.java b/src/main/java/org/gnunet/util/Connection.java
index 9e136a8..cce32a4 100644
--- a/src/main/java/org/gnunet/util/Connection.java
+++ b/src/main/java/org/gnunet/util/Connection.java
@@ -141,12 +141,12 @@ public class Connection {
     }
 
     /**
-     * Represents a request for transmission.
+     * Represents a getRequestIdentifier for transmission.
      */
     public interface TransmitHandle extends Cancelable {
         /**
-         * Cancel a request for the transmit ready notification.
-         * This does *not* cancel a transmission that already has been started.
+         * Cancel a getRequestIdentifier for the transmit ready notification.
+         * This does *not* onCancel a transmission that already has been started.
          */
         public void cancel();
     }
@@ -298,7 +298,7 @@ public class Connection {
             }
             // timeout is forever, because there is no way to directly limit the transmission time
             // of a message, only the max. wait time before transmission.
-            // cancel must be called on the transmitTask if we disconnect
+            // onCancel must be called on the transmitTask if we disconnect
             Scheduler.TaskConfiguration tc = new Scheduler.TaskConfiguration(RelativeTime.FOREVER, this);
             tc.addSelectEvent(connectionChannel, SelectionKey.OP_WRITE);
             this.transmitTask = tc.schedule();
@@ -549,7 +549,7 @@ public class Connection {
      * @param timeout     after how long should we give up (and call transmitter.transmit(null))
      * @param transmitter the MessageTransmitter object to call once the client is ready to transmit or
      *                    when the timeout is over. Guaranteed to be called *after* notifyTransmitReady has returned.
-     * @return a handle that can be used to cancel the transmit request, null if request could be satisfied immediately
+     * @return a handle that can be used to onCancel the transmit getRequestIdentifier, null if getRequestIdentifier could be satisfied immediately
      */
     public TransmitHandle notifyTransmitReady(int size, RelativeTime timeout, final MessageTransmitter transmitter) {
         if (disconnected) {
@@ -557,7 +557,7 @@ public class Connection {
         }
         if (nextTransmitHelper != null) {
             throw new AssertionError(
-                    "previous transmit request must have completed before calling notifyTransmitReady again");
+                    "previous transmit getRequestIdentifier must have completed before calling notifyTransmitReady again");
         }
 
         if (timeout.getMicroseconds() <= 0) {
@@ -593,7 +593,7 @@ public class Connection {
      * @param cont    continuation to call
      * @return
      */
-    /* package-protected */ Cancelable notifyConnected(RelativeTime timeout, final Continuation cont) {
+    Cancelable notifyConnected(RelativeTime timeout, final Continuation cont) {
         if (notifyConnectedTimeout != null) {
             throw new AssertionError();
         }
@@ -621,6 +621,10 @@ public class Connection {
             logger.error("disconnect called twice");
         }
         disconnected = true;
+        if (notifyConnectedTimeout != null) {
+            notifyConnectedTimeout.cancel();
+            notifyConnectedTimeout = null;
+        }
         if (receiveTaskId != null) {
             receiveTaskId.cancel();
             receiveTaskId = null;
diff --git a/src/main/java/org/gnunet/util/Helper.java b/src/main/java/org/gnunet/util/Helper.java
index 8256ab9..1462cf2 100644
--- a/src/main/java/org/gnunet/util/Helper.java
+++ b/src/main/java/org/gnunet/util/Helper.java
@@ -26,7 +26,6 @@ import org.gnunet.mq.MessageQueue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOError;
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
index a2da4c9..9beb632 100644
--- a/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
+++ b/src/main/java/org/gnunet/util/MessageStreamTokenizer.java
@@ -26,12 +26,8 @@ import org.gnunet.construct.ProtocolViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOError;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.channels.Channel;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.Pipe;
 import java.nio.channels.ReadableByteChannel;
 
 /**
diff --git a/src/main/java/org/gnunet/util/MessageTransmitter.java b/src/main/java/org/gnunet/util/MessageTransmitter.java
index 54a6555..2b63c8c 100644
--- a/src/main/java/org/gnunet/util/MessageTransmitter.java
+++ b/src/main/java/org/gnunet/util/MessageTransmitter.java
@@ -35,9 +35,9 @@ public interface MessageTransmitter {
 
 
     /**
-     * Called when the transmit request could not be fullfilled.
+     * Called when the transmit getRequestIdentifier could not be fullfilled.
      *
-     * After transmit has been called, handleError will not be called anymore (until the next transmit request)
+     * After transmit has been called, handleError will not be called anymore (until the next transmit getRequestIdentifier)
      */
     void handleError();
 }
diff --git a/src/main/java/org/gnunet/util/Program.java b/src/main/java/org/gnunet/util/Program.java
index faacbe1..31b4924 100644
--- a/src/main/java/org/gnunet/util/Program.java
+++ b/src/main/java/org/gnunet/util/Program.java
@@ -73,30 +73,18 @@ public abstract class Program {
             action = ArgumentAction.STORE_STRING)
     public String logFile;
 
-
+    /**
+     * Positional arguments, excluding those that have been processed
+     * by the command line parser.
+     */
     protected String[] unprocessedArgs;
 
-    private final String[] args;
-
-    private int returnValue = 0;
-
-
     /**
-     * A program with the desired environment for a GNUnet utility.
-     * While executing, the scheduler is guaranteed to run, command arguments are parsed,
-     * the default configuration is loaded and the DNS Resolver is initialized.
-     *
-     * @param args array of command line arguments to parse. used to automatically load additional settings
-     *             and configure log levels.
+     * Return value for the program.
+     * We prefer setting the return value, as System.exit(...) does bad things sometimes.
+     * (In JUnit test cases, for instance)
      */
-    public Program(String... args) {
-        this.args = args;
-
-        /*
-         * Remember: We can't parse command line arguments here, as java's initialization order
-         * dictates that member variables of subclasses are initialized *after* the superclass constructor (here).
-         */
-    }
+    private int returnValue = 0;
 
     /**
      * Configure logging with the given log level and log file.
@@ -202,7 +190,7 @@ public abstract class Program {
      *                      is invoked inside a scheduler task or not
      * @return the exit value of the program
      */
-    public final int start(boolean withScheduler) {
+    public final int start(boolean withScheduler, String... args) {
         Parser optParser = new Parser(this);
         unprocessedArgs = optParser.parse(args);
 
@@ -246,8 +234,8 @@ public abstract class Program {
      *
      * @return the exit value of the program
      */
-    public final int start() {
-        return start(true);
+    public final int start(String... args) {
+        return start(true, args);
     }
 
 
@@ -256,7 +244,7 @@ public abstract class Program {
      *
      * @return the exit value of the program
      */
-    public final int startWithoutScheduler() {
-        return start(false);
+    public final int startWithoutScheduler(String... args) {
+        return start(false, args);
     }
 }
diff --git a/src/main/java/org/gnunet/util/RelativeTime.java b/src/main/java/org/gnunet/util/RelativeTime.java
index fec8f80..188d9ac 100644
--- a/src/main/java/org/gnunet/util/RelativeTime.java
+++ b/src/main/java/org/gnunet/util/RelativeTime.java
@@ -236,4 +236,9 @@ public final class RelativeTime implements Comparable<RelativeTime> {
     public long getSeconds() {
         return rel_value_us / (1000 * 1000);
     }
+
+    public static RelativeTime fromSeconds(long i) {
+        RelativeTime relativeTime = new RelativeTime(i * 1000 * 1000);
+        return relativeTime;
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Resolver.java b/src/main/java/org/gnunet/util/Resolver.java
index 3ddcfa4..f6c2e00 100644
--- a/src/main/java/org/gnunet/util/Resolver.java
+++ b/src/main/java/org/gnunet/util/Resolver.java
@@ -22,7 +22,6 @@ package org.gnunet.util;
 
 import com.google.common.net.InetAddresses;
 import org.gnunet.construct.*;
-import org.gnunet.construct.ProtocolViolationException;
 import org.gnunet.util.getopt.Argument;
 import org.gnunet.util.getopt.ArgumentAction;
 import org.slf4j.Logger;
@@ -196,7 +195,7 @@ public class Resolver {
      * @param hostname hostname to resolve
      * @param timeout  timeout, calls cb.onTimeout on expiratoin
      * @param cb       callback
-     * @return a handle to cancel the request, null if request could be satisfied immediately
+     * @return a handle to onCancel the getRequestIdentifier, null if getRequestIdentifier could be satisfied immediately
      */
     public Cancelable resolveHostname(String hostname, RelativeTime timeout, final AddressCallback cb) {
         // try if hostname is numeric IP or loopback
@@ -352,7 +351,7 @@ public class Resolver {
 
 
     public static void main(final String[] argv) {
-        new Program(argv) {
+        new Program() {
             @Argument(shortname = "r", longname = "reverse",
                     description = "do reverse dns lookup",
                     action = ArgumentAction.SET)
@@ -411,6 +410,6 @@ public class Resolver {
             protected String makeHelpText() {
                 return "tool for forward and reverse DNS lookup";
             }
-        }.start();
+        }.start(argv);
     }
 }
diff --git a/src/main/java/org/gnunet/util/Scheduler.java b/src/main/java/org/gnunet/util/Scheduler.java
index 10b4bcf..ef801dd 100644
--- a/src/main/java/org/gnunet/util/Scheduler.java
+++ b/src/main/java/org/gnunet/util/Scheduler.java
@@ -214,7 +214,7 @@ public class Scheduler {
                 }
             }
             for (TaskIdentifier tt : executableTasks) {
-                // cancel subscriptions to other events, we can execute now!
+                // onCancel subscriptions to other events, we can execute now!
                 tt.deregister();
                 queueReady(tt);
             }
@@ -548,7 +548,7 @@ public class Scheduler {
         @Override
         public void cancel() {
             if (hasRun) {
-                throw new AssertionError("can't cancel task that already ran");
+                throw new AssertionError("can't onCancel task that already ran");
             }
             if (isCanceled) {
                 throw new AssertionError("task canceled twice");
@@ -557,7 +557,7 @@ public class Scheduler {
             scheduler.pending.remove(this);
         }
 
-        public void deregister() {
+        private void deregister() {
             if (subscriptions != null) {
                 subscriptions.stop(this);
             }
@@ -578,7 +578,7 @@ public class Scheduler {
         private SchedulerInstance scheduler;
 
         /**
-         * Create a TaskIdentifier.
+         * Create a TaskConfiguration.
          *
          * @param delay when will the task be run?
          *              may be null to indicate that this task may not be run
@@ -593,7 +593,7 @@ public class Scheduler {
             this.deadline = delay.toAbsolute();
         }
 
-        TaskConfiguration(RelativeTime delay, Task task) {
+        public TaskConfiguration(RelativeTime delay, Task task) {
             this(threadScheduler.get(), delay, task);
         }
 
@@ -624,6 +624,10 @@ public class Scheduler {
                 subscriptions = new Subscriptions(scheduler.selector);
             subscriptions.add(channel, event);
         }
+
+        public void setLifeness(boolean b) {
+            this.lifeness = b;
+        }
     }
 
     /**
@@ -651,7 +655,7 @@ public class Scheduler {
      *
      * @param delay time to wait until running the task
      * @param task  the task to run after delay
-     * @return the TaskIdentifier, can be used to cancel the task until it has been executed.
+     * @return the TaskIdentifier, can be used to onCancel the task until it has been executed.
      */
     public static TaskIdentifier addDelayed(RelativeTime delay, Task task) {
         TaskConfiguration tid = new TaskConfiguration(delay, task);
@@ -817,4 +821,11 @@ public class Scheduler {
         fpt.start();
         return new FilePipe(fpt);
     }
+
+    public static void debugPrintPendingTasks() {
+        System.err.println("pending tasks:");
+        for (TaskIdentifier i : threadScheduler.get().pending) {
+            System.err.println(i.task.getClass());
+        }
+    }
 }
diff --git a/src/main/java/org/gnunet/util/Server.java b/src/main/java/org/gnunet/util/Server.java
index 4d783a1..ccf977e 100644
--- a/src/main/java/org/gnunet/util/Server.java
+++ b/src/main/java/org/gnunet/util/Server.java
@@ -20,7 +20,6 @@
 
 package org.gnunet.util;
 
-import org.gnunet.construct.Construct;
 import org.grothoff.Runabout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -160,7 +159,7 @@ public class Server {
          * @param timeout     after how long should we give up (and call
          *                    notify with buf NULL and size 0)?
          * @param transmitter callback
-         * @return a handle to cancel the notification
+         * @return a handle to onCancel the notification
          */
         public Cancelable notifyTransmitReady(int size, RelativeTime timeout, MessageTransmitter transmitter) {
             return connection.notifyTransmitReady(size, timeout, transmitter);
@@ -172,7 +171,7 @@ public class Server {
          * @param timeout when should we give up sending the message, and call cont.cont(false)
          * @param message the message to send
          * @param cont called when the message has been sent successfully or on error
-         * @return a handle to cancel sending the message
+         * @return a handle to onCancel sending the message
          */
         public Cancelable transmitWhenReady(final RelativeTime timeout, final GnunetMessage.Body message, final Continuation cont) {
             return notifyTransmitReady(0, timeout, new MessageTransmitter() {
@@ -195,7 +194,7 @@ public class Server {
 
         /**
          * Resume receiving from this client, we are done processing the
-         * current request. This function must be called from within each
+         * current getRequestIdentifier. This function must be called from within each
          * message handler (or its respective continuations).
          * <p/>
          * The server does not automatically continue to receive messages to
diff --git a/src/main/java/org/gnunet/util/Service.java b/src/main/java/org/gnunet/util/Service.java
index a150089..af7529e 100644
--- a/src/main/java/org/gnunet/util/Service.java
+++ b/src/main/java/org/gnunet/util/Service.java
@@ -24,7 +24,8 @@ package org.gnunet.util;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -56,7 +57,6 @@ public abstract class Service extends Program {
     private Pipe.SourceChannel sigpipeChannel;
 
     public Service(String serviceName, RelativeTime idleTimeout, boolean requireFound, String[] args) {
-        super(args);
         this.serviceName = serviceName;
         this.idleTimeout = idleTimeout;
         this.requireFound = requireFound;
diff --git a/src/main/java/org/gnunet/util/crypto/Ed25519.java b/src/main/java/org/gnunet/util/crypto/Ed25519.java
index 673d86d..e335c99 100644
--- a/src/main/java/org/gnunet/util/crypto/Ed25519.java
+++ b/src/main/java/org/gnunet/util/crypto/Ed25519.java
@@ -24,7 +24,6 @@ package org.gnunet.util.crypto;
 import java.math.BigInteger;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
 
 /**
  * Java-only implementation of arithmetic on DJBs Ed25519.
diff --git a/src/main/java/org/gnunet/util/getopt/Parser.java b/src/main/java/org/gnunet/util/getopt/Parser.java
index 135e6f8..cd1603a 100644
--- a/src/main/java/org/gnunet/util/getopt/Parser.java
+++ b/src/main/java/org/gnunet/util/getopt/Parser.java
@@ -21,6 +21,7 @@
 package org.gnunet.util.getopt;
 
 import org.gnunet.construct.ReflectUtil;
+
 import java.lang.reflect.Field;
 import java.util.*;