summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryanOSullivan <>2014-08-09 05:47:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2014-08-09 05:47:00 (GMT)
commit66399aefd9eb9250db2bb534481281215351087a (patch)
tree6b98a3cc146848ef3957dea21560142be277661a
parent6ad21634a70d3e5ed3c39ece3d8b83339b5eb9d1 (diff)
version 1.0.0.21.0.0.2
-rw-r--r--README.markdown18
-rw-r--r--cbits/time-windows.c2
-rw-r--r--criterion.cabal14
3 files changed, 19 insertions, 15 deletions
diff --git a/README.markdown b/README.markdown
index 5d3d292..beea352 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,11 +3,13 @@
This package provides the Criterion module, a Haskell library for
measuring and analysing software performance.
-To get started, read the documentation for the
-[Criterion.Main](http://hackage.haskell.org/packages/archive/criterion/latest/doc/html/Criterion-Main.html)
-module, and take a look at the programs in the
-[examples](https://github.com/bos/criterion/tree/master/examples)
-directory.
+<a href="http://www.serpentine.com/criterion/fibber.html" target="_blank"><img src="http://www.serpentine.com/criterion/fibber-screenshot.png"></img></a>
+
+To get started, read the <a
+href="http://www.serpentine.com/criterion/tutorial.html"
+target="_blank">online tutorial</a>, and take a look at the programs
+in the <a href="/bos/criterion/tree/master/examples"
+target="_blank">examples directory</a>.
# Building and installing
@@ -20,13 +22,13 @@ To build and install criterion, just run
# Get involved!
Please report bugs via the
-[github issue tracker](https://github.com/bos/criterion).
+[github issue tracker](https://github.com/bos/criterion/issues).
Master [github repository](https://github.com/bos/criterion):
-* `git clone git://github.com/bos/criterion.git`
+* `git clone https://github.com/bos/criterion.git`
-There's also a [Mercurial mirror](http://bitbucket.org/bos/criterion):
+There's also a [Mercurial mirror](https://bitbucket.org/bos/criterion):
* `hg clone https://bitbucket.org/bos/criterion`
diff --git a/cbits/time-windows.c b/cbits/time-windows.c
index 950b73a..44cd0c9 100644
--- a/cbits/time-windows.c
+++ b/cbits/time-windows.c
@@ -75,6 +75,6 @@ double criterion_getcputime(void)
GetProcessTimes(GetCurrentProcess(), &creation, &exit, &kernel, &user);
- time = to_quad_100ns(user_time) + to_quad_100ns(kernel_time);
+ time = to_quad_100ns(user) + to_quad_100ns(kernel);
return time / 1e7;
}
diff --git a/criterion.cabal b/criterion.cabal
index a64e123..2bdf28d 100644
--- a/criterion.cabal
+++ b/criterion.cabal
@@ -1,5 +1,5 @@
name: criterion
-version: 1.0.0.1
+version: 1.0.0.2
synopsis: Robust, reliable performance measurement and analysis
license: BSD3
license-file: LICENSE
@@ -32,11 +32,13 @@ description:
analysing benchmarks and a set of driver functions that makes it
easy to build and run benchmarks, and to analyse their results.
.
- The fastest way to get started is to read the documentation and
- examples in the Criterion.Main module.
+ The fastest way to get started is to read the
+ <http://www.serpentine.com/criterion/tutorial.html online tutorial>,
+ followed by the documentation and examples in the "Criterion.Main"
+ module.
.
- For an example of the kinds of reports that criterion generates, see
- <http://bos.github.com/criterion/>.
+ For examples of the kinds of reports that criterion generates, see
+ <http://www.serpentine.com/criterion the home page>.
library
exposed-modules:
@@ -144,4 +146,4 @@ test-suite tests
source-repository head
type: git
- location: git://github.com/bos/criterion.git
+ location: https://github.com/bos/criterion.git