diff --git a/doc/man/man1/sview.1 b/doc/man/man1/sview.1
index 612aa0547be108aba80de3aed703dd834e57b5c4..597d4aea4acebd5dd2f61cda98debddbd4829d1d 100644
--- a/doc/man/man1/sview.1
+++ b/doc/man/man1/sview.1
@@ -1,4 +1,4 @@
-.TH "sview" "1" "SLURM 2.0" "July 2009" "SLURM Commands"
+.TH "sview" "1" "SLURM 2.3" "February 2011" "SLURM Commands"
.SH "NAME"
.LP
sview \- graphical user interface to view and modify SLURM state.
@@ -39,15 +39,6 @@ The sview command can only be build if \fIgtk+\-2.0\fR is installed.
Systems lacking these libraries will have SLURM installed without
the sview command.
-On larger systems (2000+ nodes) some gtk themes can considerably slow down
-the grid display. If you think this is happening you may
-try defining SVIEW_GRID_SPEEDUP=1 in your environment. This will use
-a code path to try to avoid functions that typically take a
-relatively large amount of time. THIS OPTION DOESN'T WORK FOR EVERY
-GTK THEME, but if it does work for your theme this provides an
-outrageous amount of speedup. We have found it to work very well with
-QT based themes.
-
At least some gtk themes are unable to display large numbers of lines (jobs,
nodes, etc). The information is still in gtk's internal data structures, but
not visible by scrolling down the window.
diff --git a/src/sview/block_info.c b/src/sview/block_info.c
index be8ebba94ef4afcb8ca16c48f3201f03d3b8e1de..1be7fca5bfb7d0fc5521b8eae702f617678d13fe 100644
--- a/src/sview/block_info.c
+++ b/src/sview/block_info.c
@@ -1028,11 +1028,6 @@ display_it:
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/common.c b/src/sview/common.c
index 3b6409daa897e327e7c0d49e125dbce76a584755..4a7f262b84a0ff8a1edc5b9ec9be03661bdf16b7 100644
--- a/src/sview/common.c
+++ b/src/sview/common.c
@@ -2193,24 +2193,7 @@ found:
extern void sview_widget_modify_bg(GtkWidget *widget, GtkStateType state,
const GdkColor color)
{
- if (working_sview_config.grid_speedup) {
- /* For some reason, QT Themes have a very slow call to for
- * gtk_widget_modify_bg as of 7-6-09.
- * Here we only take around 40 microsecs where
- * gtk_widget_modify_bg takes around 2500. This isn't
- * that big of a deal on most systems, but if you have
- * like 10000 nodes this makes an outrageous
- * difference. You must follow this up by doing a
- * gtk_widget_set_sensitive 0, and then 1 on the
- * parent container to make the color stick.
- */
- GtkRcStyle *rc_style = gtk_widget_get_modifier_style (widget);
- widget->style->bg[state] = color;
- rc_style->bg[state] = color;
- rc_style->color_flags[state] |= GTK_RC_BG;
- gtk_widget_reset_rc_styles (widget);
- } else
- gtk_widget_modify_bg(widget, state, &color);
+ gtk_widget_modify_bg(widget, state, &color);
}
extern void sview_radio_action_set_current_value(GtkRadioAction *action,
diff --git a/src/sview/defaults.c b/src/sview/defaults.c
index 621bfcf68dfee2032aa169b65f77230335ff18bd..79933bc2ac2a25756521e2fb51ea5425da994b36 100644
--- a/src/sview/defaults.c
+++ b/src/sview/defaults.c
@@ -521,15 +521,12 @@ static void _init_sview_conf()
default_sview_config.grid_vert = 10;
default_sview_config.show_hidden = 0;
default_sview_config.admin_mode = FALSE;
- default_sview_config.grid_speedup = 0;
default_sview_config.grid_topological = FALSE;
default_sview_config.ruled_treeview = FALSE;
default_sview_config.show_grid = TRUE;
default_sview_config.default_page = JOB_PAGE;
default_sview_config.tab_pos = GTK_POS_TOP;
- if (getenv("SVIEW_GRID_SPEEDUP"))
- default_sview_config.grid_speedup = 1;
for(i=0; i<PAGE_CNT; i++) {
memset(&default_sview_config.page_opts[i],
0, sizeof(page_opts_t));
@@ -621,8 +618,6 @@ extern int load_defaults(void)
}
s_p_get_uint32(&default_sview_config.grid_hori,
"GridHorizontal", hashtbl);
- s_p_get_boolean(&default_sview_config.grid_speedup,
- "GridSpeedup", hashtbl);
s_p_get_boolean(&default_sview_config.grid_topological,
"GridTopo", hashtbl);
if (default_sview_config.grid_topological == 0)
@@ -760,13 +755,6 @@ extern int save_defaults(bool final_save)
default_sview_config.grid_hori);
rc = _write_to_file(fd, tmp_str);
xfree(tmp_str);
- if (rc != SLURM_SUCCESS)
- goto end_it;
- tmp_str = xstrdup_printf("GridSpeedup=%s\n",
- default_sview_config.grid_speedup ?
- "YES" : "NO");
- rc = _write_to_file(fd, tmp_str);
- xfree(tmp_str);
if (rc != SLURM_SUCCESS)
goto end_it;
tmp_str = xstrdup_printf("GridTopo=%s\n",
diff --git a/src/sview/front_end_info.c b/src/sview/front_end_info.c
index 1dbed1505289feec52ff45c8ef77b9f66c58eb96..be2fbf25842184e32e275f4bda1619152ce11901 100644
--- a/src/sview/front_end_info.c
+++ b/src/sview/front_end_info.c
@@ -642,11 +642,6 @@ display_it:
grid_button_list);
}
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/grid.c b/src/sview/grid.c
index e19464f7463f21177f9a62948f51884e6268bdb8..dab8d5af753166a54ca3457cd80b68678830de41 100644
--- a/src/sview/grid.c
+++ b/src/sview/grid.c
@@ -443,10 +443,6 @@ static void _each_highlightd(GtkTreeModel *model,
}
list_iterator_destroy(itr);
- if (changed && working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
return;
}
@@ -1165,10 +1161,6 @@ extern void highlight_grid(GtkTreeView *tree_view,
gtk_tree_selection_selected_foreach(
gtk_tree_view_get_selection(tree_view),
_each_highlight_selected, &grid_foreach);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
return;
}
@@ -1734,8 +1726,4 @@ extern void post_setup_popup_grid_list(popup_info_t *popup_win)
change_grid_color(popup_win->grid_button_list, -1, -1,
MAKE_BLACK, true, NODE_STATE_IDLE);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(popup_win->grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(popup_win->grid_table), 1);
- }
}
diff --git a/src/sview/job_info.c b/src/sview/job_info.c
index 13274bc62ee1fc85876b483f10dac57a9f94adc4..da1993c38018202763c3a186cd62a04ee574be6c 100644
--- a/src/sview/job_info.c
+++ b/src/sview/job_info.c
@@ -3176,11 +3176,6 @@ display_it:
grid_button_list);
}
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/node_info.c b/src/sview/node_info.c
index 3ff4ae187a997462700dad7647968f955e562c6c..ed279b04c69861ee7c0bf94ea4a9dea3d1b96059 100644
--- a/src/sview/node_info.c
+++ b/src/sview/node_info.c
@@ -1285,11 +1285,6 @@ display_it:
highlight_grid(GTK_TREE_VIEW(display_widget),
SORTID_POS, (int)NO_VAL, grid_button_list);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/part_info.c b/src/sview/part_info.c
index e757aaf27df17d3129a5d5491413a168595c0943..17c205ae35fd672237e5826d7e101f6de272c942 100644
--- a/src/sview/part_info.c
+++ b/src/sview/part_info.c
@@ -2339,12 +2339,6 @@ display_it:
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/resv_info.c b/src/sview/resv_info.c
index c303d1f3e42a2bf3fe26faca0cf831c5e8dc066b..070506c60064c2f88e9a7456ca3a56182201f73a 100644
--- a/src/sview/resv_info.c
+++ b/src/sview/resv_info.c
@@ -1120,11 +1120,6 @@ display_it:
SORTID_NODE_INX, SORTID_COLOR_INX,
grid_button_list);
- if (working_sview_config.grid_speedup) {
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 0);
- gtk_widget_set_sensitive(GTK_WIDGET(main_grid_table), 1);
- }
-
if (view == ERROR_VIEW && display_widget) {
gtk_widget_destroy(display_widget);
display_widget = NULL;
diff --git a/src/sview/sview.h b/src/sview/sview.h
index 2760c09672b0476f3398de5c8714023f5016838c..f8d8260a7616d6884e966fc57d8dcb95ec3bcb62 100644
--- a/src/sview/sview.h
+++ b/src/sview/sview.h
@@ -201,7 +201,6 @@ typedef struct {
uint32_t fi_popup_width;
uint32_t fi_popup_height;
uint32_t grid_hori;
- bool grid_speedup;
bool grid_topological;
uint32_t grid_vert;
uint32_t grid_x_width;