Minor refactoring

2 files changed, 81 insertions, 1 deletions

diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index 06d2dac0..028a4214 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -1,4 +1,6 @@
-module Network.BitTorrent.DHT.ContactInfo () where
+module Network.BitTorrent.DHT.ContactInfo
+       (        ) where
+{-
 import Data.HashMap.Strict as HM
 
 import Data.Torrent.InfoHash
@@ -8,6 +10,57 @@ import Network.BitTorrent.Core
 -- decrease prefix when table is too small
 -- filter outdated peers
 
+{-----------------------------------------------------------------------
+--  PeerSet
+-----------------------------------------------------------------------}
+
+type PeerSet a = [(PeerAddr a, NodeInfo a, Timestamp)]
+
+-- compare PSQueue vs Ordered list
+
+takeNewest :: PeerSet a -> [PeerAddr a]
+takeNewest = undefined
+
+dropOld :: Timestamp -> PeerSet a -> PeerSet a
+dropOld = undefined
+
+insert :: PeerAddr a -> Timestamp -> PeerSet a -> PeerSet a
+insert = undefined
+
+type Mask = Int
+type Size = Int
+type Timestamp = Int
+
+{-----------------------------------------------------------------------
+--  InfoHashMap
+-----------------------------------------------------------------------}
+
+-- compare handwritten prefix tree versus IntMap
+
+data Tree a
+  = Nil
+  | Tip !InfoHash !(PeerSet a)
+  | Bin !InfoHash !Mask !Size !Timestamp (Tree a) (Tree a)
+
+insertTree :: InfoHash -> a -> Tree a -> Tree a
+insertTree = undefined
+
+type Prio = Int
+
+--shrink :: ContactInfo ip -> Int
+shrink  Nil      = Nil
+shrink (Tip _ _) = undefined
+shrink (Bin _ _) = undefined
+
+{-----------------------------------------------------------------------
+-- InfoHashMap
+-----------------------------------------------------------------------}
+
+-- compare new design versus HashMap
+
+data IntMap k p a
+type ContactInfo = Map InfoHash Timestamp (Set (PeerAddr IP) Timestamp)
+
 data ContactInfo ip = PeerStore
   { maxSize    :: Int
   , prefixSize :: Int
@@ -16,3 +69,25 @@ data ContactInfo ip = PeerStore
   , count      :: Int  -- ^ Cached size of the 'peerSet'
   , peerSet    :: HashMap InfoHash [PeerAddr ip]
   }
+
+size :: ContactInfo ip -> Int
+size = undefined
+
+prefixSize :: ContactInfo ip -> Int
+prefixSize = undefined
+
+lookup :: InfoHash -> ContactInfo ip -> [PeerAddr ip]
+lookup = undefined
+
+insert :: InfoHash -> PeerAddr ip -> ContactInfo ip -> ContactInfo ip
+insert = undefined
+
+-- | Limit in size.
+prune :: NodeId -> Int -> ContactInfo ip -> ContactInfo ip
+prune pref targetSize  Nil      = Nil
+prune pref targetSize (Tip _ _) = undefined
+
+-- | Remove expired entries.
+splitGT :: Timestamp -> ContactInfo ip -> ContactInfo ip
+splitGT = undefined
+-}
\ No newline at end of file
diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index 755985fc..e770b1d3 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -434,15 +434,20 @@ insertNode info = fork $ do
 
 -- TODO limit dht peer store in size (probably by removing oldest peers)
 
+refreshContacts :: DHT ip ()
+refreshContacts = undefined
+
 -- | Insert peer to peer store. Used to handle announce requests.
 insertPeer :: Eq ip => InfoHash -> PeerAddr ip -> DHT ip ()
 insertPeer ih addr = do
+  refreshContacts
   var <- asks contactInfo
   liftIO $ atomically $ modifyTVar' var (P.insert ih addr)
 
 -- | Get peer set for specific swarm.
 lookupPeers :: InfoHash -> DHT ip [PeerAddr ip]
 lookupPeers ih = do
+  refreshContacts
   var <- asks contactInfo
   liftIO $ P.lookup ih <$> readTVarIO var