edits

diff --git a/version2/src/C/LastMessage.cc b/version2/src/C/LastMessage.cc
index 036e247c5791962f80289b2891deb8ad46c2b4b2..55eec50950faa164bf9a3948e8a38c5ccf52e81a 100644 (file)
--- a/version2/src/C/LastMessage.cc
+++ b/version2/src/C/LastMessage.cc
@@ -1,4 +1,6 @@
-
+#include "LastMessage.h"
+#include "Slot.h"
+#include "ByteBuffer.h"
 
 /**
  * This Entry records the last message sent by a given machine.
@@ -6,48 +8,14 @@
  * @version 1.0
  */
 
-
-class LastMessage extends Entry {
-       int64_t machineid;
-       int64_t seqnum;
-
-       LastMessage(Slot slot, int64_t _machineid, int64_t _seqnum) {
-               super(slot);
-               machineid=_machineid;
-               seqnum=_seqnum;
-       }
-
-       int64_t getMachineID() {
-               return machineid;
-       }
-
-       int64_t getSequenceNumber() {
-               return seqnum;
-       }
-
-       static Entry decode(Slot slot, ByteBuffer bb) {
-               int64_t machineid=bb->getLong();
-               int64_t seqnum=bb->getLong();
-               return new LastMessage(slot, machineid, seqnum);
-       }
-
-       void encode(ByteBuffer bb) {
-               bb->put(Entry.TypeLastMessage);
-               bb->putLong(machineid);
-               bb->putLong(seqnum);
-       }
-
-       int getSize() {
-               return 2*sizeof(int64_t)+sizeof(char);
-       }
-
-       char getType() {
-               return Entry.TypeLastMessage;
-       }
-
-       Entry getCopy(Slot s) {
-               return new LastMessage(s, machineid, seqnum);
-       }
+Entry * LastMessage_decode(Slot * slot, ByteBuffer * bb) {
+       int64_t machineid=bb->getLong();
+       int64_t seqnum=bb->getLong();
+       return new LastMessage(slot, machineid, seqnum);
 }
 
-
+void LastMessage::encode(ByteBuffer * bb) {
+       bb->put(TypeLastMessage);
+       bb->putLong(machineid);
+       bb->putLong(seqnum);
+}

diff --git a/version2/src/C/LastMessage.h b/version2/src/C/LastMessage.h
index ef38af83e98dd6037428fbb51818c8a7333dab80..d4cddd07d63acb4a2739f069c09d5c19a05a8126 100644 (file)
--- a/version2/src/C/LastMessage.h
+++ b/version2/src/C/LastMessage.h
@@ -1,4 +1,8 @@
+#ifndef LASTMESSAGE_H
+#define LASTMESSAGE_H
 
+#include"common.h"
+#include"Entry.h"
 
 /**
  * This Entry records the last message sent by a given machine.
@@ -7,47 +11,25 @@
  */
 
 
-class LastMessage extends Entry {
-       private int64_t machineid;
-       private int64_t seqnum;
-
-       public LastMessage(Slot slot, int64_t _machineid, int64_t _seqnum) {
-               super(slot);
-               machineid=_machineid;
-               seqnum=_seqnum;
-       }
-
-       public int64_t getMachineID() {
-               return machineid;
-       }
-
-       public int64_t getSequenceNumber() {
-               return seqnum;
-       }
-
-       static Entry decode(Slot slot, ByteBuffer bb) {
-               int64_t machineid=bb->getLong();
-               int64_t seqnum=bb->getLong();
-               return new LastMessage(slot, machineid, seqnum);
-       }
-
-       public void encode(ByteBuffer bb) {
-               bb->put(Entry.TypeLastMessage);
-               bb->putLong(machineid);
-               bb->putLong(seqnum);
-       }
-
-       public int getSize() {
-               return 2*sizeof(int64_t)+sizeof(char);
-       }
-
-       public char getType() {
-               return Entry.TypeLastMessage;
-       }
-
-       public Entry getCopy(Slot s) {
-               return new LastMessage(s, machineid, seqnum);
-       }
-}
-
-
+class LastMessage : public Entry {
+ private:
+       int64_t machineid;
+       int64_t seqnum;
+
+ public:
+ LastMessage(Slot * slot, int64_t _machineid, int64_t _seqnum) :
+       Entry(slot),
+               machineid(_machineid),
+               seqnum(_seqnum) {
+               }
+
+       int64_t getMachineID() { return machineid; }
+       int64_t getSequenceNumber() { return seqnum; }
+       void encode(ByteBuffer * bb);
+       int getSize() { return 2*sizeof(int64_t)+sizeof(char); }
+       char getType() { return TypeLastMessage; }
+       Entry * getCopy(Slot * s) { return new LastMessage(s, machineid, seqnum); }
+};
+
+Entry * LastMessage_decode(Slot * slot, ByteBuffer * bb);
+#endif

diff --git a/version2/src/C/hashset.h b/version2/src/C/hashset.h
index 2a94d9666f1842885f399dcb134eaf271441cc54..7874e652aefd05d7337eea9aeacdb0b7f841b219 100644 (file)
--- a/version2/src/C/hashset.h
+++ b/version2/src/C/hashset.h
@@ -162,10 +162,10 @@ public:
        /** @brief Return random key from set. */
 
        _Key getRandomElement() {
-               if (getSize() == 0)
+               if (size() == 0)
                        return NULL;
-               else if (getSize() < 6) {
-                       uint count = random() % getSize();
+               else if (size() < 6) {
+                       uint count = random() % size();
                        Linknode<_Key> *ptr = list;
                        while (count > 0) {
                                ptr = ptr->next;
@@ -216,12 +216,12 @@ public:
                return true;
        }
 
-       unsigned int getSize() const {
+       unsigned int size() const {
                return table->getSize();
        }
 
        bool isEmpty() const {
-               return getSize() == 0;
+               return size() == 0;
        }
 
        SetIterator<_Key, _KeyInt, _Shift, hash_function, equals> *iterator() {