projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'wip-rbd-engine' of https://github.com/dillaman/fio
[fio.git]
/
goptions.c
diff --git
a/goptions.c
b/goptions.c
index c01b6cc7d8f835bd3113a8601dc0404aaff50911..16938eda141641b298434a626498dd087ff60752 100644
(file)
--- a/
goptions.c
+++ b/
goptions.c
@@
-11,6
+11,7
@@
#include "ghelpers.h"
#include "gerror.h"
#include "parse.h"
#include "ghelpers.h"
#include "gerror.h"
#include "parse.h"
+#include "optgroup.h"
struct gopt {
GtkWidget *box;
struct gopt {
GtkWidget *box;
@@
-92,10
+93,10
@@
struct gopt_job_view {
static GNode *gopt_dep_tree;
static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
static GNode *gopt_dep_tree;
static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
- GtkWidget *box, u
nsigned in
t groupmask)
+ GtkWidget *box, u
int64_
t groupmask)
{
{
- u
nsigned in
t mask, group;
- struct opt_group *og;
+ u
int64_
t mask, group;
+
const
struct opt_group *og;
GtkWidget *frame, *hbox;
struct gopt_frame_widget *gfw;
GtkWidget *frame, *hbox;
struct gopt_frame_widget *gfw;
@@
-107,7
+108,7
@@
static GtkWidget *gopt_get_group_frame(struct gopt_job_view *gjv,
if (!og)
return NULL;
if (!og)
return NULL;
- group = ffz(~groupmask);
+ group = ffz
64
(~groupmask);
gfw = &gjv->g_widgets[group];
if (!gfw->vbox[0]) {
frame = gtk_frame_new(og->name);
gfw = &gjv->g_widgets[group];
if (!gfw->vbox[0]) {
frame = gtk_frame_new(og->name);
@@
-825,7
+826,7
@@
static struct gopt *gopt_new_str_val(struct gopt_job_view *gjv,
unsigned long long *p, unsigned int idx)
{
struct gopt_str_val *g;
unsigned long long *p, unsigned int idx)
{
struct gopt_str_val *g;
- const gchar *postfix[] = { "B", "K
B", "MB", "GB", "PB", "T
B", "" };
+ const gchar *postfix[] = { "B", "K
iB", "MiB", "GiB", "PiB", "Pi
B", "" };
GtkWidget *label;
int i;
GtkWidget *label;
int i;
@@
-1135,11
+1136,11
@@
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];
*/
for (i = 0; fio_options[i].name; i++) {
struct fio_option *o = &fio_options[i];
- u
nsigned in
t mask = o->category;
- struct opt_group *og;
+ u
int64_
t mask = o->category;
+
const
struct opt_group *og;
while ((og = opt_group_from_mask(&mask)) != NULL) {
while ((og = opt_group_from_mask(&mask)) != NULL) {
- GtkWidget *vbox = gjv->vboxes[ffz(~og->mask)];
+ GtkWidget *vbox = gjv->vboxes[ffz
64
(~og->mask)];
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
hbox = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
@@
-1177,19
+1178,20
@@
static GtkWidget *gopt_add_tab(GtkWidget *notebook, const char *name)
return vbox;
}
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)
{
{
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;
do {
unsigned int i;
i = 0;
do {
- u
nsigned int mask = (1U
<< i);
+ u
int64_t mask = (1ULL
<< i);
og = opt_group_from_mask(&mask);
if (!og)
og = opt_group_from_mask(&mask);
if (!og)