X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fskeleton_external.c;h=5d6a9ed815104590d5489be289378f1b4e31a2cb;hp=0937d68562be1b196049a61ae858f4143e9041e5;hb=13690c106ce4925a2cb8b3ba9c2fddd50b3a74a7;hpb=36167d82e5f49dee91c6d2cd426068edee90e36f;ds=inline

diff --git a/engines/skeleton_external.c b/engines/skeleton_external.c
index 0937d685..5d6a9ed8 100644
--- a/engines/skeleton_external.c
+++ b/engines/skeleton_external.c
@@ -13,7 +13,6 @@
 #include <assert.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 /*
  * The core of the module is identical to the ones included with fio,
@@ -38,8 +37,8 @@ static struct io_u *fio_skeleton_event(struct thread_data *td, int event)
  * which may then be retrieved by calling the ->event() hook with the event
  * numbers. Required.
  */
-static int fio_skeleton_getevents(struct thread_data *td, int min, int max,
-				  struct timespec *t)
+static int fio_skeleton_getevents(struct thread_data *td, unsigned int min,
+				  unsigned int max, const struct timespec *t)
 {
 	return 0;
 }
@@ -60,11 +59,16 @@ static int fio_skeleton_cancel(struct thread_data *td, struct io_u *io_u)
  *
  * The io engine must transfer in the direction noted by io_u->ddir
  * to the buffer pointed to by io_u->xfer_buf for as many bytes as
- * io_u->xfer_buflen. Residual data count may be set in io_u->residual
+ * io_u->xfer_buflen. Residual data count may be set in io_u->resid
  * for a short read/write.
  */
 static int fio_skeleton_queue(struct thread_data *td, struct io_u *io_u)
 {
+	/*
+	 * Double sanity check to catch errant write on a readonly setup
+	 */
+	fio_ro_check(td, io_u);
+
 	/*
 	 * Could return FIO_Q_QUEUED for a queued request,
 	 * FIO_Q_COMPLETED for a completed request, and FIO_Q_BUSY
@@ -77,7 +81,7 @@ static int fio_skeleton_queue(struct thread_data *td, struct io_u *io_u)
 /*
  * The ->prep() function is called for each io_u prior to being submitted
  * with ->queue(). This hook allows the io engine to perform any
- * preperatory actions on the io_u, before being submitted. Not required.
+ * preparatory actions on the io_u, before being submitted. Not required.
  */
 static int fio_skeleton_prep(struct thread_data *td, struct io_u *io_u)
 {
@@ -95,7 +99,7 @@ static int fio_skeleton_init(struct thread_data *td)
 }
 
 /*
- * This is paired with the ->init() funtion and is called when a thread is
+ * This is paired with the ->init() function and is called when a thread is
  * done doing io. Should tear down anything setup by the ->init() function.
  * Not required.
  */
@@ -103,9 +107,26 @@ static void fio_skeleton_cleanup(struct thread_data *td)
 {
 }
 
+/*
+ * Hook for opening the given file. Unless the engine has special
+ * needs, it usually just provides generic_file_open() as the handler.
+ */
+static int fio_skeleton_open(struct thread_data *td, struct fio_file *f)
+{
+	return generic_file_open(td, f);
+}
+
+/*
+ * Hook for closing a file. See fio_skeleton_open().
+ */
+static int fio_skeleton_close(struct thread_data *td, struct fio_file *f)
+{
+	generic_file_close(td, f);
+}
+
 /*
  * Note that the structure is exported, so that fio can get it via
- * dlsym(..., "ioengine");
+ * dlsym(..., "ioengine"); for (and only for) external engines.
  */
 struct ioengine_ops ioengine = {
 	.name		= "engine_name",
@@ -117,4 +138,6 @@ struct ioengine_ops ioengine = {
 	.getevents	= fio_skeleton_getevents,
 	.event		= fio_skeleton_event,
 	.cleanup	= fio_skeleton_cleanup,
+	.open_file	= fio_skeleton_open,
+	.close_file	= fio_skeleton_close,
 };