edits

diff --git a/src/java/iotcloud/CloudComm.java b/src/java/iotcloud/CloudComm.java
index 6d421b5513630ebc1c9929fdafefc95d00eba0ac..84d7ae4b02cc95ae4d1ba7ca3c52c920d84963e1 100644 (file)
--- a/src/java/iotcloud/CloudComm.java
+++ b/src/java/iotcloud/CloudComm.java
@@ -12,7 +12,7 @@ class CloudComm {
 
        CloudComm() {
        }
 
        CloudComm() {
        }

-       
+

        CloudComm(String _baseurl, Cipher _encrypt, Cipher _decrypt, Mac _mac) {
                this.baseurl=_baseurl;
                this.encryptcipher = _encrypt;
        CloudComm(String _baseurl, Cipher _encrypt, Cipher _decrypt, Mac _mac) {
                this.baseurl=_baseurl;
                this.encryptcipher = _encrypt;

diff --git a/src/java/iotcloud/Pair.java b/src/java/iotcloud/Pair.java
index 5cbe1db7541eacdb01a6bd86fbd31945fc7243ca..73ed6bd440b0858d2c9022c73014b7c07d3088f7 100644 (file)
--- a/src/java/iotcloud/Pair.java
+++ b/src/java/iotcloud/Pair.java
@@ -3,7 +3,7 @@ package iotcloud;
 class Pair<A,B> {
        private A a;
        private B b;
 class Pair<A,B> {
        private A a;
        private B b;

-  
+

        Pair(A a, B b) {
                this.a=a;
                this.b=b;
        Pair(A a, B b) {
                this.a=a;
                this.b=b;

diff --git a/src/java/iotcloud/RejectedMessage.java b/src/java/iotcloud/RejectedMessage.java
index bd52ed0597898f36cecceee74bf1ac27b170889b..167521ff3ad02eeae2805e5049e5a367c15ac91f 100644 (file)
--- a/src/java/iotcloud/RejectedMessage.java
+++ b/src/java/iotcloud/RejectedMessage.java
@@ -3,9 +3,9 @@ import java.nio.ByteBuffer;
 
 class RejectedMessage extends Entry {
        private long machineid;
 
 class RejectedMessage extends Entry {
        private long machineid;

-       private long oldseqnum;                                                                                         //Oldest seqnum in range
-       private long newseqnum;                                                                                         //Newest seqnum in range (inclusive)
-       private boolean equalto;                                                                                                                        //Is message sent or not sent by machineid
+       private long oldseqnum;                                                                                                                                                                                                                                                                                                                                                                                         //Oldest seqnum in range
+       private long newseqnum;                                                                                                                                                                                                                                                                                                                                                                                         //Newest seqnum in range (inclusive)
+       private boolean equalto;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        //Is message sent or not sent by machineid

 
        RejectedMessage(Slot slot, long _machineid, long _oldseqnum, long _newseqnum, boolean _equalto) {
                super(slot);
 
        RejectedMessage(Slot slot, long _machineid, long _oldseqnum, long _newseqnum, boolean _equalto) {
                super(slot);

diff --git a/src/java/iotcloud/Slot.java b/src/java/iotcloud/Slot.java
index 115c76120f9382dc2c0f47b6a82851b4f458b68b..ea30ddbe93658c8d6642d1b0cfdb321442855a44 100644 (file)
--- a/src/java/iotcloud/Slot.java
+++ b/src/java/iotcloud/Slot.java
@@ -17,7 +17,7 @@ class Slot implements Liveness {
        private int livecount;
        private boolean seqnumlive;
        private int freespace;
        private int livecount;
        private boolean seqnumlive;
        private int freespace;

-       
+

        Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
                seqnum=_seqnum;
                machineid=_machineid;
        Slot(long _seqnum, long _machineid, byte[] _prevhmac, byte[] _hmac) {
                seqnum=_seqnum;
                machineid=_machineid;


@@ -60,7 +60,7 @@ class Slot implements Liveness {
                int newfreespace = freespace - e.getSize();
                return newfreespace >= 0;
        }
                int newfreespace = freespace - e.getSize();
                return newfreespace >= 0;
        }

-       
+

        Vector<Entry> getEntries() {
                return entries;
        }
        Vector<Entry> getEntries() {
                return entries;
        }


@@ -92,7 +92,7 @@ class Slot implements Liveness {
        byte[] encode(Mac mac) {
                byte[] array=new byte[SLOT_SIZE];
                ByteBuffer bb=ByteBuffer.wrap(array);
        byte[] encode(Mac mac) {
                byte[] array=new byte[SLOT_SIZE];
                ByteBuffer bb=ByteBuffer.wrap(array);

-               bb.position(HMAC_SIZE);                                                                                                                                                                                                                                                 //Leave space for the HMACs
+               bb.position(HMAC_SIZE);                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 //Leave space for the HMACs

                bb.put(prevhmac);
                bb.putLong(seqnum);
                bb.putLong(machineid);
                bb.put(prevhmac);
                bb.putLong(seqnum);
                bb.putLong(machineid);


@@ -111,7 +111,7 @@ class Slot implements Liveness {
        int getBaseSize() {
                return 2*HMAC_SIZE+2*Long.BYTES+Integer.BYTES;
        }
        int getBaseSize() {
                return 2*HMAC_SIZE+2*Long.BYTES+Integer.BYTES;
        }

-       
+

        Vector<Entry> getLiveEntries() {
                Vector<Entry> liveEntries=new Vector<Entry>();
                for(Entry entry: entries)
        Vector<Entry> getLiveEntries() {
                Vector<Entry> liveEntries=new Vector<Entry>();
                for(Entry entry: entries)


@@ -120,10 +120,10 @@ class Slot implements Liveness {
 
                if (seqnumlive)
                        liveEntries.add(new LastMessage(this, machineid, seqnum));
 
                if (seqnumlive)
                        liveEntries.add(new LastMessage(this, machineid, seqnum));

-               
+

                return liveEntries;
        }
                return liveEntries;
        }

-       
+

        long getSequenceNumber() {
                return seqnum;
        }
        long getSequenceNumber() {
                return seqnum;
        }


@@ -140,7 +140,7 @@ class Slot implements Liveness {
                decrementLiveCount();
                seqnumlive=false;
        }
                decrementLiveCount();
                seqnumlive=false;
        }

-       
+

        void decrementLiveCount() {
                livecount--;
        }
        void decrementLiveCount() {
                livecount--;
        }

diff --git a/src/java/iotcloud/SlotBuffer.java b/src/java/iotcloud/SlotBuffer.java
index 054d4fc396bc4b4fca1410d51439492858e11d9a..3d5a465d3a3a5f4f98e8a5391b9760efd1e699c1 100644 (file)
--- a/src/java/iotcloud/SlotBuffer.java
+++ b/src/java/iotcloud/SlotBuffer.java
@@ -23,7 +23,7 @@ class SlotBuffer {
        int capacity() {
                return array.length - 1;
        }
        int capacity() {
                return array.length - 1;
        }

-       
+

        void resize(int newsize) {
                if (newsize == (array.length-1))
                        return;
        void resize(int newsize) {
                if (newsize == (array.length-1))
                        return;


@@ -40,20 +40,27 @@ class SlotBuffer {
                head = 0;
        }
 
                head = 0;
        }
 

-       void putSlot(Slot s) {
-               array[head]=s;
+       private void incrementHead() {

                head++;
                if (head >= array.length)
                        head=0;
                head++;
                if (head >= array.length)
                        head=0;

-               
+       }
+
+       private void incrementTail() {
+               tail++;
+               if (tail >= array.length)
+                       tail=0;
+       }
+
+       void putSlot(Slot s) {
+               array[head]=s;
+               incrementHead();
+

                if (oldestseqn==0)
                        oldestseqn = s.getSequenceNumber();
 
                if (head==tail) {
                if (oldestseqn==0)
                        oldestseqn = s.getSequenceNumber();
 
                if (head==tail) {

-                       tail++;
-                       if (tail >= array.length)
-                               tail=0;
-                       
+                       incrementTail();

                        oldestseqn++;
                }
        }
                        oldestseqn++;
                }
        }


@@ -61,24 +68,18 @@ class SlotBuffer {
        Slot getSlot(long seqnum) {
                int diff=(int) (seqnum-oldestseqn);
                int index=diff + tail;
        Slot getSlot(long seqnum) {
                int diff=(int) (seqnum-oldestseqn);
                int index=diff + tail;

-               if (index > array.length) {
+               if (index >= array.length) {

                        if (head >= tail)
                                return null;
                        index-= array.length;
                }
 
                        if (head >= tail)
                                return null;
                        index-= array.length;
                }
 

-               if (index >= array.length ||
-                               index >= head)
+               if (index >= array.length)

                        return null;
                        return null;

-               if (index < 0) {
-                       System.out.println("seqnum="+seqnum);
-                       System.out.println("olestseqn="+oldestseqn);
-                       System.out.println("diff="+diff);
-                       System.out.println("tail="+tail);

 
 

+               if (head >= tail && index >= head)
+                       return null;

 
 

-               }
-               

                return array[index];
        }
 
                return array[index];
        }
 

diff --git a/src/java/iotcloud/Table.java b/src/java/iotcloud/Table.java
index 72b4927ef245ff965af19884d4e677353a41212a..c92aef93ec4b7df6c918fca27dec4e8093a77141 100644 (file)
--- a/src/java/iotcloud/Table.java
+++ b/src/java/iotcloud/Table.java
@@ -14,10 +14,10 @@ final public class Table {
        private Mac hmac;
        private long sequencenumber;
        private long localmachineid;
        private Mac hmac;
        private long sequencenumber;
        private long localmachineid;

-  private TableStatus lastTableStatus;
-  static final int FREE_SLOTS = 10;
-  static final int FORCED_RESIZE_INCREMENT = 20;
-  
+       private TableStatus lastTableStatus;
+       static final int FREE_SLOTS = 10;
+       static final int FORCED_RESIZE_INCREMENT = 20;
+

        public Table(String baseurl, String password, long _localmachineid) {
                localmachineid=_localmachineid;
                buffer = new SlotBuffer();
        public Table(String baseurl, String password, long _localmachineid) {
                localmachineid=_localmachineid;
                buffer = new SlotBuffer();


@@ -33,7 +33,7 @@ final public class Table {
                sequencenumber = 0;
                cloud=_cloud;
        }
                sequencenumber = 0;
                cloud=_cloud;
        }

-       
+

        private void initCloud(String baseurl, String password) {
                try {
                        SecretKeySpec secret=getKey(password);
        private void initCloud(String baseurl, String password) {
                try {
                        SecretKeySpec secret=getKey(password);


@@ -62,6 +62,7 @@ final public class Table {
 
        public void update() {
                Slot[] newslots=cloud.getSlots(sequencenumber+1);
 
        public void update() {
                Slot[] newslots=cloud.getSlots(sequencenumber+1);

+

                validateandupdate(newslots, false);
        }
 
                validateandupdate(newslots, false);
        }
 


@@ -77,96 +78,96 @@ final public class Table {
                Slot s=new Slot(1, localmachineid);
                TableStatus status=new TableStatus(s, numslots);
                s.addEntry(status);
                Slot s=new Slot(1, localmachineid);
                TableStatus status=new TableStatus(s, numslots);
                s.addEntry(status);

-    Slot[] array=cloud.putSlot(s, numslots);
-    if (array == null) {
-      array = new Slot[] {s};
-                       validateandupdate(array, true); // update data structure
+               Slot[] array=cloud.putSlot(s, numslots);
+               if (array == null) {
+                       array = new Slot[] {s};
+                       validateandupdate(array, true);                                                                         // update data structure

                } else {
                        throw new Error("Error on initialization");
                }
        }
                } else {
                        throw new Error("Error on initialization");
                }
        }

-       
+

        public IoTString put(IoTString key, IoTString value) {
        public IoTString put(IoTString key, IoTString value) {

-    while(true) {
-      KeyValue oldvalue=table.get(key);
-      if (tryput(key, value, false)) {
+               while(true) {
+                       KeyValue oldvalue=table.get(key);
+                       if (tryput(key, value, false)) {

                                if (oldvalue==null)
                                        return null;
                                else
                                        return oldvalue.getValue();
                                if (oldvalue==null)
                                        return null;
                                else
                                        return oldvalue.getValue();

-      }
-    }
-  }
+                       }
+               }
+       }

 
 

-  private boolean tryput(IoTString key, IoTString value, boolean forcedresize) {
+       private boolean tryput(IoTString key, IoTString value, boolean forcedresize) {

                Slot s=new Slot(sequencenumber+1, localmachineid, buffer.getSlot(sequencenumber).getHMAC());
                Slot s=new Slot(sequencenumber+1, localmachineid, buffer.getSlot(sequencenumber).getHMAC());

-    long seqn = buffer.getOldestSeqNum();
+               long seqn = buffer.getOldestSeqNum();

 
                if (forcedresize) {
                        TableStatus status=new TableStatus(s, FORCED_RESIZE_INCREMENT + numslots);
                        s.addEntry(status);
                }
 
                if (forcedresize) {
                        TableStatus status=new TableStatus(s, FORCED_RESIZE_INCREMENT + numslots);
                        s.addEntry(status);
                }

-               
-    if ((numslots - buffer.size()) < FREE_SLOTS) {
-      //have to check whether we have enough free slots
-      long fullfirstseqn = buffer.getNewestSeqNum() + 1 - numslots;
-                       seqn = fullfirstseqn < 1 ? 1: fullfirstseqn;
-      for(int i=0; i < FREE_SLOTS; i++, seqn++) {
-        Slot prevslot=buffer.getSlot(seqn);
-        if (!prevslot.isLive())
-          continue;
-        Vector<Entry> liveentries = prevslot.getLiveEntries();
-        for(Entry liveentry:liveentries) {
+
+               if ((numslots - buffer.size()) < FREE_SLOTS) {
+                       //have to check whether we have enough free slots
+                       long fullfirstseqn = buffer.getNewestSeqNum() + 1 - numslots;
+                       seqn = fullfirstseqn < 1?1:fullfirstseqn;
+                       for(int i=0; i < FREE_SLOTS; i++, seqn++) {
+                               Slot prevslot=buffer.getSlot(seqn);
+                               if (!prevslot.isLive())
+                                       continue;
+                               Vector<Entry> liveentries = prevslot.getLiveEntries();
+                               for(Entry liveentry:liveentries) {

                                        if (redundant(liveentry))
                                                continue;
                                        if (redundant(liveentry))
                                                continue;

-          if (s.hasSpace(liveentry))
-            s.addEntry(liveentry);
-          else if (i==0) {
-            if (s.canFit(liveentry))
-              s.addEntry(liveentry);
-            else if (!forcedresize) {
-              return tryput(key, value, true);
+                                       if (s.hasSpace(liveentry))
+                                               s.addEntry(liveentry);
+                                       else if (i==0) {
+                                               if (s.canFit(liveentry))
+                                                       s.addEntry(liveentry);
+                                               else if (!forcedresize) {
+                                                       return tryput(key, value, true);

                                                }
                                        }
                                                }
                                        }

-        }
-      }
-    }
-    KeyValue kv=new KeyValue(s, key, value);
-    boolean insertedkv=false;
-    if (s.hasSpace(kv)) {
-      s.addEntry(kv);
-      insertedkv=true;
-    }
-
-    long newestseqnum=buffer.getNewestSeqNum();
-    search:
-    for(;seqn<=newestseqnum;seqn++) {
-      Slot prevslot=buffer.getSlot(seqn);
-      if (!prevslot.isLive())
-        continue;
-      Vector<Entry> liveentries = prevslot.getLiveEntries();
-      for(Entry liveentry:liveentries) {
+                               }
+                       }
+               }
+               KeyValue kv=new KeyValue(s, key, value);
+               boolean insertedkv=false;
+               if (s.hasSpace(kv)) {
+                       s.addEntry(kv);
+                       insertedkv=true;
+               }
+
+               long newestseqnum=buffer.getNewestSeqNum();
+search:
+               for(; seqn<=newestseqnum; seqn++) {
+                       Slot prevslot=buffer.getSlot(seqn);
+                       if (!prevslot.isLive())
+                               continue;
+                       Vector<Entry> liveentries = prevslot.getLiveEntries();
+                       for(Entry liveentry:liveentries) {

                                if (redundant(liveentry))
                                        continue;
                                if (redundant(liveentry))
                                        continue;

-        if (s.hasSpace(liveentry))
-          s.addEntry(liveentry);
-        else
-          break search;
-      }
-    }
-    
-    int max=0;
-    if (forcedresize)
-      max = numslots + FORCED_RESIZE_INCREMENT;
-    Slot[] array=cloud.putSlot(s, max);
-    if (array == null)
-      array = new Slot[] {s};
-    else
-      insertedkv=false;
-    
-               validateandupdate(array, true); // update data structure
-    
-    return insertedkv;
+                               if (s.hasSpace(liveentry))
+                                       s.addEntry(liveentry);
+                               else
+                                       break search;
+                       }
+               }
+
+               int max=0;
+               if (forcedresize)
+                       max = numslots + FORCED_RESIZE_INCREMENT;
+               Slot[] array=cloud.putSlot(s, max);
+               if (array == null)
+                       array = new Slot[] {s};
+               else
+                       insertedkv=false;
+
+               validateandupdate(array, true);                                                 // update data structure
+
+               return insertedkv;

        }
 
        boolean redundant(Entry liveentry) {
        }
 
        boolean redundant(Entry liveentry) {


@@ -177,7 +178,7 @@ final public class Table {
                return false;
        }
 
                return false;
        }
 

-       
+

        private void validateandupdate(Slot[] newslots, boolean isput) {
                //The cloud communication layer has checked slot HMACs already
                //before decoding
        private void validateandupdate(Slot[] newslots, boolean isput) {
                //The cloud communication layer has checked slot HMACs already
                //before decoding


@@ -191,55 +192,55 @@ final public class Table {
                SlotIndexer indexer = new SlotIndexer(newslots, buffer);
                checkHMACChain(indexer, newslots);
 
                SlotIndexer indexer = new SlotIndexer(newslots, buffer);
                checkHMACChain(indexer, newslots);
 

-    initExpectedSize();
-    for(Slot slot: newslots) {
-      updateExpectedSize();
+               initExpectedSize();
+               for(Slot slot: newslots) {
+                       updateExpectedSize();

                        processSlot(indexer, slot, isput);
                }
 
                //If there is a gap, check to see if the server sent us everything
                if (firstseqnum != (sequencenumber+1))
                        checkNumSlots(newslots.length);
                        processSlot(indexer, slot, isput);
                }
 
                //If there is a gap, check to see if the server sent us everything
                if (firstseqnum != (sequencenumber+1))
                        checkNumSlots(newslots.length);

-               
-    commitNewMaxSize();

 
 

-    //commit new to slots
-    for(Slot slot:newslots) {
-      buffer.putSlot(slot);
-    }
+               commitNewMaxSize();
+
+               //commit new to slots
+               for(Slot slot:newslots) {
+                       buffer.putSlot(slot);
+               }

                sequencenumber = newslots[newslots.length - 1].getSequenceNumber();
        }
 
                sequencenumber = newslots[newslots.length - 1].getSequenceNumber();
        }
 

-  private int expectedsize, currmaxsize;
+       private int expectedsize, currmaxsize;
+
+       private void checkNumSlots(int numslots) {
+               if (numslots != expectedsize)
+                       throw new Error("Server Error: Server did not send all slots.  Expected: "+expectedsize+" Received:"+numslots);
+       }

 
 

-  private void checkNumSlots(int numslots) {
-    if (numslots != expectedsize)
-      throw new Error("Server Error: Server did not send all slots.  Expected: "+expectedsize+" Received:"+numslots);
-  }
-  
-  private void initExpectedSize() {
+       private void initExpectedSize() {

                long prevslots = sequencenumber;
                long prevslots = sequencenumber;

-    expectedsize = (prevslots < ((long) numslots)) ? (int) prevslots : numslots;
-    currmaxsize = numslots;
-  }
-
-  private void updateExpectedSize() {
-    expectedsize++;
-    if (expectedsize > currmaxsize)
-      expectedsize = currmaxsize;
-  }
-
-  private void updateCurrMaxSize(int newmaxsize) {
-    currmaxsize=newmaxsize;
-  }
-
-  private void commitNewMaxSize() {
-    if (numslots != currmaxsize)
-      buffer.resize(currmaxsize);
-
-    numslots=currmaxsize;
-  }
-  
+               expectedsize = (prevslots < ((long) numslots))?(int) prevslots:numslots;
+               currmaxsize = numslots;
+       }
+
+       private void updateExpectedSize() {
+               expectedsize++;
+               if (expectedsize > currmaxsize)
+                       expectedsize = currmaxsize;
+       }
+
+       private void updateCurrMaxSize(int newmaxsize) {
+               currmaxsize=newmaxsize;
+       }
+
+       private void commitNewMaxSize() {
+               if (numslots != currmaxsize)
+                       buffer.resize(currmaxsize);
+
+               numslots=currmaxsize;
+       }
+

        private void processEntry(KeyValue entry, SlotIndexer indexer) {
                IoTString key=entry.getKey();
                KeyValue oldvalue=table.get(key);
        private void processEntry(KeyValue entry, SlotIndexer indexer) {
                IoTString key=entry.getKey();
                KeyValue oldvalue=table.get(key);


@@ -270,11 +271,11 @@ final public class Table {
        }
 
        private void processEntry(TableStatus entry, SlotIndexer indexer) {
        }
 
        private void processEntry(TableStatus entry, SlotIndexer indexer) {

-    int newnumslots=entry.getMaxSlots();
-    updateCurrMaxSize(newnumslots);
-    if (lastTableStatus != null)
-      lastTableStatus.setDead();
-    lastTableStatus = entry;
+               int newnumslots=entry.getMaxSlots();
+               updateCurrMaxSize(newnumslots);
+               if (lastTableStatus != null)
+                       lastTableStatus.setDead();
+               lastTableStatus = entry;

        }
 
        private void updateLastMessage(long machineid, long seqnum, Liveness liveness, boolean isput) {
        }
 
        private void updateLastMessage(long machineid, long seqnum, Liveness liveness, boolean isput) {


@@ -303,7 +304,7 @@ final public class Table {
 
        private void processSlot(SlotIndexer indexer, Slot slot, boolean isput) {
                updateLastMessage(slot.getMachineID(), slot.getSequenceNumber(), slot, isput);
 
        private void processSlot(SlotIndexer indexer, Slot slot, boolean isput) {
                updateLastMessage(slot.getMachineID(), slot.getSequenceNumber(), slot, isput);

-    
+

                for(Entry entry : slot.getEntries()) {
                        switch(entry.getType()) {
                        case Entry.TypeKeyValue:
                for(Entry entry : slot.getEntries()) {
                        switch(entry.getType()) {
                        case Entry.TypeKeyValue:

diff --git a/src/java/iotcloud/TableStatus.java b/src/java/iotcloud/TableStatus.java
index 07f282c1b1768dbace9e24f840a9688e76bb540d..fb50a7de5d19c62b6043b73886ccb9b699d7e5af 100644 (file)
--- a/src/java/iotcloud/TableStatus.java
+++ b/src/java/iotcloud/TableStatus.java
@@ -12,7 +12,7 @@ class TableStatus extends Entry {
        int getMaxSlots() {
                return maxslots;
        }
        int getMaxSlots() {
                return maxslots;
        }

-  
+

        static Entry decode(Slot slot, ByteBuffer bb) {
                int maxslots=bb.getInt();
                return new TableStatus(slot, maxslots);
        static Entry decode(Slot slot, ByteBuffer bb) {
                int maxslots=bb.getInt();
                return new TableStatus(slot, maxslots);

diff --git a/src/java/iotcloud/Test.java b/src/java/iotcloud/Test.java
index 97057dd11cc802f0b267c51e8ee76fe6069e0abc..101ca77983c555a97f7ea054edcb50429d656e07 100644 (file)
--- a/src/java/iotcloud/Test.java
+++ b/src/java/iotcloud/Test.java
@@ -2,12 +2,38 @@ package iotcloud;
 
 public class Test {
        public static void main(String[] args) {
 
 public class Test {
        public static void main(String[] args) {

+               if (args[0].equals("1"))
+                       test1();
+               else if(args[0].equals("2"))
+                       test2();
+
+       }
+
+       static void test2() {
+               Table t1=new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 321);
+               t1.initTable();
+               Table t2=new Table("http://127.0.0.1/test.iotcloud/", "reallysecret", 351);
+               t2.update();
+               for(int i=0; i<600; i++) {
+                       String a="STR"+i;
+                       String b="ABR"+i;
+                       IoTString ia=new IoTString(a);
+                       IoTString ib=new IoTString(b);
+                       t1.put(ia, ia);
+                       t2.put(ib, ib);
+                       t1.update();
+                       System.out.println(ib+"->"+t1.get(ib));
+                       System.out.println(ia+"->"+t2.get(ia));
+               }
+       }
+
+       static void test1() {

                TestCloudComm cc=new TestCloudComm();
                Table t1=new Table(cc, 6513);
                t1.initTable();
                Table t2=new Table(cc, 6512);
                t2.update();
                TestCloudComm cc=new TestCloudComm();
                Table t1=new Table(cc, 6513);
                t1.initTable();
                Table t2=new Table(cc, 6512);
                t2.update();

-               for(int i=0;i<100;i++) {
+               for(int i=0; i<600; i++) {

                        String a="STR"+i;
                        String b="ABR"+i;
                        IoTString ia=new IoTString(a);
                        String a="STR"+i;
                        String b="ABR"+i;
                        IoTString ia=new IoTString(a);


@@ -18,5 +44,16 @@ public class Test {
                        System.out.println(ib+"->"+t1.get(ib));
                        System.out.println(ia+"->"+t2.get(ia));
                }
                        System.out.println(ib+"->"+t1.get(ib));
                        System.out.println(ia+"->"+t2.get(ia));
                }

+               for(int i=0; i<600; i++) {
+                       String a="STR"+i;
+                       String b="ABR"+i;
+                       IoTString ia=new IoTString(a);
+                       IoTString ib=new IoTString(b);
+                       System.out.println(ib+"->"+t1.get(ib));
+                       System.out.println(ia+"->"+t2.get(ia));
+                       System.out.println(ib+"->"+t2.get(ib));
+                       System.out.println(ia+"->"+t1.get(ia));
+               }
+

        }
 }
        }
 }

diff --git a/src/java/iotcloud/TestCloudComm.java b/src/java/iotcloud/TestCloudComm.java
index 6c1831491166b883c98fbe678e880b08f3135b49..b6682376e5feb204ab170127c9c3fdde79bfeb88 100644 (file)
--- a/src/java/iotcloud/TestCloudComm.java
+++ b/src/java/iotcloud/TestCloudComm.java
@@ -29,7 +29,7 @@ class TestCloudComm extends CloudComm {
                        sequencenumber=oldestseqnum;
                int numslots=(int)((newestseqnum - sequencenumber)+1);
                Slot[] slots=new Slot[numslots];
                        sequencenumber=oldestseqnum;
                int numslots=(int)((newestseqnum - sequencenumber)+1);
                Slot[] slots=new Slot[numslots];

-               for(int i=0;i<numslots;i++,sequencenumber++)
+               for(int i=0; i<numslots; i++,sequencenumber++)

                        slots[i]=buffer.getSlot(sequencenumber);
                return slots;
        }
                        slots[i]=buffer.getSlot(sequencenumber);
                return slots;
        }

diff --git a/src/server/iotquery.cpp b/src/server/iotquery.cpp
index e86546873904d017d296916f036396cb5509b80e..faec3b5a78df75af8c3c488a43887fc199f57967 100644 (file)
--- a/src/server/iotquery.cpp
+++ b/src/server/iotquery.cpp
@@ -144,7 +144,7 @@ void IoTQuery::getSlot() {
                delete filename;
        }
        const char header[]="getslot";
                delete filename;
        }
        const char header[]="getslot";

-       long long size=sizeof(header)-1+sizeof(numrequeststosend)+4*numrequeststosend+numbytes;                                                                                                                         //header + payload + file count + sizes
+       long long size=sizeof(header)-1+sizeof(numrequeststosend)+4*numrequeststosend+numbytes;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         //header + payload + file count + sizes

        char * response = new char[size];
        long long offset=0;
        memcpy(response, header, sizeof(header)-1);
        char * response = new char[size];
        long long offset=0;
        memcpy(response, header, sizeof(header)-1);


@@ -196,8 +196,8 @@ void IoTQuery::putSlot() {
        doWrite(slotfd, data, length);
        close(slotfd);
        delete filename;
        doWrite(slotfd, data, length);
        close(slotfd);
        delete filename;

-       newestentry = requestsequencenumber;                                                                                                    // update sequence number
-       updateStatusFile();                                                                                                                                             // update counts
+       newestentry = requestsequencenumber;                                                                                                                                                                                                                                                                                                                                                                                                                                    // update sequence number
+       updateStatusFile();                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             // update counts

        char command[]="putslot";
        sendResponse(command, sizeof(command)-1);
 }
        char command[]="putslot";
        sendResponse(command, sizeof(command)-1);
 }


@@ -211,7 +211,7 @@ void IoTQuery::sendResponse(char * bytes, int len) {
 
 char * IoTQuery::getSlotFileName(long long slot) {
        int directorylen=strlen(directory);
 
 char * IoTQuery::getSlotFileName(long long slot) {
        int directorylen=strlen(directory);

-       char * filename=new char[25+directorylen];                                                                                                              //19 digits for long number + 4 characters for SLOT + 1 character for null termination
+       char * filename=new char[25+directorylen];                                                                                                                                                                                                                                                                                                                                                                                                                                                                              //19 digits for long number + 4 characters for SLOT + 1 character for null termination

        snprintf(filename, 24+directorylen+1, "%s/SLOT%lld", directory, slot);
        return filename;
 }
        snprintf(filename, 24+directorylen+1, "%s/SLOT%lld", directory, slot);
        return filename;
 }