Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-orbit
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Katerina Roukounaki
cloud-orbit
Commits
20f0af14
Commit
20f0af14
authored
Nov 18, 2014
by
Yiannis Tsiouris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge Master and Worker modules
parent
d3f1cfdf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
85 additions
and
94 deletions
+85
-94
Bench.hs
Bench.hs
+4
-4
MasterWorker.hs
MasterWorker.hs
+81
-9
Worker.hs
Worker.hs
+0
-81
No files found.
Bench.hs
View file @
20f0af14
...
@@ -13,11 +13,11 @@ module Bench( -- sets of generators
...
@@ -13,11 +13,11 @@ module Bench( -- sets of generators
,
dist
,
dist_seq
,
dist
,
dist_seq
)
where
)
where
import
Data.List
(
lookup
)
import
Data.List
(
lookup
)
import
Data.Maybe
(
fromMaybe
)
import
Data.Maybe
(
fromMaybe
)
import
Prelude
hiding
(
seq
)
import
Prelude
hiding
(
seq
)
import
Master
(
HostInfo
(
..
),
MaybeHosts
(
..
),
orbit
)
import
Master
Worker
(
HostInfo
(
..
),
MaybeHosts
(
..
),
orbit
)
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
-- generators
-- generators
...
...
Master.hs
→
Master
Worker
.hs
View file @
20f0af14
--
--
-- orbit-int master (controlling orbit computation)
-- orbit-int master (controlling orbit computation)
-- orbit-int worker (computing vertices and holding part of hash table)
--
--
module
Master
where
module
MasterWorker
where
{-
module Worker( --init
--, distribute_vertices
--, send_image
verts_recvd_from_stat
, credit_retd_from_stat
, min_atomic_credit_from_stat
, init_idle_from_stat
, tail_idle_from_stat
, max_idle_from_stat
, WorkerStats
) where
-}
import
Control.Distributed.Process
(
Process
,
ProcessId
,
NodeId
,
import
Control.Distributed.Process
(
Process
,
ProcessId
,
NodeId
,
match
,
receiveWait
)
match
,
receiveWait
)
import
Data.Maybe
(
fromJust
)
import
Credit
(
credit
,
is_one
)
import
Credit
(
credit
,
is_one
)
import
qualified
Sequential
as
Sq
(
Generator
,
orbit
)
import
qualified
Sequential
as
Sq
(
Generator
,
orbit
)
import
Table
(
Vertex
,
freq_from_stat
,
import
Table
(
Freq
,
Vertex
,
freq_from_stat
,
freq_to_stat
,
sum_freqs
)
freq_to_stat
,
sum_freqs
)
import
Worker
(
WorkerStats
,
import
Utils
(
now
)
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
)
-- 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
,
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
}
type
MasterStats
=
[(
String
,
String
)]
type
MasterStats
=
[(
String
,
String
)]
data
MaybeHosts
=
Seq
Int
data
MaybeHosts
=
Seq
Int
|
Par
HostInfo
|
Par
HostInfo
...
@@ -31,6 +53,8 @@ data HostInfo = JustOne (Int, -- Number of processes
...
@@ -31,6 +53,8 @@ data HostInfo = JustOne (Int, -- Number of processes
Bool
)]
-- Spawn image comp
Bool
)]
-- Spawn image comp
type
ParConf
=
([
Sq
.
Generator
],
ProcessId
,
[
ProcessId
],
Int
,
Int
,
Bool
)
type
ParConf
=
([
Sq
.
Generator
],
ProcessId
,
[
ProcessId
],
Int
,
Int
,
Bool
)
type
WorkerStats
=
[(
String
,
String
)]
-- DATA
-- DATA
-- Static Machine Configuration:
-- Static Machine Configuration:
-- {Gs, %list of generators
-- {Gs, %list of generators
...
@@ -187,3 +211,51 @@ master_stats elapsedTime workerStats =
...
@@ -187,3 +211,51 @@ master_stats elapsedTime workerStats =
maxIdle
=
foldl
max
(
head
idles
)
(
tail
idles
)
maxIdle
=
foldl
max
(
head
idles
)
(
tail
idles
)
tailIdles
=
map
tail_idle_from_stat
workerStats
tailIdles
=
map
tail_idle_from_stat
workerStats
maxTailIdle
=
foldl
max
(
head
tailIdles
)
(
tail
tailIdles
)
maxTailIdle
=
foldl
max
(
head
tailIdles
)
(
tail
tailIdles
)
-- Worker stuff
defaultCt
::
Ct
defaultCt
=
Ct
{
verts_recvd
=
0
,
credit_retd
=
0
,
min_atomic_credit
=
0
,
last_event
=
now
,
init_idle
=
-
1
,
tail_idle
=
-
1
,
max_idle
=
-
1
}
-- produce readable statistics
worker_stats
::
NodeId
->
Freq
->
Ct
->
WorkerStats
worker_stats
node
frequency
statData
=
(
"node"
,
show
node
)
:
(
"vertices_recvd"
,
show
$
verts_recvd
statData
)
:
(
"credit_retd"
,
show
$
credit_retd
statData
)
:
(
"min_atomic_credit"
,
show
$
min_atomic_credit
statData
)
:
(
"init_idle_time"
,
show
$
init_idle
statData
)
:
(
"max_idle_time"
,
show
$
max_idle
statData
)
:
(
"tail_idle_time"
,
show
$
tail_idle
statData
)
:
freq_to_stat
frequency
verts_recvd_from_stat
::
WorkerStats
->
Int
verts_recvd_from_stat
stat
=
read
(
fromJust
(
"vertices_recvd"
`
lookup
`
stat
))
::
Int
credit_retd_from_stat
::
WorkerStats
->
Int
credit_retd_from_stat
stat
=
read
(
fromJust
(
"credit_retd"
`
lookup
`
stat
))
::
Int
min_atomic_credit_from_stat
::
WorkerStats
->
Int
min_atomic_credit_from_stat
stat
=
read
(
fromJust
(
"min_atomic_credit"
`
lookup
`
stat
))
::
Int
init_idle_from_stat
::
WorkerStats
->
Int
init_idle_from_stat
stat
=
read
(
fromJust
(
"init_idle_time"
`
lookup
`
stat
))
::
Int
tail_idle_from_stat
::
WorkerStats
->
Int
tail_idle_from_stat
stat
=
read
(
fromJust
(
"tail_idle_time"
`
lookup
`
stat
))
::
Int
max_idle_from_stat
::
WorkerStats
->
Int
max_idle_from_stat
stat
=
read
(
fromJust
(
"max_idle_time"
`
lookup
`
stat
))
::
Int
Worker.hs
deleted
100644 → 0
View file @
d3f1cfdf
--
-- orbit-int worker (computing vertices and holding part of hash table)
--
module
Worker
(
--init
--, distribute_vertices
--, send_image
verts_recvd_from_stat
,
credit_retd_from_stat
,
min_atomic_credit_from_stat
,
init_idle_from_stat
,
tail_idle_from_stat
,
max_idle_from_stat
,
WorkerStats
)
where
import
Control.Distributed.Process
(
NodeId
)
import
Data.Maybe
(
fromJust
)
import
Table
(
Freq
,
freq_to_stat
)
import
Utils
(
now
)
type
WorkerStats
=
[(
String
,
String
)]
-- 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
,
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
}
defaultCt
::
Ct
defaultCt
=
Ct
{
verts_recvd
=
0
,
credit_retd
=
0
,
min_atomic_credit
=
0
,
last_event
=
now
,
init_idle
=
-
1
,
tail_idle
=
-
1
,
max_idle
=
-
1
}
-- produce readable statistics
worker_stats
::
NodeId
->
Freq
->
Ct
->
WorkerStats
worker_stats
node
frequency
statData
=
(
"node"
,
show
node
)
:
(
"vertices_recvd"
,
show
$
verts_recvd
statData
)
:
(
"credit_retd"
,
show
$
credit_retd
statData
)
:
(
"min_atomic_credit"
,
show
$
min_atomic_credit
statData
)
:
(
"init_idle_time"
,
show
$
init_idle
statData
)
:
(
"max_idle_time"
,
show
$
max_idle
statData
)
:
(
"tail_idle_time"
,
show
$
tail_idle
statData
)
:
freq_to_stat
frequency
verts_recvd_from_stat
::
WorkerStats
->
Int
verts_recvd_from_stat
stat
=
read
(
fromJust
(
"vertices_recvd"
`
lookup
`
stat
))
::
Int
credit_retd_from_stat
::
WorkerStats
->
Int
credit_retd_from_stat
stat
=
read
(
fromJust
(
"credit_retd"
`
lookup
`
stat
))
::
Int
min_atomic_credit_from_stat
::
WorkerStats
->
Int
min_atomic_credit_from_stat
stat
=
read
(
fromJust
(
"min_atomic_credit"
`
lookup
`
stat
))
::
Int
init_idle_from_stat
::
WorkerStats
->
Int
init_idle_from_stat
stat
=
read
(
fromJust
(
"init_idle_time"
`
lookup
`
stat
))
::
Int
tail_idle_from_stat
::
WorkerStats
->
Int
tail_idle_from_stat
stat
=
read
(
fromJust
(
"tail_idle_time"
`
lookup
`
stat
))
::
Int
max_idle_from_stat
::
WorkerStats
->
Int
max_idle_from_stat
stat
=
read
(
fromJust
(
"max_idle_time"
`
lookup
`
stat
))
::
Int
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment