diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,31 +1,31 @@ -Copyright (c) 2009, Eugene Kirpichov - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * The names of contributors may not be used to endorse or promote - products derived from this software without specific prior - written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Copyright (c) 2009, Eugene Kirpichov + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * The names of contributors may not be used to endorse or promote + products derived from this software without specific prior + written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,8 +1,8 @@ -#!/usr/bin/env runghc - -module Main where - -import Distribution.Simple - -main :: IO () -main = defaultMain +#!/usr/bin/env runghc + +module Main where + +import Distribution.Simple + +main :: IO () +main = defaultMain diff --git a/Tools/StatePlot.hs b/Tools/StatePlot.hs --- a/Tools/StatePlot.hs +++ b/Tools/StatePlot.hs @@ -97,7 +97,10 @@ flush = RWS.gets M.keys >>= mapM_ flushTrack flushTrack track = do (i,ms0) <- RWS.gets (M.! track) - flip maybeM ms0 $ \(t0,c0) -> RWS.tell [(i, Bar (time2ms t0) (time2ms maxRenderTime) c0)] + flip maybeM ms0 $ \(t0,c0) -> + if (time2ms maxRenderTime - time2ms t0 < expireTimeMs conf) + then RWS.tell [(i, Bar (time2ms t0) (time2ms maxRenderTime) c0)] + else RWS.tell [(i, ExpiredBar (time2ms t0) (time2ms t0 + expireTimeMs conf) c0)] putTrack track s = modify (M.insert track s) diff --git a/splot.cabal b/splot.cabal --- a/splot.cabal +++ b/splot.cabal @@ -1,33 +1,33 @@ -Name: splot -Version: 0.2.1 -License: BSD3 -License-file: LICENSE -Copyright: Eugene Kirpichov, 2010 -Author: Eugene Kirpichov -Maintainer: Eugene Kirpichov -Synopsis: A tool for visualizing the lifecycle of many concurrent multi-staged processes. -Description: A tool for visualizing the lifecycle of many concurrent multi-staged processes. - Each process has a name, it starts at a point in time, ends at a point in time, and at some - points in time it changes colour. See presentation - or download . -Homepage: http://www.haskell.org/haskellwiki/Splot -Category: Graphics -Cabal-Version: >= 1.6 -Build-Type: Simple -Source-repository head - type: git - location: git://github.com/jkff/splot - -flag splitbase - description: Choose the new smaller, split-up base package. - -executable splot - if flag(splitbase) - Build-Depends: base >= 3 && < 5 - else - Build-Depends: base < 3 - - Build-Depends: cairo, bytestring, bytestring-lexing, strptime >= 0.1.7, time, - containers, colour, haskell98, Chart, mtl - Main-Is: Tools/StatePlot.hs - Ghc-Options: -O2 -rtsopts +Name: splot +Version: 0.2.2 +License: BSD3 +License-file: LICENSE +Copyright: Eugene Kirpichov, 2010 +Author: Eugene Kirpichov +Maintainer: Eugene Kirpichov +Synopsis: A tool for visualizing the lifecycle of many concurrent multi-staged processes. +Description: A tool for visualizing the lifecycle of many concurrent multi-staged processes. + Each process has a name, it starts at a point in time, ends at a point in time, and at some + points in time it changes colour. See presentation + or download . +Homepage: http://www.haskell.org/haskellwiki/Splot +Category: Graphics +Cabal-Version: >= 1.6 +Build-Type: Simple +Source-repository head + type: git + location: git://github.com/jkff/splot + +flag splitbase + description: Choose the new smaller, split-up base package. + +executable splot + if flag(splitbase) + Build-Depends: base >= 3 && < 5 + else + Build-Depends: base < 3 + + Build-Depends: cairo, bytestring, bytestring-lexing, strptime >= 0.1.7, time, + containers, colour, haskell98, Chart, mtl + Main-Is: Tools/StatePlot.hs + Ghc-Options: -O2 -rtsopts