Flag-aware child histogram computation has been added to edg_wll_JobStatus() (no...

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index c6b71db..8c6c491 100644 (file)
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -164,7 +164,20 @@ int edg_wll_JobStatus(
 
 #if DAG_ENABLE
        if (stat->jobtype == EDG_WLL_STAT_DAG || stat->jobtype == EDG_WLL_STAT_COLLECTION) {
-               if (1) {
+
+//             printf("edg_wll_JobStatus:i EDG_WLL_STAT_DAG || EDG_WLL_STAT_COLLECTION\n");
+//             printf("flags: %d",flags);
+
+                if (flags & EDG_WLL_STAT_CHILDHIST_FAST) { /* Fast Histogram */
+//                     printf("edg_wll_JobStatus: EDG_WLL_STAT_CHILDHIST_FAST\n");
+
+                       edg_wll_GetSubjobHistogram(ctx, job, stat);
+
+               }
+
+               if (flags & EDG_WLL_STAT_CHILDHIST_THOROUGH) { /* Full (thorough) Histogram */
+//                     printf("edg_wll_JobStatus: EDG_WLL_STAT_CHILDHIST_THOROUGH\n");
+
                        char *out[2];
                        edg_wll_Stmt sh;
                        int num_sub, num_f, i;

diff --git a/org.glite.lb.ws-interface/src/LBTypes.xml.T b/org.glite.lb.ws-interface/src/LBTypes.xml.T
index 3e1d87c..1944ad3 100644 (file)
--- a/org.glite.lb.ws-interface/src/LBTypes.xml.T
+++ b/org.glite.lb.ws-interface/src/LBTypes.xml.T
@@ -18,6 +18,8 @@
                        <val name="CLASSADS">Include also long job descriptions (JDL).</val>
                        <val name="CHILDREN">Return list of subjobs of a DAG.</val>
                        <val name="CHILDSTAT">Return state of the subjobs, i.e. apply other flags recursively </val>
+                       <val name="CHILDHIST_FAST">Return a histogram of subjob states (fast computation method, certain subjobs will be in an "unknown" state)</val>
+                       <val name="CHILDHIST_THOROUGH">Return a full histogram of subjob states.</vol>
                </flags>
 
                <enum name="statName">