Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Events/EventDuration.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import GHC.RTS.Events hiding (Event, GCIdle, GCWork)
import qualified GHC.RTS.Events as GHC

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

data EventDuration
= ThreadRun {-#UNPACK#-}!ThreadId
Expand Down
2 changes: 1 addition & 1 deletion GUI/App.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ module GUI.App (initApp) where
-------------------------------------------------------------------------------

-- | Initialize application
-- Perform application initialization for non-Mac OS X platforms
-- Perform application initialization for non-macOS platforms
initApp :: IO ()
initApp = return ()
2 changes: 1 addition & 1 deletion GUI/DataFiles.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ uiFile = "threadscope.ui"
logoFile :: FilePath
logoFile = "threadscope.png"

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

Expand Down
2 changes: 1 addition & 1 deletion GUI/Timeline.hs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ viewRangeToTimeRange view (x, x') = do
return (xv, xv')

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

queueRedrawTimelines :: TimelineState -> IO ()
Expand Down
4 changes: 2 additions & 2 deletions GUI/Timeline/Render.hs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ drawSelection vp@ViewParameters{height} (RangeSelection x x') = do
-------------------------------------------------------------------------------

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

-- | Calcaulate the maximal Y value for a graph-like trace, or Nothing.
-- | Calculate the maximal Y value for a graph-like trace, or Nothing.
traceMaxSpark :: Double -> Double -> Double -> Trace -> Maybe Double
traceMaxSpark maxS _ _ TraceCreationHEC{} = Just $ maxS * 1000
traceMaxSpark maxS _ _ TraceConversionHEC{} = Just $ maxS * 1000
Expand Down
2 changes: 1 addition & 1 deletion GUI/Timeline/Render/Constants.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ox = 10
firstTraceY :: Int
firstTraceY = 13

-- Gap betweem traces in the timeline view
-- Gap between traces in the timeline view

tracePad :: Int
tracePad = 20
Expand Down
2 changes: 1 addition & 1 deletion GUI/Timeline/Ticks.hs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ renderXScaleArea ViewParameters{width, scaleValue, hadjValue, xScaleAreaHeight}
data XScaleMode = XScaleTime | XScaleLog Double Double deriving Eq

-- | Render the X (vertical) scale: render X axis and call ticks rendering.
-- TODO: refactor common parts with renderVRulers, in particlar to expose
-- TODO: refactor common parts with renderVRulers, in particular to expose
-- that ruler positions match tick positions.
renderXScale :: Double -> Double -> Timestamp -> Int
-> (Int -> Int) -> XScaleMode
Expand Down
2 changes: 1 addition & 1 deletion papers/haskell_symposium_2009/sumEuler/SumEuler1.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-------------------------------------------------------------------------------
-- This demonstrates that f `par` (f + e) does not result in parallelsim.
-- This demonstrates that f `par` (f + e) does not result in parallelism.

module Main
where
Expand Down
4 changes: 2 additions & 2 deletions tests/ParFib.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import Control.Parallel
import System.Mem

-------------------------------------------------------------------------------
-- A purely sequential implementaiton of fib.
-- A purely sequential implementation of fib.

seqFib :: Int -> Integer
seqFib 0 = 1
seqFib 1 = 1
seqFib n = seqFib (n-1) + seqFib (n-2)

-------------------------------------------------------------------------------
-- A thresh-hold value below which the parallel implementation of fib
-- A threshold value below which the parallel implementation of fib
-- reverts to sequential implementation.

threshHold :: Int
Expand Down