Commit 7017d46d authored by Yiannis Tsiouris's avatar Yiannis Tsiouris

Re-format files w/ stylish-haskell

parent 4140b535
......@@ -3,40 +3,21 @@
--
module Master () where
import Control.Distributed.Process
( Process
, ProcessId
, receiveWait
, match
)
import qualified Sequential as Sq
( orbit
)
import Credit
( is_one
, credit
)
import Table
( sum_freqs
, freq_from_stat
, freq_to_stat
)
import Worker
( verts_recvd_from_stat
, credit_retd_from_stat
, min_atomic_credit_from_stat
, init_idle_from_stat
, max_idle_from_stat
, tail_idle_from_stat
)
import Types
( Generator
, HostInfo(..)
, MaybeHosts(..)
, ParConf
, Stats
, Vertex
)
import Control.Distributed.Process (Process, ProcessId, match,
receiveWait)
import Credit (credit, is_one)
import qualified Sequential as Sq (orbit)
import Table (freq_from_stat, freq_to_stat,
sum_freqs)
import Types (Generator, HostInfo (..),
MaybeHosts (..), ParConf, Stats,
Vertex)
import Worker (credit_retd_from_stat,
init_idle_from_stat,
max_idle_from_stat,
min_atomic_credit_from_stat,
tail_idle_from_stat,
verts_recvd_from_stat)
-- DATA
-- Static Machine Configuration:
......
......@@ -4,34 +4,12 @@
module Sequential(Generator
, orbit) where
import Data.Hashable
( hash
)
import Data.Dequeue
( BankersDequeue
, fromList
, popFront
, pushBack
)
import Table
( get_freq
, freq_to_stat
, is_member
, insert
, new
, to_list
)
import Worker
( now
)
import Types
( Generator
, Freq
, SeqConf
, Stats
, Vertex
, VTable
)
import Data.Dequeue (BankersDequeue, fromList, popFront, pushBack)
import Data.Hashable (hash)
import Table (freq_to_stat, get_freq, insert, is_member, new,
to_list)
import Types (Freq, Generator, SeqConf, Stats, VTable, Vertex)
import Worker (now)
-- DATA
-- Static Machine Configuration:
......@@ -50,7 +28,7 @@ import Types
orbit :: [Generator] -> [Vertex] -> Int -> ([Vertex], [Stats])
orbit gs xs tableSize = (orbit, [stat])
-- assemble static configuration
where staticMachConf = mk_static_mach_conf gs tableSize
where staticMachConf = mk_static_mach_conf gs tableSize
-- initialise hash table and work queue
table = new tableSize
queue = fromList xs
......
......@@ -22,19 +22,8 @@ module Table( Freq
, freq_from_stat
, fill_deg) where
import Data.Array
(Array
, elems
, listArray
, (!)
, (//)
)
import Types
( Freq
, Stats
, Vertex
, VTable
)
import Data.Array (Array, elems, listArray, (!), (//))
import Types (Freq, Stats, VTable, Vertex)
-- Note: Hash tables have a fixed number of slots but each slot can store
-- a list of vertices. The functions is_member/3 and insert/3
......
......@@ -12,13 +12,8 @@ module Types ( Ct(..)
, Vertex
, VTable) where
import Data.Array
( Array
)
import Control.Distributed.Process
( NodeId
, ProcessId
)
import Control.Distributed.Process (NodeId, ProcessId)
import Data.Array (Array)
type Freq = [Int]
type Vertex = Int
......@@ -34,12 +29,12 @@ type ParConf = ([Generator], ProcessId, [ProcessId], Int, Int, Bool)
-- counters/timers record
data Ct = Ct {
verts_recvd :: Int -- #vertices received by this server so far
, credit_retd :: Int -- #times server has returned credit to master
verts_recvd :: Int -- #vertices received by this server so far
, credit_retd :: Int -- #times server has returned credit to master
, min_atomic_credit :: Int -- minimal atomic credit received so far
, last_event :: Int -- time stamp [ms] of most recent event
, init_idle :: Int -- idle time [ms] between init recv first vertex
, tail_idle :: Int -- idle time [ms] between send last vertex and dump
, max_idle :: Int -- max idle [ms] time between vertices
, last_event :: Int -- time stamp [ms] of most recent event
, init_idle :: Int -- idle time [ms] between init recv first vertex
, tail_idle :: Int -- idle time [ms] between send last vertex and dump
, max_idle :: Int -- max idle [ms] time between vertices
}
--
-- orbit-int workeraux
-- orbit-int worker
--
module Worker ( defaultCt
, now
......@@ -12,17 +12,9 @@ module Worker ( defaultCt
, max_idle_from_stat
) where
import Control.Distributed.Process
( NodeId
)
import Types
( Ct(..)
, Freq
, Stats
)
import Table
( freq_to_stat
)
import Control.Distributed.Process (NodeId)
import Table (freq_to_stat)
import Types (Ct (..), Freq, Stats)
defaultCt = Ct {
verts_recvd = 0
......@@ -51,37 +43,37 @@ worker_stats node frequency statData = ("node", show node)
: freq_to_stat frequency
verts_recvd_from_stat :: Stats -> Int
verts_recvd_from_stat stat =
verts_recvd_from_stat stat =
case "vertices_recvd" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
credit_retd_from_stat :: Stats -> Int
credit_retd_from_stat stat =
credit_retd_from_stat stat =
case "credit_retd" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
min_atomic_credit_from_stat :: Stats -> Int
min_atomic_credit_from_stat stat =
min_atomic_credit_from_stat stat =
case "min_atomic_credit" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
init_idle_from_stat :: Stats -> Int
init_idle_from_stat stat =
init_idle_from_stat stat =
case "init_idle_time" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
tail_idle_from_stat :: Stats -> Int
tail_idle_from_stat stat =
tail_idle_from_stat stat =
case "tail_idle_time" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
max_idle_from_stat :: Stats -> Int
max_idle_from_stat stat =
max_idle_from_stat stat =
case "max_idle_time" `lookup` stat of
Just val -> read val :: Int
Nothing -> 0 -- instead of false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment