diff --git a/src/sview/popups.c b/src/sview/popups.c
index f9c7baecec715154d79efe3ea074ae40869bcf21..42471a75c45f71382c06b4062301115aeae8bf28 100644
--- a/src/sview/popups.c
+++ b/src/sview/popups.c
@@ -35,6 +35,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\*****************************************************************************/
#include "sview.h"
+#include "src/common/parse_time.h"
+
+enum { DISPLAY_NAME, DISPLAY_VALUE };
void *_refresh_thr(gpointer arg)
{
@@ -142,58 +145,350 @@ void _search_entry(GtkEntry *entry, GtkComboBox *combo)
return;
}
+static GtkTreeStore *_local_create_treestore_2cols(GtkWidget *popup,
+ int x, int y)
+{
+ GtkScrolledWindow *window = create_scrolled_window();
+ GtkBin *bin = NULL;
+ GtkViewport *view = NULL;
+ GtkTable *table = NULL;
+ GtkTreeView *tree_view = GTK_TREE_VIEW(gtk_tree_view_new());
+ GtkTreeStore *treestore =
+ gtk_tree_store_new(2, GTK_TYPE_STRING, GTK_TYPE_STRING);
+ GtkTreeViewColumn *col = gtk_tree_view_column_new();
+ GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
+ bin = GTK_BIN(&window->container);
+ view = GTK_VIEWPORT(bin->child);
+ bin = GTK_BIN(&view->bin);
+ table = GTK_TABLE(bin->child);
+
+ gtk_table_attach_defaults(table,
+ GTK_WIDGET(tree_view),
+ 0, 1, 0, 1);
+ gtk_window_set_default_size(GTK_WINDOW(popup),
+ x, y);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
+ GTK_WIDGET(window), TRUE, TRUE, 0);
+
+ gtk_tree_view_set_model(tree_view, GTK_TREE_MODEL(treestore));
+
+ gtk_tree_view_column_pack_start(col, renderer, TRUE);
+ gtk_tree_view_column_add_attribute(col, renderer,
+ "text", DISPLAY_NAME);
+ gtk_tree_view_column_set_title(col, "Name");
+ gtk_tree_view_column_set_resizable(col, true);
+ gtk_tree_view_column_set_expand(col, true);
+ gtk_tree_view_append_column(tree_view, col);
+
+ col = gtk_tree_view_column_new();
+ renderer = gtk_cell_renderer_text_new();
+ gtk_tree_view_column_pack_start(col, renderer, TRUE);
+ gtk_tree_view_column_add_attribute(col, renderer,
+ "text", DISPLAY_VALUE);
+ gtk_tree_view_column_set_title(col, "Value");
+ gtk_tree_view_column_set_resizable(col, true);
+ gtk_tree_view_column_set_expand(col, true);
+ gtk_tree_view_append_column(tree_view, col);
+
+ return treestore;
+}
+
+static void _add_treestore_line(GtkTreeStore *treestore, GtkTreeIter *iter,
+ char *name, char *value)
+{
+ gtk_tree_store_append(treestore, iter, NULL);
+ gtk_tree_store_set(treestore, iter,
+ DISPLAY_NAME, name,
+ DISPLAY_VALUE, value,
+ -1);
+ return;
+}
+
+static void _layout_ctl_conf(GtkTreeStore *treestore,
+ slurm_ctl_conf_info_msg_t *slurm_ctl_conf_ptr)
+{
+ char temp_str[32];
+ GtkTreeIter iter;
+
+ if(!slurm_ctl_conf_ptr)
+ return;
+
+ slurm_make_time_str((time_t *)&slurm_ctl_conf_ptr->last_update,
+ temp_str, sizeof(temp_str));
+ _add_treestore_line(treestore, &iter,
+ "Configuration data as of", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "AuthType", slurm_ctl_conf_ptr->authtype);
+ _add_treestore_line(treestore, &iter,
+ "BackupAddr", slurm_ctl_conf_ptr->backup_addr);
+ _add_treestore_line(treestore, &iter,
+ "BackupController",
+ slurm_ctl_conf_ptr->backup_controller);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->cache_groups);
+ _add_treestore_line(treestore, &iter,
+ "CacheGroups", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "CheckpointType",
+ slurm_ctl_conf_ptr->checkpoint_type);
+ _add_treestore_line(treestore, &iter,
+ "ControlAddr",
+ slurm_ctl_conf_ptr->control_addr);
+ _add_treestore_line(treestore, &iter,
+ "ControlMachine",
+ slurm_ctl_conf_ptr->control_machine);
+ _add_treestore_line(treestore, &iter,
+ "Epilog",
+ slurm_ctl_conf_ptr->epilog);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->fast_schedule);
+ _add_treestore_line(treestore, &iter,
+ "FastSchedule",
+ temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->first_job_id);
+ _add_treestore_line(treestore, &iter,
+ "FirstJobId",
+ temp_str);
+#ifdef HAVE_XCPU
+ _add_treestore_line(treestore, &iter,
+ "HAVE_XCPU", "1");
+#endif
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->inactive_limit);
+ _add_treestore_line(treestore, &iter,
+ "InactiveLimit",
+ temp_str);
+ _add_treestore_line(treestore, &iter,
+ "JobAcctLogFile",
+ slurm_ctl_conf_ptr->job_acct_logfile);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->job_acct_freq);
+ _add_treestore_line(treestore, &iter,
+ "JobAcctFrequency",
+ temp_str);
+ _add_treestore_line(treestore, &iter,
+ "JobAcctType",
+ slurm_ctl_conf_ptr->job_acct_type);
+ _add_treestore_line(treestore, &iter,
+ "JobCompLoc",
+ slurm_ctl_conf_ptr->job_comp_loc);
+ _add_treestore_line(treestore, &iter,
+ "JobCompType",
+ slurm_ctl_conf_ptr->job_comp_type);
+ _add_treestore_line(treestore, &iter,
+ "JobCredentialPrivateKey",
+ slurm_ctl_conf_ptr->job_credential_private_key);
+ _add_treestore_line(treestore, &iter,
+ "JobCredentialPublicCertificate",
+ slurm_ctl_conf_ptr->
+ job_credential_public_certificate);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->kill_wait);
+ _add_treestore_line(treestore, &iter,
+ "KillWait",
+ temp_str);
+ _add_treestore_line(treestore, &iter,
+ "MailProg",
+ slurm_ctl_conf_ptr->mail_prog);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->max_job_cnt);
+ _add_treestore_line(treestore, &iter,
+ "MaxJobCount",
+ temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->msg_timeout);
+ _add_treestore_line(treestore, &iter,
+ "MessageTimeout",
+ temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->min_job_age);
+ _add_treestore_line(treestore, &iter,
+ "MinJobAge",
+ temp_str);
+ _add_treestore_line(treestore, &iter,
+ "MpiDefault",
+ slurm_ctl_conf_ptr->mpi_default);
+#ifdef MULTIPLE_SLURMD
+ _add_treestore_line(treestore, &iter,
+ "MULTIPLE_SLURMD", "1");
+#endif
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->next_job_id);
+ _add_treestore_line(treestore, &iter,
+ "NEXT_JOB_ID",
+ temp_str);
+ _add_treestore_line(treestore, &iter,
+ "PluginDir",
+ slurm_ctl_conf_ptr->plugindir);
+ _add_treestore_line(treestore, &iter,
+ "PlugStackConfig",
+ slurm_ctl_conf_ptr->plugstack);
+ _add_treestore_line(treestore, &iter,
+ "ProctrackType",
+ slurm_ctl_conf_ptr->proctrack_type);
+ _add_treestore_line(treestore, &iter,
+ "Prolog",
+ slurm_ctl_conf_ptr->prolog);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->propagate_prio_process);
+ _add_treestore_line(treestore, &iter,
+ "PropagatePrioProcess", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "PropagateResourceLimits",
+ slurm_ctl_conf_ptr->propagate_rlimits);
+ _add_treestore_line(treestore, &iter,
+ "PropagateResourceLimitsExcept",
+ slurm_ctl_conf_ptr->propagate_rlimits_except);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->ret2service);
+ _add_treestore_line(treestore, &iter,
+ "ReturnToService", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->schedport);
+ _add_treestore_line(treestore, &iter,
+ "SchedulerPort", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->schedrootfltr);
+ _add_treestore_line(treestore, &iter,
+ "SchedulerRootFilter", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "SchedulerType",
+ slurm_ctl_conf_ptr->schedtype);
+ _add_treestore_line(treestore, &iter,
+ "SelectType",
+ slurm_ctl_conf_ptr->select_type);
+ snprintf(temp_str, sizeof(temp_str), "%s(%u)",
+ slurm_ctl_conf_ptr->slurm_user_name,
+ slurm_ctl_conf_ptr->slurm_user_id);
+ _add_treestore_line(treestore, &iter,
+ "SlurmUser", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmctld_debug);
+ _add_treestore_line(treestore, &iter,
+ "SlurmctldDebug", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "SlurmctldLogFile",
+ slurm_ctl_conf_ptr->slurmctld_logfile);
+ _add_treestore_line(treestore, &iter,
+ "SlurmctldPidFile",
+ slurm_ctl_conf_ptr->slurmctld_pidfile);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmctld_port);
+ _add_treestore_line(treestore, &iter,
+ "SlurmctldPort", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmctld_timeout);
+ _add_treestore_line(treestore, &iter,
+ "SlurmctldTimeout", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmd_debug);
+ _add_treestore_line(treestore, &iter,
+ "SlurmdDebug", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "SlurmdLogFile",
+ slurm_ctl_conf_ptr->slurmd_logfile);
+ _add_treestore_line(treestore, &iter,
+ "SlurmdPidFile",
+ slurm_ctl_conf_ptr->slurmd_pidfile);
+#ifndef MULTIPLE_SLURMD
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmd_port);
+ _add_treestore_line(treestore, &iter,
+ "SlurmdPort" temp_str);
+#endif
+ _add_treestore_line(treestore, &iter,
+ "SlurmdSpoolDir",
+ slurm_ctl_conf_ptr->slurmd_spooldir);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->slurmd_timeout);
+ _add_treestore_line(treestore, &iter,
+ "SlurmdTimeout", temp_str);
+ _add_treestore_line(treestore, &iter,
+ "SLURM_CONFIG_FILE",
+ slurm_ctl_conf_ptr->slurm_conf);
+ _add_treestore_line(treestore, &iter,
+ "SLURM_VERSION", SLURM_VERSION);
+ _add_treestore_line(treestore, &iter,
+ "SrunProlog",
+ slurm_ctl_conf_ptr->srun_prolog);
+ _add_treestore_line(treestore, &iter,
+ "SrunEpilog",
+ slurm_ctl_conf_ptr->srun_epilog);
+ _add_treestore_line(treestore, &iter,
+ "StateSaveLocation",
+ slurm_ctl_conf_ptr->state_save_location);
+ _add_treestore_line(treestore, &iter,
+ "SwitchType",
+ slurm_ctl_conf_ptr->switch_type);
+ _add_treestore_line(treestore, &iter,
+ "TaskEpilog",
+ slurm_ctl_conf_ptr->task_epilog);
+ _add_treestore_line(treestore, &iter,
+ "TaskPlugin",
+ slurm_ctl_conf_ptr->task_plugin);
+ _add_treestore_line(treestore, &iter,
+ "TaskProlog",
+ slurm_ctl_conf_ptr->task_prolog);
+ _add_treestore_line(treestore, &iter,
+ "TmpFS",
+ slurm_ctl_conf_ptr->tmp_fs);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->tree_width);
+ _add_treestore_line(treestore, &iter,
+ "TreeWidth", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->use_pam);
+ _add_treestore_line(treestore, &iter,
+ "UsePam", temp_str);
+ snprintf(temp_str, sizeof(temp_str), "%u",
+ slurm_ctl_conf_ptr->wait_time);
+ _add_treestore_line(treestore, &iter,
+ "WaitTime", temp_str);
+}
+
extern void create_config_popup(GtkToggleAction *action, gpointer user_data)
{
- GtkWidget *table = gtk_table_new(1, 2, FALSE);
- GtkWidget *label = gtk_label_new("Interval in Seconds ");
- GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
- 1, 10000,
- 5, 60,
- 1);
- GtkWidget *spin_button =
- gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
GtkWidget *popup = gtk_dialog_new_with_buttons(
- "Refresh Interval",
+ "SLURM Config Info",
GTK_WINDOW (user_data),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
+ GTK_STOCK_CLOSE,
GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
NULL);
- GError *error = NULL;
+
+ int error_code;
int response = 0;
- char *temp = NULL;
+ GtkTreeStore *treestore =
+ _local_create_treestore_2cols(popup, 600, 400);
+ static slurm_ctl_conf_info_msg_t *old_slurm_ctl_conf_ptr = NULL;
+ slurm_ctl_conf_info_msg_t *slurm_ctl_conf_ptr = NULL;
- gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
- table, FALSE, FALSE, 0);
-
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+ if (old_slurm_ctl_conf_ptr) {
+ error_code = slurm_load_ctl_conf(
+ old_slurm_ctl_conf_ptr->last_update,
+ &slurm_ctl_conf_ptr);
+ if (error_code == SLURM_SUCCESS)
+ slurm_free_ctl_conf(old_slurm_ctl_conf_ptr);
+ else if (slurm_get_errno () == SLURM_NO_CHANGE_IN_DATA) {
+ slurm_ctl_conf_ptr = old_slurm_ctl_conf_ptr;
+ error_code = SLURM_SUCCESS;
+ }
+ }
+ else
+ error_code = slurm_load_ctl_conf((time_t) NULL,
+ &slurm_ctl_conf_ptr);
+
+ _layout_ctl_conf(treestore, slurm_ctl_conf_ptr);
+
gtk_widget_show_all(popup);
- response = gtk_dialog_run (GTK_DIALOG(popup));
+ response = gtk_dialog_run(GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK)
{
- global_sleep_time =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
- temp = g_strdup_printf("Refresh Interval set to %d seconds.",
- global_sleep_time);
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH);
- response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH,
- temp);
- g_free(temp);
- if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
- FALSE, &error))
- {
- g_printerr ("Failed to create refresh thread: %s\n",
- error->message);
- }
+
}
gtk_widget_destroy(popup);
@@ -201,58 +496,60 @@ extern void create_config_popup(GtkToggleAction *action, gpointer user_data)
return;
}
-extern void create_deamon_popup(GtkToggleAction *action, gpointer user_data)
+extern void create_daemon_popup(GtkToggleAction *action, gpointer user_data)
{
- GtkWidget *table = gtk_table_new(1, 2, FALSE);
- GtkWidget *label = gtk_label_new("Interval in Seconds ");
- GtkObject *adjustment = gtk_adjustment_new(global_sleep_time,
- 1, 10000,
- 5, 60,
- 1);
- GtkWidget *spin_button =
- gtk_spin_button_new(GTK_ADJUSTMENT(adjustment), 1, 0);
GtkWidget *popup = gtk_dialog_new_with_buttons(
- "Refresh Interval",
- GTK_WINDOW (user_data),
+ "SLURM Daemons running",
+ GTK_WINDOW(user_data),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,
+ GTK_STOCK_CLOSE,
GTK_RESPONSE_OK,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
NULL);
- GError *error = NULL;
- int response = 0;
- char *temp = NULL;
-
- gtk_container_set_border_width(GTK_CONTAINER(table), 10);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(popup)->vbox),
- table, FALSE, FALSE, 0);
+ int response = 0;
+ slurm_ctl_conf_info_msg_t *conf;
+ char me[MAX_SLURM_NAME], *b, *c, *n;
+ int actld = 0, ctld = 0, d = 0;
+ GtkTreeStore *treestore =
+ _local_create_treestore_2cols(popup, 300, 100);
+ GtkTreeIter iter;
- gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
- gtk_table_attach_defaults(GTK_TABLE(table), spin_button, 1, 2, 0, 1);
+ slurm_conf_init(NULL);
+ conf = slurm_conf_lock();
+
+ getnodename(me, MAX_SLURM_NAME);
+ if ((b = conf->backup_controller)) {
+ if ((strcmp(b, me) == 0) ||
+ (strcasecmp(b, "localhost") == 0))
+ ctld = 1;
+ }
+ if ((c = conf->control_machine)) {
+ actld = 1;
+ if ((strcmp(c, me) == 0) ||
+ (strcasecmp(c, "localhost") == 0))
+ ctld = 1;
+ }
+ slurm_conf_unlock();
+
+ if ((n = slurm_conf_get_nodename(me))) {
+ d = 1;
+ xfree(n);
+ } else if ((n = slurm_conf_get_nodename("localhost"))) {
+ d = 1;
+ xfree(n);
+ }
+ if (actld && ctld)
+ _add_treestore_line(treestore, &iter, "Slurmctld", "1");
+ if (actld && d)
+ _add_treestore_line(treestore, &iter, "Slurmd", "1");
+
gtk_widget_show_all(popup);
- response = gtk_dialog_run (GTK_DIALOG(popup));
+ response = gtk_dialog_run(GTK_DIALOG(popup));
if (response == GTK_RESPONSE_OK)
{
- global_sleep_time =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin_button));
- temp = g_strdup_printf("Refresh Interval set to %d seconds.",
- global_sleep_time);
- gtk_statusbar_pop(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH);
- response = gtk_statusbar_push(GTK_STATUSBAR(main_statusbar),
- STATUS_REFRESH,
- temp);
- g_free(temp);
- if (!g_thread_create(_refresh_thr, GINT_TO_POINTER(response),
- FALSE, &error))
- {
- g_printerr ("Failed to create refresh thread: %s\n",
- error->message);
- }
+
}
gtk_widget_destroy(popup);
diff --git a/src/sview/sview.c b/src/sview/sview.c
index 20cf771d27e3d05c9586e86bd6cb2463caad7fb2..a3006cdbf536dde11b5f930dc3b0a5fca407f7eb 100644
--- a/src/sview/sview.c
+++ b/src/sview/sview.c
@@ -258,7 +258,7 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
" <menuitem action='search'/>"
" <separator/>"
" <menuitem action='config'/>"
- " <menuitem action='deamons'/>"
+ " <menuitem action='daemons'/>"
" </menu>"
" <menu action='help'>"
" <menuitem action='about'/>"
@@ -281,9 +281,9 @@ static GtkWidget *_get_menubar_menu(GtkWidget *window, GtkWidget *notebook)
{"config", NULL, "Config _Info",
"<control>i", "Displays info from slurm.conf file",
G_CALLBACK(create_config_popup)},
- {"deamons", NULL, "_Deamons",
- "<control>d", "Displays Deamons running on node",
- G_CALLBACK(create_deamon_popup)},
+ {"daemons", NULL, "_Daemons",
+ "<control>d", "Displays Daemons running on node",
+ G_CALLBACK(create_daemon_popup)},
{"search", NULL, "Search",
"<control>f", "Search through SLURM",
G_CALLBACK(create_search_popup)},
diff --git a/src/sview/sview.h b/src/sview/sview.h
index cf138c45c97df782eed23c6dddb3659acedbd292..18caf3487e0c92552550cceac42424d791819715 100644
--- a/src/sview/sview.h
+++ b/src/sview/sview.h
@@ -201,7 +201,7 @@ extern void tab_pressed(GtkWidget *widget, GdkEventButton *event,
//popups.c
extern void create_config_popup(GtkToggleAction *action, gpointer user_data);
-extern void create_deamon_popup(GtkToggleAction *action, gpointer user_data);
+extern void create_daemon_popup(GtkToggleAction *action, gpointer user_data);
extern void create_search_popup(GtkToggleAction *action, gpointer user_data);
extern void change_refresh_popup(GtkToggleAction *action, gpointer user_data);