Recent changes

[Jens Axboe <jaxboe@xxxxxxxxxxxx>]

The following changes since commit fad82f76eaa03e2f486315537e9d83809d155d58:

  Scramble fix (2011-09-19 11:33:30 +0200)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (2):
      Silence build warning on HPUX
      Fix aiocb compile warnings on HPUX

 engines/posixaio.c |    8 ++++----
 ioengine.h         |    2 +-
 os/os-hpux.h       |    3 +++
 os/os.h            |    3 +++
 parse.c            |    2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

---

Diff of recent changes:

diff --git a/engines/posixaio.c b/engines/posixaio.c
index e315e97..0966e0d 100644
--- a/engines/posixaio.c
+++ b/engines/posixaio.c
@@ -65,7 +65,7 @@ static int fio_posixaio_cancel(struct thread_data fio_unused *td,
 static int fio_posixaio_prep(struct thread_data fio_unused *td,
 			     struct io_u *io_u)
 {
-	struct aiocb *aiocb = &io_u->aiocb;
+	os_aiocb_t *aiocb = &io_u->aiocb;
 	struct fio_file *f = io_u->file;
 
 	aiocb->aio_fildes = f->fd;
@@ -84,7 +84,7 @@ static int fio_posixaio_getevents(struct thread_data *td, unsigned int min,
 				  unsigned int max, struct timespec *t)
 {
 	struct posixaio_data *pd = td->io_ops->data;
-	struct aiocb *suspend_list[SUSPEND_ENTRIES];
+	os_aiocb_t *suspend_list[SUSPEND_ENTRIES];
 	struct flist_head *entry;
 	struct timespec start;
 	int have_timeout = 0;
@@ -141,7 +141,7 @@ restart:
 	/*
 	 * must have some in-flight, wait for at least one
 	 */
-	aio_suspend((const struct aiocb * const *)suspend_list,
+	aio_suspend((const os_aiocb_t * const *)suspend_list,
 							suspend_entries, t);
 	goto restart;
 }
@@ -157,7 +157,7 @@ static int fio_posixaio_queue(struct thread_data *td,
 			      struct io_u *io_u)
 {
 	struct posixaio_data *pd = td->io_ops->data;
-	struct aiocb *aiocb = &io_u->aiocb;
+	os_aiocb_t *aiocb = &io_u->aiocb;
 	int ret;
 
 	fio_ro_check(td, io_u);
diff --git a/ioengine.h b/ioengine.h
index 75c2c1a..044c4da 100644
--- a/ioengine.h
+++ b/ioengine.h
@@ -22,7 +22,7 @@ struct io_u {
 		struct iocb iocb;
 #endif
 #ifdef FIO_HAVE_POSIXAIO
-		struct aiocb aiocb;
+		os_aiocb_t aiocb;
 #endif
 #ifdef FIO_HAVE_SGIO
 		struct sg_io_hdr hdr;
diff --git a/os/os-hpux.h b/os/os-hpux.h
index d7397bf..4353a01 100644
--- a/os/os-hpux.h
+++ b/os/os-hpux.h
@@ -43,6 +43,9 @@
 #define MSG_WAITALL	0x40
 #endif
 
+#define FIO_OS_HAVE_AIOCB_TYPEDEF
+typedef struct aiocb64 os_aiocb_t;
+
 static inline int blockdev_invalidate_cache(struct fio_file *f)
 {
 	return EINVAL;
diff --git a/os/os.h b/os/os.h
index cd2bb52..2eb38e8 100644
--- a/os/os.h
+++ b/os/os.h
@@ -32,6 +32,9 @@
 
 #ifdef FIO_HAVE_POSIXAIO
 #include <aio.h>
+#ifndef FIO_OS_HAVE_AIOCB_TYPEDEF
+typedef struct aiocb os_aiocb_t;
+#endif
 #endif
 
 #ifdef FIO_HAVE_SGIO
diff --git a/parse.c b/parse.c
index f52139f..239e371 100644
--- a/parse.c
+++ b/parse.c
@@ -199,7 +199,7 @@ static unsigned long long get_mult_bytes(const char *str, int len, void *data,
 		if (!isdigit((int) *p) &&
 		    (((*p != '+') && (*p != '-')) || digit_seen))
 			break;
-		digit_seen |= isdigit(*p);
+		digit_seen |= isdigit((int) *p);
 		p++;
 	}
 
--
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