merge from glite-lb-server_branch_1_4_0_RC31

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 6b8c167..042d445 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -64,10 +64,6 @@ ifneq (${expat_prefix},/usr)
        expatlib := -L${expat_prefix}/lib
 endif
 
-ifneq (${classads_prefix},/usr)
-        classadslib := -L${classads_prefix}/lib -lclassad
-endif
-
 EXT_LIBS:= \
        ${mysqlib} -lmysqlclient -lz\
        ${expatlib} -lexpat \
@@ -98,8 +94,7 @@ mon-db: mon-db.o
        ${LINK} -o $@ $< ${COMMON_LIB} ${BKSERVER_LIB} ${EXT_LIBS} 
 
 statistics: statistics.o
-       ${LINK} -rdynamic -o $@ $< ${JP_LIBS} ${EXT_LIBS} 
-#${classadslib}
+       ${LINK} -rdynamic -o $@ $< ${COMMON_LIB} ${JP_LIBS} ${EXT_LIBS} 
 
 check: compile 
 

diff --git a/org.glite.lb.utils/src/statistics.c b/org.glite.lb.utils/src/statistics.c
index f60d406..3e96874 100644 (file)
--- a/org.glite.lb.utils/src/statistics.c
+++ b/org.glite.lb.utils/src/statistics.c
@@ -7,12 +7,16 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
+#include <sys/time.h>
 #include <time.h>
 #include <dlfcn.h>
 #include <malloc.h>
 #include <unistd.h>
 #include <getopt.h>
 
+#include "glite/lb/context.h"
+#include "glite/lb/jobstat.h"
+
 #include "glite/jp/types.h"
 #include "glite/jp/context.h"
 #include "glite/jp/backend.h"
@@ -108,7 +112,7 @@ int main(int argc, char *argv[])
        char *err;
        init_f *plugin_init;
        done_f *plugin_done;
-       int opt;
+       int i,opt;
 
        /* get arguments */
        while ((opt = getopt_long(argc,argv,
@@ -295,13 +299,33 @@ int main(int argc, char *argv[])
 
                plugin_data.ops.attr(jpctx, data_handle, GLITE_JP_LB_lastStatusHistory, &attrval);
                if (attrval) {
-                       fprintf(stdout,"\t<lastStatusHistory>%s</lastStatusHistory>\n", attrval->value);
+                       fprintf(stdout,"\t<lastStatusHistory>\n");
+                       for (i = 1; i < EDG_WLL_NUMBER_OF_STATCODES; i++) {
+                               char *stat = edg_wll_StatToString(i);
+                               fprintf(stdout,"\t<status>\n");
+                               fprintf(stdout,"\t\t<status>%s</status>\n", stat);
+                               fprintf(stdout,"\t\t<timestamp>%ld.%06ld</timestamp>\n", attrval[i].timestamp,0);
+                               fprintf(stdout,"\t\t<reason>%s</reason>\n", attrval[i].value ? attrval[i].value : "");
+                               fprintf(stdout,"\t</status>\n");
+                               if (stat) free(stat);
+                       }
+                       fprintf(stdout,"\t</lastStatusHistory>\n");
                        free_attrs(attrval);
                }
 
                plugin_data.ops.attr(jpctx, data_handle, GLITE_JP_LB_fullStatusHistory, &attrval);
                if (attrval) {
-                       fprintf(stdout,"\t<fullStatusHistory>%s</fullStatusHistory>\n", attrval->value);
+                       fprintf(stdout,"\t<fullStatusHistory>\n");
+                       for (i = 1; i < EDG_WLL_NUMBER_OF_STATCODES; i++) {
+                               char *stat = edg_wll_StatToString(i);
+                               fprintf(stdout,"\t<status>\n");
+                               fprintf(stdout,"\t\t<status>%s</status>\n", stat);
+                               fprintf(stdout,"\t\t<timestamp>%ld.%06ld</timestamp>\n", attrval[i].timestamp,0);
+                               fprintf(stdout,"\t\t<reason>%s</reason>\n", attrval[i].value ? attrval[i].value : "");
+                               fprintf(stdout,"\t</status>\n");
+                               if (stat) free(stat);
+                       }
+                       fprintf(stdout,"\t</fullStatusHistory>\n");
                        free_attrs(attrval);
                }