The following changes since commit 764b896e3e97b0507d3cf57e974bfe57948580c0:
Fio 2.0.11 (2012-11-15 15:40:41 -0700)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (2):
Add more examples to the Windows installer.
Generate a new Windows installer product code for 2.0.11.
Jens Axboe (1):
Use unique seed for zipf/pareto init if rand_repeat is not set
filesetup.c | 3 +++
os/windows/examples.wxs | 24 ++++++++++++++++++++++--
os/windows/install.wxs | 8 ++++----
3 files changed, 29 insertions(+), 6 deletions(-)
---
Diff of recent changes:
diff --git a/filesetup.c b/filesetup.c
index 8636e16..c488eb4 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -873,6 +873,9 @@ static int __init_rand_distribution(struct thread_data *td, struct fio_file *f)
nranges = (f->real_file_size + range_size - 1) / range_size;
seed = jhash(f->file_name, strlen(f->file_name), 0) * td->thread_number;
+ if (!td->o.rand_repeatable)
+ seed = td->rand_seeds[4];
+
if (td->o.random_distribution == FIO_RAND_DIST_ZIPF)
zipf_init(&f->zipf, nranges, td->o.zipf_theta, seed);
else
diff --git a/os/windows/examples.wxs b/os/windows/examples.wxs
index f3d6bc3..84f2a86 100755
--- a/os/windows/examples.wxs
+++ b/os/windows/examples.wxs
@@ -14,7 +14,7 @@
<Component>
<File Source="..\..\examples\fsx" />
</Component>
- <Component >
+ <Component>
<File Source="..\..\examples\iometer-file-access-server" />
</Component>
<Component>
@@ -35,6 +35,21 @@
<Component>
<File Source="..\..\examples\flow" />
</Component>
+ <Component>
+ <File Source="..\..\examples\cpuio" />
+ </Component>
+ <Component>
+ <File Source="..\..\examples\falloc" />
+ </Component>
+ <Component>
+ <File Source="..\..\examples\fusion-aw-sync.ini" />
+ </Component>
+ <Component>
+ <File Source="..\..\examples\ssd-steadystate.fio" />
+ </Component>
+ <Component>
+ <File Source="..\..\examples\zipf" />
+ </Component>
</DirectoryRef>
</Fragment>
<Fragment>
@@ -50,6 +65,11 @@
<ComponentRef Id="tiobench_example" />
<ComponentRef Id="null" />
<ComponentRef Id="flow" />
+ <ComponentRef Id="cpuio" />
+ <ComponentRef Id="falloc" />
+ <ComponentRef Id="fusion_aw_sync.ini" />
+ <ComponentRef Id="ssd_steadystate.fio" />
+ <ComponentRef Id="zipf" />
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index dbf0e21..86098b0 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
-
+
<?if $(env.FIO_ARCH) = x86 ?>
<?define ProgramDirectory = ProgramFilesFolder ?>
<?else?>
<?define ProgramDirectory = ProgramFiles64Folder ?>
<?endif?>
- <Product Id="2BA394F9-0D9E-4597-BB9D-6B18097D64BB"
+ <Product Id="C3DC8A4F-1191-412F-8287-ACB6BA798F6A"
Codepage="1252" Language="1033"
Manufacturer="fio" Name="fio"
UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.11">
- <Package
+ <Package
Comments="Contact: Your local administrator"
Description="Flexible IO Tester"
InstallerVersion="200" Keywords="Installer,MSI,Database"
@@ -57,7 +57,7 @@
<ComponentRef Id="COPYING"/>
<ComponentGroupRef Id="examples"/>
</Feature>
-
+
<Property Id="ARPURLINFOABOUT" Value="http://git.kernel.dk/?p=fio.git"; />
<Property Id='ARPCONTACT'>fio@xxxxxxxxxxxxxxx</Property>
<Property Id='ARPHELPLINK'>http://www.spinics.net/lists/fio/</Property>
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
