[prev in list] [next in list] [prev in thread] [next in thread]
List: grid-engine-cvs
Subject: CVS update: MODIFIED: qmon, qmon_qaction.c ...
From: sgrell () sunsource ! net
Date: 2003-08-19 9:11:41
Message-ID: 20030819091141.12065.qmail () s005 ! sfo ! collab ! net
[Download RAW message or body]
User: sgrell
Date: 03/08/19 02:11:41
Modified: source/clients/qmon qmon_host.c qmon_load.c qmon_load.h
qmon_qaction.c qmon_sconf.c qmon_util.c qmon_util.h
Log:
SG-2003-08-19-0: Bugfix: The complex selection dialog did not show all available \
complexes. Changed: qmon
Review: AA
Issue number:
Revision Changes Path
1.1046 +6 -2 gridengine/Changelog
http://gridengine.sunsource.net/source/browse/gridengine/Changelog.diff?r1=1.1045&r2=1.1046
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Changelog
===================================================================
RCS file: /cvs/gridengine/Changelog,v
retrieving revision 1.1045
retrieving revision 1.1046
diff -u -b -r1.1045 -r1.1046
--- Changelog 2003/08/18 08:28:23 1.1045
+++ Changelog 2003/08/19 09:11:38 1.1046
@@ -1,3 +1,7 @@
+SG-2003-08-19-0: Bugfix: The complex selection dialog did not show all available \
complexes. + Changed: qmon
+ Review: AA
+
AH-2003-08-18-1: Enhancem. Update on tight integration with Sun HPC
ClusterTools 5
1.21 +1 -63 gridengine/source/clients/qmon/qmon_host.c
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_host.c.diff?r1=1.20&r2=1.21
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_host.c
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_host.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- qmon_host.c 2003/08/14 12:02:54 1.20
+++ qmon_host.c 2003/08/19 09:11:39 1.21
@@ -168,8 +168,6 @@
static void qmonHostAvailableAcls(void);
static void qmonHostAvailableProjects(void);
-static void qmonLoadNamesHost(Widget w, XtPointer cld, XtPointer cad);
-
static void qmonExecHostAccessToggle(Widget w, XtPointer cld, XtPointer cad);
static void qmonExecHostAccessAdd(Widget w, XtPointer cld, XtPointer cad);
static void qmonExecHostAccessRemove(Widget w, XtPointer cld, XtPointer cad);
@@ -690,7 +688,7 @@
qmonLoadNoEdit, NULL);
#endif
XtAddCallback(complexes_ccl, XmNlabelActivateCallback,
- qmonLoadNamesHost, NULL);
+ qmonLoadNames, NULL);
XtAddCallback(access_toggle, XmtNvalueChangedCallback,
qmonExecHostAccessToggle, NULL);
@@ -1435,66 +1433,6 @@
DEXIT;
}
-
-/*-------------------------------------------------------------------------*/
-static void qmonLoadNamesHost(
-Widget w,
-XtPointer cld,
-XtPointer cad
-) {
-
- lList *entries = NULL;
- lList *alp = NULL;
-
- DENTER(GUI_LAYER, "qmonLoadNamesHost");
-
- qmonMirrorMultiAnswer(CENTRY_T, &alp);
- if (alp) {
- qmonMessageBox(w, alp, 0);
- alp = lFreeList(alp);
- DEXIT;
- return;
- }
-
- entries = qmonMirrorList(SGE_CENTRY_LIST);
- ShowLoadNames(w, entries);
-}
-
-#ifdef ANDRE
- FIXME folgende Funktion pruefen
-
-/*-------------------------------------------------------------------------*/
-static lList* GetAttributes(
-char *qhostname,
-lList *attached_cplx_list
-) {
- lList *cl = NULL;
- lList *ehl = NULL;
- lList *entries = NULL;
- lListElem *hep = NULL;
-
- DENTER(GUI_LAYER, "GetAttributes");
-#ifdef ANDRE
- FIXME
-#endif
-
- ehl = qmonMirrorList(SGE_EXECHOST_LIST);
-
- /*
- ** create a queue element and get the complex attribute entries
- */
- hep = lCreateElem(EH_Type);
- lSetHost(hep, EH_name, qhostname);
- if (qhostname && !strcasecmp(qhostname, "global"))
- global_complexes2scheduler(&entries, hep, cl, 0);
- else
- host_complexes2scheduler(&entries, hep, ehl, cl, 0);
- hep = lFreeElem(hep);
-
- DEXIT;
- return entries;
-}
-#endif
/*-------------------------------------------------------------------------*/
/* A C C E S S L I S T P A G E */
1.10 +39 -0 gridengine/source/clients/qmon/qmon_load.c
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_load.c.diff?r1=1.9&r2=1.10
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_load.c
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_load.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- qmon_load.c 2003/07/14 12:46:56 1.9
+++ qmon_load.c 2003/08/19 09:11:39 1.10
@@ -179,3 +179,42 @@
DEXIT;
}
+
+/*-------------------------------------------------------------------------*/
+void qmonLoadNames(
+Widget w,
+XtPointer cld,
+XtPointer cad)
+{
+ lList *cl = NULL;
+ lList *alp = NULL;
+ lList *entries = NULL;
+ static lCondition *where = NULL;
+ static lEnumeration *what = NULL;
+
+ DENTER(GUI_LAYER, "qmonLoadNamesQueue");
+
+ qmonMirrorMultiAnswer(CENTRY_T, &alp);
+ if (alp) {
+ qmonMessageBox(w, alp, 0);
+ alp = lFreeList(alp);
+ DEXIT;
+ return;
+ }
+ cl = qmonMirrorList(SGE_CENTRY_LIST);
+
+ if (!where)
+ where = lWhere("%T(%I != %s)", CE_Type, CE_name, "slots");
+ if(!what)
+ what = lWhatAll();
+
+ entries = lSelect(lGetListName(cl), cl, where, what);
+
+
+ ShowLoadNames(w, entries);
+
+ /*
+ ** free the copied list
+ */
+ entries = lFreeList(entries);
+}
1.3 +1 -0 gridengine/source/clients/qmon/qmon_load.h
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_load.h.diff?r1=1.2&r2=1.3
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_load.h
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_load.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- qmon_load.h 2001/07/20 08:19:27 1.2
+++ qmon_load.h 2003/08/19 09:11:39 1.3
@@ -34,5 +34,6 @@
void qmonLoadSelectEntry(Widget w, XtPointer cld, XtPointer cad);
void ShowLoadNames(Widget w, lList *attributes);
+void qmonLoadNames(Widget w, XtPointer cld, XtPointer cad);
#endif /* __QMON_LOAD_H */
1.23 +3 -53 gridengine/source/clients/qmon/qmon_qaction.c
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_qaction.c.diff?r1=1.22&r2=1.23
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_qaction.c
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_qaction.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- qmon_qaction.c 2003/08/14 12:02:54 1.22
+++ qmon_qaction.c 2003/08/19 09:11:39 1.23
@@ -397,7 +397,6 @@
static void qmonQCModify(Widget w, XtPointer cld, XtPointer cad);
static void qmonQCDelete(Widget w, XtPointer cld, XtPointer cad);
-static void qmonLoadNamesQueue(Widget w, XtPointer cld, XtPointer cad);
static void updateQCA(void);
static void updateQCP(void);
@@ -732,7 +731,7 @@
qmonLoadSelectEntry, NULL);
#endif
XtAddCallback(load_thresholds, XmNlabelActivateCallback,
- qmonLoadNamesQueue, NULL);
+ qmonLoadNames, NULL);
/*
** Suspend Thresholds
@@ -746,7 +745,7 @@
qmonLoadSelectEntry, NULL);
#endif
XtAddCallback(suspend_thresholds, XmNlabelActivateCallback,
- qmonLoadNamesQueue, NULL);
+ qmonLoadNames, NULL);
XtAddCallback(suspend_intervalPB, XmNactivateCallback,
qmonQCTime, (XtPointer) suspend_interval);
@@ -777,7 +776,7 @@
qmonLoadSelectEntry, NULL);
#endif
XtAddCallback(complexes_ccl, XmNlabelActivateCallback,
- qmonLoadNamesQueue, NULL);
+ qmonLoadNames, NULL);
/*
** Limits
@@ -2334,52 +2333,3 @@
}
-/*-------------------------------------------------------------------------*/
-static void qmonLoadNamesQueue(w, cld, cad)
-Widget w;
-XtPointer cld, cad;
-{
- char *qname = NULL;
- char *qhostname = NULL;
- lList *cl = NULL;
- lList *alp = NULL;
- lList *ehl = NULL;
- lList *entries = NULL;
- lListElem *qep = NULL;
- static lCondition *where = NULL;
-
- DENTER(GUI_LAYER, "qmonLoadNamesQueue");
-
- qmonMirrorMultiAnswer(CENTRY_T|EXECHOST_T, &alp);
- if (alp) {
- qmonMessageBox(w, alp, 0);
- alp = lFreeList(alp);
- DEXIT;
- return;
- }
- cl = qmonMirrorList(SGE_CENTRY_LIST);
- ehl = qmonMirrorList(SGE_EXECHOST_LIST);
-
- /*
- ** create a queue element and get the complex attribute entries
- */
- qname = XmtInputFieldGetString(qc_qname);
- qhostname = XmtInputFieldGetString(qc_qhostname);
-
- qep = lCreateElem(QU_Type);
- lSetString(qep, QU_qname, qname);
- lSetHost(qep, QU_qhostname, qhostname);
- queue_complexes2scheduler(&entries, qep, ehl, cl, 0);
- qep = lFreeElem(qep);
-
- if (!where)
- where = lWhere("%T(%I != %s)", CE_Type, CE_name, "slots");
- entries = lSelectDestroy(entries, where);
-
- ShowLoadNames(w, entries);
-
- /*
- ** free the copied list
- */
- entries = lFreeList(entries);
-}
1.13 +1 -1 gridengine/source/clients/qmon/qmon_sconf.c
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_sconf.c.diff?r1=1.12&r2=1.13
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_sconf.c
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_sconf.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- qmon_sconf.c 2003/07/14 12:46:57 1.12
+++ qmon_sconf.c 2003/08/19 09:11:40 1.13
@@ -634,7 +634,7 @@
DENTER(GUI_LAYER, "qmonLoadNamesSC");
- qmonMirrorMultiAnswer(CENTRY_T | EXECHOST_T, &alp);
+ qmonMirrorMultiAnswer(CENTRY_T, &alp);
if (alp) {
qmonMessageBox(w, alp, 0);
alp = lFreeList(alp);
1.6 +0 -2 gridengine/source/clients/qmon/qmon_util.c
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_util.c.diff?r1=1.5&r2=1.6
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_util.c
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_util.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- qmon_util.c 2002/03/19 17:22:35 1.5
+++ qmon_util.c 2003/08/19 09:11:40 1.6
@@ -1022,7 +1022,5 @@
XmUpdateDisplay(topshell);
}
-
-
1.4 +0 -1 gridengine/source/clients/qmon/qmon_util.h
http://gridengine.sunsource.net/source/browse/gridengine/source/clients/qmon/qmon_util.h.diff?r1=1.3&r2=1.4
(In the diff below, changes in quantity of whitespace are not shown.)
Index: qmon_util.h
===================================================================
RCS file: /cvs/gridengine/source/clients/qmon/qmon_util.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- qmon_util.h 2002/03/19 17:22:35 1.3
+++ qmon_util.h 2003/08/19 09:11:40 1.4
@@ -97,7 +97,6 @@
Boolean is_empty_word(char *str);
-
void xmui_manage(Widget w);
void xmui_unmanage(Widget w);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic