Skip to content

Commit d70f45e

Browse files
authored
Merge pull request #121 from vaerksted/master
2 parents 7269ccb + 833c74e commit d70f45e

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

Events/EventDuration.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ import GHC.RTS.Events hiding (Event, GCIdle, GCWork)
1717
import qualified GHC.RTS.Events as GHC
1818

1919
-------------------------------------------------------------------------------
20-
-- This datastructure is a duration-based representation of the event
21-
-- loginformation where thread-runs and GCs are explicitly represented
22-
-- by a single constructor identifying their start and end points.
20+
-- This data structure is a duration-based representation of the eventlog
21+
-- information where thread-runs and GCs are explicitly represented by a
22+
-- single constructor identifying their start and end points.
2323

2424
data EventDuration
2525
= ThreadRun {-#UNPACK#-}!ThreadId

GUI/App.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ module GUI.App (initApp) where
99
-------------------------------------------------------------------------------
1010

1111
-- | Initialize application
12-
-- Perform application initialization for non-Mac OS X platforms
12+
-- Perform application initialization for non-macOS platforms
1313
initApp :: IO ()
1414
initApp = return ()

GUI/DataFiles.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ uiFile = "threadscope.ui"
2121
logoFile :: FilePath
2222
logoFile = "threadscope.png"
2323

24-
-- | Textual representaion of the UI file
24+
-- | Textual representation of the UI file
2525
ui :: Q Exp
2626
ui = [| TE.decodeUtf8 $(makeRelativeToProject uiFile >>= embedFile) |]
2727

GUI/Timeline.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ viewRangeToTimeRange view (x, x') = do
331331
return (xv, xv')
332332

333333
-------------------------------------------------------------------------------
334-
-- Update the internal state and the timemline view after changing which
334+
-- Update the internal state and the timeline view after changing which
335335
-- traces are displayed, or the order of traces.
336336

337337
queueRedrawTimelines :: TimelineState -> IO ()

GUI/Timeline/Render.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ drawSelection vp@ViewParameters{height} (RangeSelection x x') = do
170170
-------------------------------------------------------------------------------
171171

172172
-- We currently have two different way of converting from logical units
173-
-- (ie timestamps in micro-seconds) to device units (ie pixels):
173+
-- (i.e. timestamps in micro-seconds) to device units (i.e. pixels):
174174
-- * the first is to set the cairo context to the appropriate scale
175175
-- * the second is to do the conversion ourself
176176
--
@@ -450,7 +450,7 @@ showTrace _ TraceActivity =
450450
"Activity"
451451
showTrace _ TraceGroup{} = error "Render.showTrace"
452452

453-
-- | Calcaulate the maximal Y value for a graph-like trace, or Nothing.
453+
-- | Calculate the maximal Y value for a graph-like trace, or Nothing.
454454
traceMaxSpark :: Double -> Double -> Double -> Trace -> Maybe Double
455455
traceMaxSpark maxS _ _ TraceCreationHEC{} = Just $ maxS * 1000
456456
traceMaxSpark maxS _ _ TraceConversionHEC{} = Just $ maxS * 1000

GUI/Timeline/Render/Constants.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ox = 10
1818
firstTraceY :: Int
1919
firstTraceY = 13
2020

21-
-- Gap betweem traces in the timeline view
21+
-- Gap between traces in the timeline view
2222

2323
tracePad :: Int
2424
tracePad = 20

GUI/Timeline/Ticks.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ renderXScaleArea ViewParameters{width, scaleValue, hadjValue, xScaleAreaHeight}
8686
data XScaleMode = XScaleTime | XScaleLog Double Double deriving Eq
8787

8888
-- | Render the X (vertical) scale: render X axis and call ticks rendering.
89-
-- TODO: refactor common parts with renderVRulers, in particlar to expose
89+
-- TODO: refactor common parts with renderVRulers, in particular to expose
9090
-- that ruler positions match tick positions.
9191
renderXScale :: Double -> Double -> Timestamp -> Int
9292
-> (Int -> Int) -> XScaleMode

papers/haskell_symposium_2009/sumEuler/SumEuler1.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- This demonstrates that f `par` (f + e) does not result in parallelsim.
2+
-- This demonstrates that f `par` (f + e) does not result in parallelism.
33

44
module Main
55
where

tests/ParFib.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import Control.Parallel
99
import System.Mem
1010

1111
-------------------------------------------------------------------------------
12-
-- A purely sequential implementaiton of fib.
12+
-- A purely sequential implementation of fib.
1313

1414
seqFib :: Int -> Integer
1515
seqFib 0 = 1
1616
seqFib 1 = 1
1717
seqFib n = seqFib (n-1) + seqFib (n-2)
1818

1919
-------------------------------------------------------------------------------
20-
-- A thresh-hold value below which the parallel implementation of fib
20+
-- A threshold value below which the parallel implementation of fib
2121
-- reverts to sequential implementation.
2222

2323
threshHold :: Int

0 commit comments

Comments
 (0)