Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Dec 31, 2015 Kbuild

Share & tools

Jens Axboe

author

2015-12-31 13:00 UTC #0 lore raw

The following changes since commit de26b8245b06c99ec64d9f88cfde1ed9627f871a:

  configure: add --enable-lex (2015-12-29 20:58:13 -0700)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 5f3bd0fd67254e3750681f0700a0cc162faee500:

options: move pattern_fmt_desc where we need it (2015-12-30 09:27:05 -0700)

----------------------------------------------------------------
Jens Axboe (4):
options: make the groups/categories constant
options: split out option grouping code
options: we don't need the crc32c verify include
options: move pattern_fmt_desc where we need it

 Makefile            |   2 +-
 engines/cpu.c       |   1 +
 engines/e4defrag.c  |   1 +
 engines/glusterfs.c |   1 +
 engines/libaio.c    |   1 +
 engines/libhdfs.c   |   2 +-
 engines/net.c       |   1 +
 engines/rbd.c       |   1 +
 engines/rdma.c      |   1 +
 goptions.c          |  10 +--
 optgroup.c          | 166 ++++++++++++++++++++++++++++++++++++++++++++++
 optgroup.h          | 102 ++++++++++++++++++++++++++++
 options.c           | 186 +++-------------------------------------------------
 options.h           |  97 ---------------------------
 parse.c             |   1 +
 profiles/act.c      |   1 +
 profiles/tiobench.c |   1 +
 17 files changed, 296 insertions(+), 279 deletions(-)
 create mode 100644 optgroup.c
 create mode 100644 optgroup.h

---

Diff of recent changes:

Makefile +1 -1

index 1b5c9a6..bd5f1bb 100644
@@ -45,7 +45,7 @@ SOURCE :=	$(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \
 		server.c client.c iolog.c backend.c libfio.c flow.c cconv.c \
 		gettime-thread.c helpers.c json.c idletime.c td_error.c \
 		profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
-		workqueue.c rate-submit.c
+		workqueue.c rate-submit.c optgroup.c
 
 ifdef CONFIG_LIBHDFS
   HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)

engines/cpu.c +1 -0

index 7e4d737..7643a8c 100644
@@ -6,6 +6,7 @@
  *
  */
 #include "../fio.h"
+#include "../optgroup.h"
 
 struct cpu_options {
 	void *pad;

engines/e4defrag.c +1 -0

index d6113a9..c0667fe 100644
@@ -17,6 +17,7 @@
 #include <fcntl.h>
 
 #include "../fio.h"
+#include "../optgroup.h"
 
 #ifndef EXT4_IOC_MOVE_EXT
 #define EXT4_IOC_MOVE_EXT               _IOWR('f', 15, struct move_extent)

engines/glusterfs.c +1 -0

index 507cd25..dec9fb5 100644
@@ -6,6 +6,7 @@
  */
 
 #include "gfapi.h"
+#include "../optgroup.h"
 
 struct fio_option gfapi_options[] = {
 	{

engines/libaio.c +1 -0

index 60dc49d..9d562bb 100644
@@ -13,6 +13,7 @@
 
 #include "../fio.h"
 #include "../lib/pow2.h"
+#include "../optgroup.h"
 
 static int fio_libaio_commit(struct thread_data *td);

engines/libhdfs.c +1 -1

index f690b00..faad3f8 100644
@@ -15,7 +15,7 @@
 #include <hdfs.h>
 
 #include "../fio.h"
-
+#include "../optgroup.h"
 
 #define CHUNCK_NAME_LENGTH_MAX 80
 #define CHUNCK_CREATION_BUFFER_SIZE 65536

engines/net.c +1 -0

index cd19535..9301ccf 100644
@@ -22,6 +22,7 @@
 
 #include "../fio.h"
 #include "../verify.h"
+#include "../optgroup.h"
 
 struct netio_data {
 	int listenfd;

engines/rbd.c +1 -0

index 2be9b55..8252d27 100644
@@ -8,6 +8,7 @@
 #include <rbd/librbd.h>
 
 #include "../fio.h"
+#include "../optgroup.h"
 
 struct fio_rbd_iou {
 	struct io_u *io_u;

engines/rdma.c +1 -0

index 1006b7e..87ba465 100644
@@ -41,6 +41,7 @@
 
 #include "../fio.h"
 #include "../hash.h"
+#include "../optgroup.h"
 
 #include <rdma/rdma_cma.h>
 #include <infiniband/arch.h>

goptions.c +6 -4

index 9279b22..b3d3684 100644
@@ -11,6 +11,7 @@
 #include "ghelpers.h"
 #include "gerror.h"
 #include "parse.h"
+#include "optgroup.h"
 
 struct gopt {
 	GtkWidget *box;

@@ -95,7 +96,7 @@ static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
 				       GtkWidget *box, uint64_t groupmask)
 {
 	uint64_t mask, group;
-	struct opt_group *og;
+	const struct opt_group *og;
 	GtkWidget *frame, *hbox;
 	struct gopt_frame_widget *gfw;

@@ -1136,7 +1137,7 @@ static void gopt_add_options(struct gopt_job_view *gjv,
 	for (i = 0; fio_options[i].name; i++) {
 		struct fio_option *o = &fio_options[i];
 		uint64_t mask = o->category;
-		struct opt_group *og;
+		const struct opt_group *og;
 
 		while ((og = opt_group_from_mask(&mask)) != NULL) {
 			GtkWidget *vbox = gjv->vboxes[ffz64(~og->mask)];

@@ -1177,14 +1178,15 @@ static GtkWidget *gopt_add_tab(GtkWidget *notebook, const char *name)
 	return vbox;
 }
 
-static GtkWidget *gopt_add_group_tab(GtkWidget *notebook, struct opt_group *og)
+static GtkWidget *gopt_add_group_tab(GtkWidget *notebook,
+				     const struct opt_group *og)
 {
 	return gopt_add_tab(notebook, og->name);
 }
 
 static void gopt_add_group_tabs(GtkWidget *notebook, struct gopt_job_view *gjv)
 {
-	struct opt_group *og;
+	const struct opt_group *og;
 	unsigned int i;
 
 	i = 0;

optgroup.c new file +166 -0

166 lines not on this page · raw message

optgroup.h new file +102 -0

102 lines not on this page · raw message

options.c +10 ~~-176~~

212 lines not on this page · raw message

options.h +0 ~~-97~~

103 lines not on this page · raw message

parse.c +1 -0

index ac1bee9..ec0f870 100644
@@ -15,6 +15,7 @@
 #include "parse.h"
 #include "debug.h"
 #include "options.h"
+#include "optgroup.h"
 #include "minmax.h"
 #include "lib/ieee754.h"
 #include "lib/pow2.h"

profiles/act.c +1 -0

index 4d2ec5c..3e9238b 100644
@@ -1,6 +1,7 @@
 #include "../fio.h"
 #include "../profile.h"
 #include "../parse.h"
+#include "../optgroup.h"
 
 /*
  * 1x loads

profiles/tiobench.c +1 -0

index b4331d7..8af6f4e 100644
@@ -1,6 +1,7 @@
 #include "../fio.h"
 #include "../profile.h"
 #include "../parse.h"
+#include "../optgroup.h"
 
 static unsigned long long size;
 static unsigned int loops = 1;