Warning, build and build with LB_PERF fixes.

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 8e87afd..bb4f446 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -221,5 +221,5 @@ il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest
        ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
 
 clean:
-       rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} {MAN_GZ}
+       rm -rvf .libs/ *.o *.no ${LOGD} ${INTERLOGD} ${NOTIF_INTERLOGD} ${MAN_GZ}
        rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 1c2c81b..90e38dd 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -157,7 +157,7 @@ COMMON_LIBS:= -L${stagedir}/lib  -lglite_lb_common_${nothrflavour} -lglite_secur
 BKSERVER_BASE_OBJS:= \
        bkserverd.o il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \
        seqcode.o write2rgma.o lb_html.o lb_http.o lb_proto.o lb_xml_parse.o \
-       lb_xml_parse_V21.o \
+       lb_xml_parse_V21.o lb_text.o \
        lock.o openserver.o query.o userjobs.o db_store.o request.o store.o \
        stored_master.o srv_purge.o server_state.o dump.o lb_authz.o load.o \
        notification.o il_notification.o notif_match.o stats.o db_calls.o db_supp.o
@@ -197,7 +197,7 @@ endif
 INDEX_OBJS:= index.o index_parse.o jobstat_supp.o openserver.o \
        jobstat.o query.o lock.o get_events.o write2rgma.o index_lex.o \
        lb_authz.o store.o bkindex.o stats.o\
-       request.o db_store.o srv_purge.o notif_match.o il_lbproxy.o dump.o lb_xml_parse.o il_notification.o lb_proto.o server_state.o lb_xml_parse_V21.o lb_html.o notification.o seqcode.o userjobs.o load.o db_calls.o db_supp.lo
+       request.o db_store.o srv_purge.o notif_match.o il_lbproxy.o dump.o lb_xml_parse.o il_notification.o lb_proto.o lb_text.o server_state.o lb_xml_parse_V21.o lb_html.o notification.o seqcode.o userjobs.o load.o db_calls.o db_supp.lo
 
 INDEX_LIBS:= ${SRVBONES_LIB} ${COMMON_LIBS} ${LB_MACHINE_LIB} ${EXT_LIBS} ${LB_UTILS_DB_LIB}
 
@@ -221,7 +221,7 @@ MAN = $(MAN_GZ:.gz=)
 LIB_OBJS_BK:= \
        il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \
        seqcode.o lb_html.o lb_http.o lb_proto.o lb_xml_parse.o \
-       lb_xml_parse_V21.o \
+       lb_xml_parse_V21.o lb_text.o \
        lock.o openserver.o query.o userjobs.o db_store.o request.o store.o \
        stored_master.o srv_purge.o server_state.o dump.o lb_authz.o load.o \
        notification.o il_notification.o notif_match.o stats.o write2rgma.o \

diff --git a/org.glite.lb.server/src/bkindex.c b/org.glite.lb.server/src/bkindex.c
index 2fa2c98..bc6a47b 100644 (file)
--- a/org.glite.lb.server/src/bkindex.c
+++ b/org.glite.lb.server/src/bkindex.c
@@ -20,15 +20,7 @@
 
 #ifdef LB_PERF
 #include "glite/lb/lb_perftest.h"
-#include "glite/lb/srv_perf.h"
-
-enum lb_srv_perf_sink sink_mode;
-#endif
-
-
-#ifdef LB_PERF
-#include "glite/lb/lb_perftest.h"
-#include "glite/lb/srv_perf.h"
+#include "srv_perf.h"
 
 enum lb_srv_perf_sink sink_mode;
 #endif

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index f90b231..db486da 100644 (file)
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -45,7 +45,7 @@
 
 #ifdef LB_PERF
 #include "glite/lb/lb_perftest.h"
-#include "glite/lb/srv_perf.h"
+#include "srv_perf.h"
 
 enum lb_srv_perf_sink sink_mode;
 #endif

diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c
index 4438ac7..2ef84f2 100644 (file)
--- a/org.glite.lb.server/src/db_store.c
+++ b/org.glite.lb.server/src/db_store.c
@@ -18,7 +18,7 @@
 
 #ifdef LB_PERF
 #include "glite/lb/lb_perftest.h"
-#include "glite/lb/srv_perf.h"
+#include "srv_perf.h"
 #endif
 
 

diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c
index 3893cad..7440407 100644 (file)
--- a/org.glite.lb.server/src/lb_proto.c
+++ b/org.glite.lb.server/src/lb_proto.c
@@ -13,6 +13,7 @@
 #include "glite/lb/xml_conversions.h"
 
 #include "lb_proto.h"
+#include "lb_text.h"
 #include "lb_html.h"
 #include "stats.h"
 #include "jobstat.h"

diff --git a/org.glite.lb.server/src/lb_text.c b/org.glite.lb.server/src/lb_text.c
index 48ff9c9..669d370 100644 (file)
--- a/org.glite.lb.server/src/lb_text.c
+++ b/org.glite.lb.server/src/lb_text.c
@@ -60,8 +60,6 @@ int edg_wll_JobStatusToText(edg_wll_Context ctx UNUSED_VAR, edg_wll_JobStat stat
        char    *chid,*chstat;
         char    *jdl,*rsl;
 
-       *chid = edg_wlc_JobIdUnparse(stat.jobId);
-
        #define TR(name,type,field) \
         if (field) { \
                 asprintf(&a,"%s%s=" type "\n", \

diff --git a/org.glite.lb.server/src/mon-db.c b/org.glite.lb.server/src/mon-db.c
index c3f77ce..f4f114f 100644 (file)
--- a/org.glite.lb.server/src/mon-db.c
+++ b/org.glite.lb.server/src/mon-db.c
@@ -14,6 +14,13 @@
 #include "db_supp.h"
 #include "openserver.h"
 
+#ifdef LB_PERF
+#include "glite/lb/lb_perftest.h"
+#include "srv_perf.h"
+
+enum lb_srv_perf_sink sink_mode;
+#endif
+
 static struct option opts[] = {
        { "mysql",1,NULL,'m' },
        { "debug",0,NULL,'d' },