Make the name entry a combo, before we were just overwriting
so it would contain the last entry noted.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
GtkWidget *iotype;
GtkWidget *ioengine;
GtkWidget *iodepth;
GtkWidget *iotype;
GtkWidget *ioengine;
GtkWidget *iodepth;
gtk_label_set_text(GTK_LABEL(ge->probe.os), "");
gtk_label_set_text(GTK_LABEL(ge->probe.arch), "");
gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), "");
gtk_label_set_text(GTK_LABEL(ge->probe.os), "");
gtk_label_set_text(GTK_LABEL(ge->probe.arch), "");
gtk_label_set_text(GTK_LABEL(ge->probe.fio_ver), "");
+#if 0
+ /* should we empty it... */
gtk_entry_set_text(GTK_ENTRY(ge->eta.name), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.name), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.iodepth), "");
gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), "");
}
gtk_entry_set_text(GTK_ENTRY(ge->eta.write_iops), "");
}
+static GtkWidget *new_combo_entry_in_frame(GtkWidget *box, const char *label)
+{
+ GtkWidget *entry, *frame;
+
+ frame = gtk_frame_new(label);
+ entry = gtk_combo_box_new_text();
+ gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 3);
+ gtk_container_add(GTK_CONTAINER(frame), entry);
+
+ return entry;
+}
+
static GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label)
{
GtkWidget *entry, *frame;
static GtkWidget *new_info_entry_in_frame(GtkWidget *box, const char *label)
{
GtkWidget *entry, *frame;
gtk_entry_set_text(GTK_ENTRY(ui->eta.cw_iops), "---");
#endif
gtk_entry_set_text(GTK_ENTRY(ui->eta.cw_iops), "---");
#endif
+ entry_set_int_value(ui->eta.jobs, je->nr_running);
+
if (je->eta_sec != INT_MAX && je->nr_running) {
char *iops_str[2];
char *rate_str[2];
if (je->eta_sec != INT_MAX && je->nr_running) {
char *iops_str[2];
char *rate_str[2];
gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name);
gtk_label_set_text(GTK_LABEL(ge->page_label), (gchar *) o->name);
- gtk_entry_set_text(GTK_ENTRY(ge->eta.name), (gchar *) o->name);
+ gtk_combo_box_append_text(GTK_COMBO_BOX(ge->eta.names), (gchar *) o->name);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(ge->eta.names), 0);
+
gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), ddir_str(o->td_ddir));
gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), (gchar *) o->ioengine);
gtk_entry_set_text(GTK_ENTRY(ge->eta.iotype), ddir_str(o->td_ddir));
gtk_entry_set_text(GTK_ENTRY(ge->eta.ioengine), (gchar *) o->ioengine);
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
- ge->eta.name = new_info_entry_in_frame(probe_box, "Name");
+ ge->eta.names = new_combo_entry_in_frame(probe_box, "Jobs");
ge->eta.iotype = new_info_entry_in_frame(probe_box, "IO");
ge->eta.ioengine = new_info_entry_in_frame(probe_box, "IO Engine");
ge->eta.iodepth = new_info_entry_in_frame(probe_box, "IO Depth");
ge->eta.iotype = new_info_entry_in_frame(probe_box, "IO");
ge->eta.ioengine = new_info_entry_in_frame(probe_box, "IO Engine");
ge->eta.iodepth = new_info_entry_in_frame(probe_box, "IO Depth");
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
probe_box = gtk_hbox_new(FALSE, 3);
gtk_box_pack_start(GTK_BOX(probe_frame), probe_box, FALSE, FALSE, 3);
+ ui->eta.jobs = new_info_entry_in_frame(probe_box, "Running");
ui->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW");
ui->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS");
ui->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW");
ui->eta.read_bw = new_info_entry_in_frame(probe_box, "Read BW");
ui->eta.read_iops = new_info_entry_in_frame(probe_box, "IOPS");
ui->eta.write_bw = new_info_entry_in_frame(probe_box, "Write BW");