[GNUnet-SVN] r17952 - in gnunet-java/src/org/gnunet/util: network scheduler

[gnunet]

Author: dold
Date: 2011-11-02 22:00:58 +0100 (Wed, 02 Nov 2011)
New Revision: 17952

Added:
   gnunet-java/src/org/gnunet/util/scheduler/ScheduleSpec.java
Removed:
   gnunet-java/src/org/gnunet/util/scheduler/TaskPrerequisites.java
Modified:
   gnunet-java/src/org/gnunet/util/network/Client.java
   gnunet-java/src/org/gnunet/util/network/Message.java
   gnunet-java/src/org/gnunet/util/scheduler/Scheduler.java
   gnunet-java/src/org/gnunet/util/scheduler/Task.java
Log:
scheduler

Modified: gnunet-java/src/org/gnunet/util/network/Client.java
===================================================================
--- gnunet-java/src/org/gnunet/util/network/Client.java 2011-11-02 20:38:17 UTC 
(rev 17951)
+++ gnunet-java/src/org/gnunet/util/network/Client.java 2011-11-02 21:00:58 UTC 
(rev 17952)
@@ -97,9 +97,7 @@
         * @return GNUNET_OK on success, GNUNET_SYSERR if a request
         *         is already pending
         */
-       // XXX: should rettype really be bool?
-       // XXX: how to represent the message? does the original function really 
only
-       // get the header?
+       //XXX return type bool vs. exceptions
        public boolean transmitAndGetResponse(Message m, RelativeTime timeout,
                        boolean autoRetry, MessageHandler handler) {
                throw new UnsupportedOperationException();

Modified: gnunet-java/src/org/gnunet/util/network/Message.java
===================================================================
--- gnunet-java/src/org/gnunet/util/network/Message.java        2011-11-02 
20:38:17 UTC (rev 17951)
+++ gnunet-java/src/org/gnunet/util/network/Message.java        2011-11-02 
21:00:58 UTC (rev 17952)
@@ -2,4 +2,9 @@
 
 public class Message {
 
+       public int type;
+       
+       // size is implicit in contents. does this cover all use cases?
+       public byte[] contents;
+       
 }

Copied: gnunet-java/src/org/gnunet/util/scheduler/ScheduleSpec.java (from rev 
17950, gnunet-java/src/org/gnunet/util/scheduler/TaskPrerequisites.java)
===================================================================
--- gnunet-java/src/org/gnunet/util/scheduler/ScheduleSpec.java                 
        (rev 0)
+++ gnunet-java/src/org/gnunet/util/scheduler/ScheduleSpec.java 2011-11-02 
21:00:58 UTC (rev 17952)
@@ -0,0 +1,34 @@
+package org.gnunet.util.scheduler;
+
+import java.nio.channels.Channel;
+
+public class ScheduleSpec {
+       /**
+        * require the completion of another task before starting this one 
+        */
+       public void setPrerequisiteTask(Task t) {
+               throw new UnsupportedOperationException();
+       }
+       
+       public void addWritable(Channel c) {
+               throw new UnsupportedOperationException();
+       }
+       
+       public void addReadable(Channel c) {
+               throw new UnsupportedOperationException();
+       }
+       
+       public void setDelay() {
+               throw new UnsupportedOperationException();
+       }
+       
+       public void setPriority(Task.Priority p) {
+               throw new UnsupportedOperationException();
+       }
+       
+       public void setLiveness(boolean liveness) {
+               throw new UnsupportedOperationException();
+       }
+       
+       
+}

Modified: gnunet-java/src/org/gnunet/util/scheduler/Scheduler.java
===================================================================
--- gnunet-java/src/org/gnunet/util/scheduler/Scheduler.java    2011-11-02 
20:38:17 UTC (rev 17951)
+++ gnunet-java/src/org/gnunet/util/scheduler/Scheduler.java    2011-11-02 
21:00:58 UTC (rev 17952)
@@ -23,12 +23,12 @@
         * @param task
         *            task to run first (and immediately)
         */
-       public void run(Task task, TaskPrerequisites pre) {
+       public void run(Task task, ScheduleSpec spec) {
                throw new UnsupportedOperationException();
        }
        
        /**
-        * run with empty prerequisites
+        * run with default spec (=> as soon as possible)
         */
        public void run(Task task) {
                throw new UnsupportedOperationException();

Modified: gnunet-java/src/org/gnunet/util/scheduler/Task.java
===================================================================
--- gnunet-java/src/org/gnunet/util/scheduler/Task.java 2011-11-02 20:38:17 UTC 
(rev 17951)
+++ gnunet-java/src/org/gnunet/util/scheduler/Task.java 2011-11-02 21:00:58 UTC 
(rev 17952)
@@ -13,9 +13,8 @@
                KEEP, IDLE, BACKGROUND, DEFAULT, HIGH, UI, URGENT, SHUTDOWN
        };
        
-       
        /*
-       // Unique Task Identifier, XXX do we need this?
+       // Unique Task Identifier, XXX do we/ need this?
        int id;
        
        int prereq_id;

Deleted: gnunet-java/src/org/gnunet/util/scheduler/TaskPrerequisites.java
===================================================================
--- gnunet-java/src/org/gnunet/util/scheduler/TaskPrerequisites.java    
2011-11-02 20:38:17 UTC (rev 17951)
+++ gnunet-java/src/org/gnunet/util/scheduler/TaskPrerequisites.java    
2011-11-02 21:00:58 UTC (rev 17952)
@@ -1,5 +0,0 @@
-package org.gnunet.util.scheduler;
-
-public class TaskPrerequisites {
-
-}