The following changes since commit 075fa7bb64317a785892da060d6f0caf20822f18:
Fix for non-git versions (2012-04-13 19:22:56 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Bruce Cran (1):
Windows build fixes
Jens Axboe (2):
Get rid of fio_version.h
Enlarge probe version field
Makefile | 2 +-
client.c | 4 ++--
fio_version.h | 8 --------
init.c | 2 --
os/os-windows.h | 1 +
os/windows/dobuild.cmd | 12 +++++-------
os/windows/install.wxs | 6 +++---
server.c | 6 +-----
server.h | 6 ++----
9 files changed, 15 insertions(+), 32 deletions(-)
delete mode 100644 fio_version.h
---
Diff of recent changes:
diff --git a/Makefile b/Makefile
index 61e2163..f72bf8e 100644
--- a/Makefile
+++ b/Makefile
@@ -99,7 +99,7 @@ all: .depend $(PROGS) $(SCRIPTS) FORCE
.PHONY: FORCE cscope
FIO-VERSION-FILE: FORCE
- @$(SHELL_PATH) ./FIO-VERSION-GEN
+ @$(SHELL) ./FIO-VERSION-GEN
-include FIO-VERSION-FILE
CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
diff --git a/client.c b/client.c
index ee6765e..0ce7a6e 100644
--- a/client.c
+++ b/client.c
@@ -816,9 +816,9 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
sprintf(bit, "%d-bit", probe->bpp * 8);
- log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%u.%u.%u\n",
+ log_info("hostname=%s, be=%u, %s, os=%s, arch=%s, fio=%s\n",
probe->hostname, probe->bigendian, bit, os, arch,
- probe->fio_major, probe->fio_minor, probe->fio_patch);
+ probe->fio_version);
if (!client->name)
client->name = strdup((char *) probe->hostname);
diff --git a/fio_version.h b/fio_version.h
deleted file mode 100644
index 34b5784..0000000
--- a/fio_version.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef FIO_VERSION_H
-#define FIO_VERSION_H
-
-#define FIO_MAJOR 2
-#define FIO_MINOR 0
-#define FIO_PATCH 7
-
-#endif
diff --git a/init.c b/init.c
index 1eea800..3865d09 100644
--- a/init.c
+++ b/init.c
@@ -23,8 +23,6 @@
#include "lib/getopt.h"
-#include "fio_version.h"
-
const char fio_version_string[] = FIO_VERSION;
#define FIO_RANDSEED (0xb1899bedUL)
diff --git a/os/os-windows.h b/os/os-windows.h
index 8b801ed..7b61d16 100644
--- a/os/os-windows.h
+++ b/os/os-windows.h
@@ -82,6 +82,7 @@ typedef DWORD_PTR os_cpu_mask_t;
#define POLLHUP 1
#define SIGCONT 0
+#define SIGUSR1 1
typedef int sigset_t;
typedef int siginfo_t;
diff --git a/os/windows/dobuild.cmd b/os/windows/dobuild.cmd
index 43e5db4..cbbe2cb 100644
--- a/os/windows/dobuild.cmd
+++ b/os/windows/dobuild.cmd
@@ -1,11 +1,9 @@
@echo off
setlocal enabledelayedexpansion
-set /a counter=4
-for /f "tokens=3" %%i in (..\..\fio_version.h) do (
- if "!counter!"=="4" set FIO_MAJOR=%%i
- if "!counter!"=="5" set FIO_MINOR=%%i
- if "!counter!"=="6" set FIO_PATCH=%%i
-set /a counter+=1
+set /a counter=1
+for /f "tokens=3" %%i in (..\..\FIO-VERSION-FILE) do (
+ if "!counter!"=="1" set FIO_VERSION=%%i
+ set /a counter+=1
)
if "%1"=="x86" set FIO_ARCH=x86
@@ -22,5 +20,5 @@ if not defined FIO_ARCH (
@if ERRORLEVEL 1 goto end
"%WIX%bin\candle" -nologo -arch %FIO_ARCH% examples.wxs
@if ERRORLEVEL 1 goto end
-"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out fio-%FIO_MAJOR%.%FIO_MINOR%.%FIO_PATCH%-%FIO_ARCH%.msi
+"%WIX%bin\light" -nologo install.wixobj examples.wixobj -ext WixUIExtension -out %FIO_VERSION%-%FIO_ARCH%.msi
:end
\ No newline at end of file
diff --git a/os/windows/install.wxs b/os/windows/install.wxs
index d3d683e..69753ba 100755
--- a/os/windows/install.wxs
+++ b/os/windows/install.wxs
@@ -7,10 +7,10 @@
<?define ProgramDirectory = ProgramFiles64Folder ?>
<?endif?>
- <Product Id="*"
+ <Product Id="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"
Codepage="1252" Language="1033"
- Manufacturer="fio" Name="FIO"
- UpgradeCode="{2338A332-5511-43cf-b9BD-5C60496CCFCC}" Version="$(env.FIO_MAJOR).$(env.FIO_MINOR).$(env.FIO_PATCH)">
+ Manufacturer="fio" Name="fio"
+ UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.7">
<Package
Comments="Contact: Your local administrator"
Description="Flexible IO Tester"
diff --git a/server.c b/server.c
index 33f69ef..169f50a 100644
--- a/server.c
+++ b/server.c
@@ -22,8 +22,6 @@
#include "crc/crc16.h"
#include "lib/ieee754.h"
-#include "fio_version.h"
-
int fio_net_port = 8765;
int exit_backend = 0;
@@ -407,9 +405,7 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd)
#ifdef FIO_BIG_ENDIAN
probe.bigendian = 1;
#endif
- probe.fio_major = FIO_MAJOR;
- probe.fio_minor = FIO_MINOR;
- probe.fio_patch = FIO_PATCH;
+ strncpy((char *) probe.fio_version, fio_version_string, sizeof(probe.fio_version));
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
diff --git a/server.h b/server.h
index 27da94f..494a40a 100644
--- a/server.h
+++ b/server.h
@@ -36,7 +36,7 @@ struct fio_net_int_cmd {
};
enum {
- FIO_SERVER_VER = 6,
+ FIO_SERVER_VER = 7,
FIO_SERVER_MAX_PDU = 1024,
@@ -78,9 +78,7 @@ struct cmd_du_pdu {
struct cmd_probe_pdu {
uint8_t hostname[64];
uint8_t bigendian;
- uint8_t fio_major;
- uint8_t fio_minor;
- uint8_t fio_patch;
+ uint8_t fio_version[32];
uint8_t os;
uint8_t arch;
uint8_t bpp;
--
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
